The old libjpeg is renamed to libjpeg-compat The compat makes the old libs maintainable The new 1.4.2 is build after the old and all IPFire componentes will build with the new libary. The old are renamed while building the new.
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org --- config/rootfiles/common/libjpeg | 19 ++++++-- config/rootfiles/common/libjpeg-compat | 33 ++++++++++++++ lfs/libjpeg | 19 +++++--- lfs/libjpeg-compat | 80 ++++++++++++++++++++++++++++++++++ make.sh | 1 + 5 files changed, 143 insertions(+), 9 deletions(-) create mode 100644 config/rootfiles/common/libjpeg-compat create mode 100644 lfs/libjpeg-compat
diff --git a/config/rootfiles/common/libjpeg b/config/rootfiles/common/libjpeg index 7ceb697..4df7565 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.62 -usr/lib/libjpeg.so.62.1.0 +usr/lib/libjpeg.so.8 +usr/lib/libjpeg.so.8.0.2 #usr/lib/libturbojpeg.a #usr/lib/libturbojpeg.la #usr/lib/libturbojpeg.so usr/lib/libturbojpeg.so.0 -usr/lib/libturbojpeg.so.0.0.0 +usr/lib/libturbojpeg.so.0.1.0 #usr/man/man1/cjpeg.1 #usr/man/man1/djpeg.1 #usr/man/man1/jpegtran.1 @@ -31,3 +31,16 @@ usr/lib/libturbojpeg.so.0.0.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 new file mode 100644 index 0000000..7ceb697 --- /dev/null +++ b/config/rootfiles/common/libjpeg-compat @@ -0,0 +1,33 @@ +#usr/bin/cjpeg +#usr/bin/djpeg +#usr/bin/jpegtran +#usr/bin/rdjpgcom +#usr/bin/tjbench +#usr/bin/wrjpgcom +#usr/include/jconfig.h +#usr/include/jerror.h +#usr/include/jmorecfg.h +#usr/include/jpeglib.h +#usr/include/turbojpeg.h +#usr/lib/libjpeg.a +#usr/lib/libjpeg.la +#usr/lib/libjpeg.so +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.0.0 +#usr/man/man1/cjpeg.1 +#usr/man/man1/djpeg.1 +#usr/man/man1/jpegtran.1 +#usr/man/man1/rdjpgcom.1 +#usr/man/man1/wrjpgcom.1 +#usr/share/doc/README +#usr/share/doc/README-turbo.txt +#usr/share/doc/example.c +#usr/share/doc/libjpeg.txt +#usr/share/doc/structure.txt +#usr/share/doc/usage.txt +#usr/share/doc/wizard.txt diff --git a/lfs/libjpeg b/lfs/libjpeg index 8b4c077..a104ba9 100644 --- a/lfs/libjpeg +++ b/lfs/libjpeg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # # # # 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,15 +24,13 @@
include Config
-VER = 1.3.1 +VER = 1.4.2
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 @@ -42,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05 +$(DL_FILE)_MD5 = 86b0d5f7507c2e6c21c00219162c3c44
install : $(TARGET)
@@ -72,9 +70,18 @@ $(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 --enable-static --enable-shared + # backup the old libjpeg. The make install removes the old + mv -v /usr/lib/libjpeg.so.62.1.0 /usr/lib/backup-libjpeg.so.62.1.0 + cd $(DIR_APP) && ./configure --prefix=/usr \ + --with-jpeg8 \ + --disable-static\ + --mandir=/usr/share/man cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && rm -f /usr/lib/libjpeg.so* cd $(DIR_APP) && make install + # restore old lib + mv -v /usr/lib/backup-libjpeg.so.62.1.0 /usr/lib/libjpeg.so.62.1.0 @rm -rf $(DIR_APP) @$(POSTBUILD) + diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat new file mode 100644 index 0000000..8b4c077 --- /dev/null +++ b/lfs/libjpeg-compat @@ -0,0 +1,80 @@ +############################################################################### +# # +# 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) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 3d5b4a3..a9fac52 100755 --- a/make.sh +++ b/make.sh @@ -506,6 +506,7 @@ buildipfire() { ipfiremake libnl-3 ipfiremake libidn ipfiremake nasm + ipfiremake libjpeg-compat ipfiremake libjpeg ipfiremake libexif ipfiremake libpng
-
Marcel Lorenz