From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZnWjh6S6cz30sN for ; Wed, 30 Apr 2025 09:15:04 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZnWjh6BgDz2xRF for ; Wed, 30 Apr 2025 09:15:04 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "people01.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZnWjh0bn2z5v for ; Wed, 30 Apr 2025 09:15:04 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1746004504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=KG/y2IEJwV3sgwKzZQN7lfmrrcM+gfbpNjQk7Knjem4=; b=u3043m0OVfrUMXJfONXeoCUcGIJfBplJZ+2/OMD4E7MekcM8EGp93lwR1JzYvSkIMtvUtZ IRi/AS5g+OZyNMCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1746004504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=KG/y2IEJwV3sgwKzZQN7lfmrrcM+gfbpNjQk7Knjem4=; b=MltNX+g935Vnh1PxW6pI0xPcmnz6Io5LhX8+rY74G30+QFkUEE3QmY5n5HeWr10PxrC/S+ 9auhE2NsvkSc3IV0pT8LvxWtMnwWZE01P6Kd+I1Tzf3bOgbXvi28Z6oA0S4RNhBR9i/RtL yChELmAjfizWgJCceNQJFCKEheEu6OYHT95K+tPly3LN73WmQR/prLvPr5FQm4Au83lf1e 9nRrp2gw9iB5hdFp7f2enonHr82r4XfzFKBW7+Zj8lcX0qU/BtH/Jb4pIS3tNWh4h5xtA9 QPS9hCf2RHhRH0QaY4pvn0Qa4p9Ri1AoPhPXzLgXl2IIAkVufUTH0D5tM7FJQg== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4ZnWjg6MZnz2xWx; Wed, 30 Apr 2025 09:15:03 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6e8d853c8103da10ee6a4abc804848d57fceeb8b X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: a1ea68d434cfe4587456d34b91cc742dd99baca1 X-Git-Newrev: 6e8d853c8103da10ee6a4abc804848d57fceeb8b Message-Id: <4ZnWjg6MZnz2xWx@people01.haj.ipfire.org> Date: Wed, 30 Apr 2025 09:15:03 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 Date: Wed Apr 30 09:14:46 2025 +0000 core195: Remove dropped packages Signed-off-by: Michael Tremer commit 524b5c0c3e7a2c8e3f40158a7b6a495d37d3f749 Author: Michael Tremer Date: Tue Apr 29 17:02:18 2025 +0000 xvid: Drop package Signed-off-by: Michael Tremer commit 67e924b6d2c6e62d382b571b25b95f91ca8aaa42 Author: Michael Tremer Date: Tue Apr 29 16:59:09 2025 +0000 libmpeg2: Drop package Signed-off-by: Michael Tremer ----------------------------------------------------------------------- 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 $( # -# # -# 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 . # -# # -############################################################################### - -############################################################################### -# 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 # -# # -# 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 . # -# # -############################################################################### - -############################################################################### -# 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