mbox

libjpeg: update to 1.5.1

Message ID 20161007161713.31853-1-marcel.lorenz@ipfire.org
State Accepted
Commit 71a95ee3300c9db2ab3765f314973aec7c4c4862
Headers

Message

Marcel Lorenz Oct. 8, 2016, 3:17 a.m. UTC 
  The old libjpeg is renamed to libjpeg-compat
The compat makes the old libs maintainable

Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
---
 config/rootfiles/common/libjpeg        | 36 +++++++--------
 config/rootfiles/common/libjpeg-compat |  3 ++
 lfs/libjpeg                            | 15 ++++---
 lfs/libjpeg-compat                     | 80 ++++++++++++++++++++++++++++++++++
 make.sh                                |  1 +
 5 files changed, 111 insertions(+), 24 deletions(-)
 create mode 100644 config/rootfiles/common/libjpeg-compat
 create mode 100644 lfs/libjpeg-compat

Comments

Jonatan Schlag Oct. 8, 2016, 6:32 a.m. UTC | #1 
Hi,

Am Fr, 7. Okt, 2016 um 6:17 schrieb Marcel Lorenz 
<marcel.lorenz@ipfire.org>:
> The old libjpeg is renamed to libjpeg-compat
> The compat makes the old libs maintainable
> 
> Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
> ---
>  config/rootfiles/common/libjpeg        | 36 +++++++--------
>  config/rootfiles/common/libjpeg-compat |  3 ++
>  lfs/libjpeg                            | 15 ++++---
>  lfs/libjpeg-compat                     | 80 
> ++++++++++++++++++++++++++++++++++
>  make.sh                                |  1 +
>  5 files changed, 111 insertions(+), 24 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..1c56023 100644
> --- a/config/rootfiles/common/libjpeg
> +++ b/config/rootfiles/common/libjpeg
> @@ -9,25 +9,27 @@
>  #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/libjpeg.so.8
> +usr/lib/libjpeg.so.8.1.2
>  #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
> +usr/lib/libturbojpeg.so.0.1.0
> +#usr/lib/pkgconfig/libjpeg.pc
> +#usr/lib/pkgconfig/libturbojpeg.pc
> +#usr/share/doc/libjpeg-turbo
> +#usr/share/doc/libjpeg-turbo/LICENSE.md
> +#usr/share/doc/libjpeg-turbo/README.ijg
> +#usr/share/doc/libjpeg-turbo/README.md
> +#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
> +#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
> 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..64b227a 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.5.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
> @@ -42,7 +40,7 @@ objects = $(DL_FILE)
> 
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05
> +$(DL_FILE)_MD5 = 55deb139b0cac3c8200b75d485fc13f3
> 
>  install : $(TARGET)
> 
> @@ -72,9 +70,12 @@ $(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) && [ -e "libtool" ] || ln -svf /usr/bin/libtool 
> libtool
> +	cd $(DIR_APP) && ./configure --prefix=/usr \
> +			--with-jpeg8 \
> +			--disable-static\
> +			--mandir=/usr/share/man
>  	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 5a2c6da..5e97c96 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

One little error:
In line 122 is some unnecessary whitespace.

Anyway, and because of the fact that anything else is ok

Reviewed-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

Jonatan