From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 17 Feb 2021 16:25:14 +0000 (+0000)
Subject: libjpeg-compat: Drop package
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d338e55ce5b766f579b38f8df355957fcff6799f

libjpeg-compat: Drop package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/libjpeg-compat b/config/rootfiles/common/libjpeg-compat
deleted file mode 100644
index 5e7b98d9dd..0000000000
--- 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/155/update.sh b/config/rootfiles/core/155/update.sh
index f22690cd08..6903e7998b 100644
--- a/config/rootfiles/core/155/update.sh
+++ b/config/rootfiles/core/155/update.sh
@@ -45,6 +45,9 @@ rm -vrf \
 	/usr/lib/libdb_cxx-4.4.so \
 	/usr/lib/libgmp.so.3 \
 	/usr/lib/libgmp.so.3.5.2 \
+	/usr/lib/libjpeg.so.62 \
+	/usr/lib/libjpeg.so.62.1.0 \
+	/usr/lib/libturbojpeg.so.0.0.0 \
 	/lib/libpcre.so.0 \
 	/lib/libpcre.so.0.0.1
 
diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat
deleted file mode 100644
index 26e32f1d8b..0000000000
--- a/lfs/libjpeg-compat
+++ /dev/null
@@ -1,84 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  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        #
-# 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)
-	$(UPDATE_AUTOMAKE)
-	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 6ef584f302..e17d0487c8 100755
--- a/make.sh
+++ b/make.sh
@@ -1255,7 +1255,6 @@ buildipfire() {
   lfsmake2 ninja
   lfsmake2 meson
   lfsmake2 libjpeg
-  lfsmake2 libjpeg-compat
   lfsmake2 openjpeg
   lfsmake2 libexif
   lfsmake2 libpng