xvid: Drop package

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

diff --git a/config/rootfiles/packages/xvid b/config/rootfiles/packages/xvid
deleted file mode 100644 (file)
index 17bee89..0000000
--- a/config/rootfiles/packages/xvid
+++ /dev/null
@@ -1,5 +0,0 @@
-#usr/include/xvid.h
-#usr/lib/libxvidcore.a
-usr/lib/libxvidcore.so
-usr/lib/libxvidcore.so.4
-usr/lib/libxvidcore.so.4.3

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index cbc3078fdd02ab33cacf6d4060b82025472d2928..2af29359ff0196d3cb9cd02b6e038af37c53af83 100644 (file)
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -34,9 +34,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 19
+PAK_VER    = 20
 
-DEPS       = sdl2 lame libvorbis xvid
+DEPS       = sdl2 lame libvorbis
 
 SERVICES   =
 

diff --git a/lfs/xvid b/lfs/xvid
deleted file mode 100644 (file)
index a9e7cf0..0000000
--- a/lfs/xvid
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  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
-
-SUMMARY    = Xvid is a high quality MPEG-4 ASP video codec
-
-VER        = 1.3.7
-
-THISAPP    = xvidcore-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/xvidcore
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = xvid
-PAK_VER    = 3
-
-DEPS       =
-
-SERVICES   =
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 26b2dce1456fd49a5afb4d2edc718c70b86240843e267cae4d267e6dd38ee37b6f6beabbb8bb3f7e2237a1ac6d2d34f2431df50c98a785fa4a45f591f021ac24
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist:
-       @$(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-       @$(B2SUM)
-
-###############################################################################
-# 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)/build/generic && ./configure --prefix=/usr
-       cd $(DIR_APP)/build/generic && make
-       cd $(DIR_APP)/build/generic && make install
-       chmod -v 755 /usr/lib/libxvidcore.so.4.3
-       ln -v -sf libxvidcore.so.4.3 /usr/lib/libxvidcore.so.4
-       ln -v -sf libxvidcore.so.4 /usr/lib/libxvidcore.so
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 08cb893df95e05d82164c83f00c9ce53ef529926..ab3867a8f11134424c810f2f1e14521fce4882a2 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1832,7 +1832,6 @@ build_system() {
        lfsmake2 lame
        lfsmake2 soxr
        lfsmake2 libshout
-       lfsmake2 xvid
        lfsmake2 gnump3d
        lfsmake2 libxxhash
        lfsmake2 rsync