* [PATCH] libjpeg: update to 1.4.2
@ 2016-09-03 12:06 Marcel Lorenz
2016-09-03 12:06 ` [PATCH] libjpeg: update to 1.4.2 v3 Marcel Lorenz
0 siblings, 1 reply; 2+ messages in thread
From: Marcel Lorenz @ 2016-09-03 12:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 140 bytes --]
Hi,
pelase not forget to merge the netpbm 10.47.61 patch from me.
The old will fail build with the new lib!
Greetinges,
Marcel
--
2.9.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] libjpeg: update to 1.4.2 v3
2016-09-03 12:06 [PATCH] libjpeg: update to 1.4.2 Marcel Lorenz
@ 2016-09-03 12:06 ` Marcel Lorenz
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Lorenz @ 2016-09-03 12:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 8112 bytes --]
The old libjpeg is renamed to libjpeg-compat
The compat makes the old libs maintainable
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
config/rootfiles/common/libjpeg | 19 ++++++--
config/rootfiles/common/libjpeg-compat | 3 ++
lfs/libjpeg | 14 +++---
lfs/libjpeg-compat | 80 ++++++++++++++++++++++++++++++++++
make.sh | 1 +
5 files changed, 108 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..5e7b98d
--- /dev/null
+++ b/config/rootfiles/common/libjpeg-compat
@@ -0,0 +1,3 @@
+usr/lib/libjpeg.so.62
+usr/lib/libjpeg.so.62.1.0
+usr/lib/libturbojpeg.so.0.0.0
diff --git a/lfs/libjpeg b/lfs/libjpeg
index 8b4c077..aae2c77 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(a)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,13 @@ $(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
+ 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) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
+
diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat
new file mode 100644
index 0000000..4166d52
--- /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) && 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 0900a18..b175a01 100755
--- a/make.sh
+++ b/make.sh
@@ -508,6 +508,7 @@ buildipfire() {
ipfiremake libidn
ipfiremake nasm
ipfiremake libjpeg
+ ipfiremake libjpeg-compat
ipfiremake libexif
ipfiremake libpng
ipfiremake libtiff
--
2.9.3
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-03 12:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-03 12:06 [PATCH] libjpeg: update to 1.4.2 Marcel Lorenz
2016-09-03 12:06 ` [PATCH] libjpeg: update to 1.4.2 v3 Marcel Lorenz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox