From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. feba68e4af48630d0c5dcd16bd799a0e02db2b36
Date: Mon, 26 Sep 2016 20:20:43 +0100 [thread overview]
Message-ID: <20160926192045.033101078E81@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 9174 bytes --]
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 feba68e4af48630d0c5dcd16bd799a0e02db2b36 (commit)
from b8987235d26e4bdf99fa1c4a574a3da0c7674d07 (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 feba68e4af48630d0c5dcd16bd799a0e02db2b36
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Sat Sep 3 14:06:19 2016 +0200
libjpeg: update to 1.4.2
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>
Reviewed-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/libjpeg | 19 ++++++++++++++++---
config/rootfiles/common/libjpeg-compat | 3 +++
lfs/libjpeg | 14 ++++++++------
lfs/{libjpeg => libjpeg-compat} | 2 +-
make.sh | 1 +
5 files changed, 29 insertions(+), 10 deletions(-)
create mode 100644 config/rootfiles/common/libjpeg-compat
copy lfs/{libjpeg => libjpeg-compat} (97%)
Difference in files:
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 e8cfa42..1446a9f 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
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2016-09-26 19:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160926192045.033101078E81@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox