From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6e8d853c8103da10ee6a4abc804848d57fceeb8b
Date: Wed, 30 Apr 2025 09:15:03 +0000 (UTC) [thread overview]
Message-ID: <4ZnWjg6MZnz2xWx@people01.haj.ipfire.org> (raw)
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 6e8d853c8103da10ee6a4abc804848d57fceeb8b (commit)
via 524b5c0c3e7a2c8e3f40158a7b6a495d37d3f749 (commit)
via 67e924b6d2c6e62d382b571b25b95f91ca8aaa42 (commit)
from a1ea68d434cfe4587456d34b91cc742dd99baca1 (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 6e8d853c8103da10ee6a4abc804848d57fceeb8b
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Apr 30 09:14:46 2025 +0000
core195: Remove dropped packages
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 524b5c0c3e7a2c8e3f40158a7b6a495d37d3f749
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue Apr 29 17:02:18 2025 +0000
xvid: Drop package
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 67e924b6d2c6e62d382b571b25b95f91ca8aaa42
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue Apr 29 16:59:09 2025 +0000
libmpeg2: Drop package
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/195/update.sh | 13 ++++++
config/rootfiles/packages/libmpeg2 | 20 --------
config/rootfiles/packages/xvid | 5 --
lfs/ffmpeg | 4 +-
lfs/libmpeg2 | 93 -------------------------------------
lfs/xvid | 92 ------------------------------------
make.sh | 2 -
7 files changed, 15 insertions(+), 214 deletions(-)
delete mode 100644 config/rootfiles/packages/libmpeg2
delete mode 100644 config/rootfiles/packages/xvid
delete mode 100644 lfs/libmpeg2
delete mode 100644 lfs/xvid
Difference in files:
diff --git a/config/rootfiles/core/195/update.sh b/config/rootfiles/core/195/update.sh
index d1194ec69..95669eab9 100644
--- a/config/rootfiles/core/195/update.sh
+++ b/config/rootfiles/core/195/update.sh
@@ -38,6 +38,19 @@ done
# Extract files
extract_files
+# Remove dropped packages
+for package in libmpeg2 xvid; do
+ if [ -e "/opt/pakfire/db/installed/meta-${package}" ]; then
+ stop_service "${package}"
+ for i in $(</opt/pakfire/db/rootfiles/${package}); do
+ rm -rfv "/${i}"
+ done
+ fi
+ rm -f "/opt/pakfire/db/installed/meta-${package}"
+ rm -f "/opt/pakfire/db/meta/meta-${package}"
+ rm -f "/opt/pakfire/db/rootfiles/${package}"
+done
+
# update linker config
ldconfig
diff --git a/config/rootfiles/packages/libmpeg2 b/config/rootfiles/packages/libmpeg2
deleted file mode 100644
index 41ae53c20..000000000
--- a/config/rootfiles/packages/libmpeg2
+++ /dev/null
@@ -1,20 +0,0 @@
-#usr/bin/corrupt_mpeg2
-#usr/bin/extract_mpeg2
-#usr/bin/mpeg2dec
-#usr/include/mpeg2dec
-#usr/include/mpeg2dec/mpeg2.h
-#usr/include/mpeg2dec/mpeg2convert.h
-#usr/lib/libmpeg2.a
-#usr/lib/libmpeg2.la
-usr/lib/libmpeg2.so
-usr/lib/libmpeg2.so.0
-usr/lib/libmpeg2.so.0.0.0
-#usr/lib/libmpeg2convert.a
-#usr/lib/libmpeg2convert.la
-usr/lib/libmpeg2convert.so
-usr/lib/libmpeg2convert.so.0
-usr/lib/libmpeg2convert.so.0.0.0
-#usr/lib/pkgconfig/libmpeg2.pc
-#usr/lib/pkgconfig/libmpeg2convert.pc
-#usr/man/man1/extract_mpeg2.1
-#usr/man/man1/mpeg2dec.1
diff --git a/config/rootfiles/packages/xvid b/config/rootfiles/packages/xvid
deleted file mode 100644
index 17bee8950..000000000
--- 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 cbc3078fd..2af29359f 100644
--- 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/libmpeg2 b/lfs/libmpeg2
deleted file mode 100644
index 0d3bd0aa5..000000000
--- a/lfs/libmpeg2
+++ /dev/null
@@ -1,93 +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 = MPEG-2 Video Stream Decoder
-
-VER = 0.4.1
-
-THISAPP = mpeg2dec-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = libmpeg2
-PAK_VER = 2
-
-DEPS =
-
-SERVICES =
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 3ba03ad62a033d68a985644cf9614061ca627399c401612c54975a68e0522408661e01ae14da4df9ff4063ede0ada2a0a61b1c24862009d8459e65edd0ec21b5
-
-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) && ./configure \
- --prefix=/usr \
- --enable-shared \
- --disable-accel-detect
-
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/xvid b/lfs/xvid
deleted file mode 100644
index a9e7cf03e..000000000
--- 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 3643b469e..ab3867a8f 100755
--- a/make.sh
+++ b/make.sh
@@ -1832,8 +1832,6 @@ build_system() {
lfsmake2 lame
lfsmake2 soxr
lfsmake2 libshout
- lfsmake2 xvid
- lfsmake2 libmpeg2
lfsmake2 gnump3d
lfsmake2 libxxhash
lfsmake2 rsync
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2025-04-30 9:15 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=4ZnWjg6MZnz2xWx@people01.haj.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