[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 92aebbcddd16a0969ab5c2f5fcd4d7217a68e3e4 - IPFire-SCM

27 Sep 2016

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  92aebbcddd16a0969ab5c2f5fcd4d7217a68e3e4 (commit)
      from  01176164b5c1989cf37afad36fe967ddfe0f3612 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 92aebbcddd16a0969ab5c2f5fcd4d7217a68e3e4
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Sep 27 09:44:19 2016 +0100
Revert "libjpeg: update to 1.4.2"
This reverts commit feba68e4af48630d0c5dcd16bd799a0e02db2b36.
Breaks building netpbm
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/libjpeg                    | 19 +----
 config/rootfiles/common/libjpeg-compat             |  3 -
 config/rootfiles/core/106/filelists/libjpeg        |  1 -
 config/rootfiles/core/106/filelists/libjpeg-compat |  1 -
 lfs/libjpeg                                        | 14 ++--
 lfs/libjpeg-compat                                 | 80 ----------------------
 make.sh                                            |  1 -
 7 files changed, 9 insertions(+), 110 deletions(-)
 delete mode 100644 config/rootfiles/common/libjpeg-compat
 delete mode 120000 config/rootfiles/core/106/filelists/libjpeg
 delete mode 120000 config/rootfiles/core/106/filelists/libjpeg-compat
 delete mode 100644 lfs/libjpeg-compat
Difference in files:

diff --git a/config/rootfiles/common/libjpeg b/config/rootfiles/common/libjpeg
index 4df7565..7ceb697 100644
--- a/config/rootfiles/common/libjpeg
+++ b/config/rootfiles/common/libjpeg
@@ -12,13 +12,13 @@
 #usr/lib/libjpeg.a
 #usr/lib/libjpeg.la
 #usr/lib/libjpeg.so
-usr/lib/libjpeg.so.8
-usr/lib/libjpeg.so.8.0.2
+usr/lib/libjpeg.so.62
+usr/lib/libjpeg.so.62.1.0
 #usr/lib/libturbojpeg.a
 #usr/lib/libturbojpeg.la
 #usr/lib/libturbojpeg.so
 usr/lib/libturbojpeg.so.0
-usr/lib/libturbojpeg.so.0.1.0
+usr/lib/libturbojpeg.so.0.0.0
 #usr/man/man1/cjpeg.1
 #usr/man/man1/djpeg.1
 #usr/man/man1/jpegtran.1
@@ -31,16 +31,3 @@ usr/lib/libturbojpeg.so.0.1.0
 #usr/share/doc/structure.txt
 #usr/share/doc/usage.txt
 #usr/share/doc/wizard.txt
-#usr/share/man/man1/cjpeg.1
-#usr/share/man/man1/djpeg.1
-#usr/share/man/man1/jpegtran.1
-#usr/share/man/man1/rdjpgcom.1
-#usr/share/man/man1/wrjpgcom.1
-#usr/share/doc/libjpeg-turbo
-#usr/share/doc/libjpeg-turbo/README
-#usr/share/doc/libjpeg-turbo/README-turbo.txt
-#usr/share/doc/libjpeg-turbo/example.c
-#usr/share/doc/libjpeg-turbo/libjpeg.txt
-#usr/share/doc/libjpeg-turbo/structure.txt
-#usr/share/doc/libjpeg-turbo/usage.txt
-#usr/share/doc/libjpeg-turbo/wizard.txt
diff --git a/config/rootfiles/common/libjpeg-compat b/config/rootfiles/common/libjpeg-compat
deleted file mode 100644
index 5e7b98d..0000000
--- a/config/rootfiles/common/libjpeg-compat
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libjpeg.so.62
-usr/lib/libjpeg.so.62.1.0
-usr/lib/libturbojpeg.so.0.0.0
diff --git a/config/rootfiles/core/106/filelists/libjpeg b/config/rootfiles/core/106/filelists/libjpeg
deleted file mode 120000
index 3b1a782..0000000
--- a/config/rootfiles/core/106/filelists/libjpeg
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libjpeg
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/libjpeg-compat b/config/rootfiles/core/106/filelists/libjpeg-compat
deleted file mode 120000
index e6ff86d..0000000
--- a/config/rootfiles/core/106/filelists/libjpeg-compat
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libjpeg-compat
\ No newline at end of file
diff --git a/lfs/libjpeg b/lfs/libjpeg
index aae2c77..8b4c077 100644
--- a/lfs/libjpeg
+++ b/lfs/libjpeg
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team info@ipfire.org                      #
+# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,13 +24,15 @@
include Config
-VER        = 1.4.2
+VER        = 1.3.1
THISAPP    = libjpeg-turbo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = libjpeg
+PAK_VER    = ipfire-beta1
###############################################################################
 # Top-level Rules
@@ -40,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 86b0d5f7507c2e6c21c00219162c3c44
+$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05
install : $(TARGET)
@@ -70,13 +72,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr \
-			--with-jpeg8 \
-			--disable-static\
-			--mandir=/usr/share/man
+	cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared
    cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
-
diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat
deleted file mode 100644
index 4166d52..0000000
--- a/lfs/libjpeg-compat
+++ /dev/null
@@ -1,80 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.3.1
-
-THISAPP    = libjpeg-turbo-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = libjpeg
-PAK_VER    = ipfire-beta1
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared
-	cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && mv -vf .libs/{libjpeg.so.62.1.0,libjpeg.so.62,libturbojpeg.so.0.0.0} /usr/lib/
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 5e97c96..5a2c6da 100755
--- a/make.sh
+++ b/make.sh
@@ -508,7 +508,6 @@ buildipfire() {
   ipfiremake libidn
   ipfiremake nasm
   ipfiremake libjpeg
-  ipfiremake libjpeg-compat
   ipfiremake libexif
   ipfiremake libpng
   ipfiremake libtiff
hooks/post-receive
--
IPFire 2.x development tree

    