From patchwork Wed Feb 12 09:34:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2776 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZHm5F8dz3xyQ for ; Wed, 12 Feb 2020 09:35:16 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHm1qzvzQ1; Wed, 12 Feb 2020 09:35:16 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHl4bpqz2yXw; Wed, 12 Feb 2020 09:35:15 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHg6vpNz2ySS for ; Wed, 12 Feb 2020 09:35:11 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHg3xshz11k; Wed, 12 Feb 2020 09:35:11 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jEPnWrztj4vdntwZ0mJs8TBZVqX8iZ4acWNHRD01ZKU=; b=79GGkNc5AR0IoFxEAjhEv38LqPwy43S85wAgWSjQFXQbZes34clhKqpMS7s6jgKgQ/7HaC M5JBr5IKQyiL4wDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jEPnWrztj4vdntwZ0mJs8TBZVqX8iZ4acWNHRD01ZKU=; b=l4J5QiDOYj2HwkDmpTcI5DLWRvdO6QQYLVOavpsIWjFA1S1wH3s3ITuC5PyCoKLELuOVk8 ITvE4NwDEOH9PL7TLNuknwypVRgJ4Cb+eR5N1/PtWCtvXRbjoNH24otx0ad1dtAol3jQ8n Dob7wpJ4o4Msw052HEpcU5wSrcbLTdepAPJpaDtmlipG1CKCyLJcS6/Rr21sJYVOjFqXMl rfwZTMGjcZOtbSi7Hs3/7Pn00+SiO3wtsv4lzcsW74r2SBKw7alM1Ih0veOhOdcJV305SR jrFGRrmy4zwb+zVokRW3qzdED+nNeN7FtJNZZW87VFmqaDuZVKNIGzDGxXnZbA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 01/14] Drop arm Date: Wed, 12 Feb 2020 09:34:40 +0000 Message-Id: <20200212093453.5732-2-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is a CLI tool for Tor which is no longer maintained upstream. Signed-off-by: Michael Tremer --- config/rootfiles/packages/arm | 166 ---------------------------------- lfs/arm | 83 ----------------- make.sh | 1 - 3 files changed, 250 deletions(-) delete mode 100644 config/rootfiles/packages/arm delete mode 100644 lfs/arm diff --git a/config/rootfiles/packages/arm b/config/rootfiles/packages/arm deleted file mode 100644 index eb9d128d4..000000000 --- a/config/rootfiles/packages/arm +++ /dev/null @@ -1,166 +0,0 @@ -usr/bin/arm -#usr/share/arm -#usr/share/arm-1.4.5.0-py2.7.egg-info -usr/share/arm/TorCtl -usr/share/arm/TorCtl/GeoIPSupport.py -usr/share/arm/TorCtl/GeoIPSupport.pyc -usr/share/arm/TorCtl/PathSupport.py -usr/share/arm/TorCtl/PathSupport.pyc -usr/share/arm/TorCtl/SQLSupport.py -usr/share/arm/TorCtl/SQLSupport.pyc -usr/share/arm/TorCtl/ScanSupport.py -usr/share/arm/TorCtl/ScanSupport.pyc -usr/share/arm/TorCtl/StatsSupport.py -usr/share/arm/TorCtl/StatsSupport.pyc -usr/share/arm/TorCtl/TorCtl.py -usr/share/arm/TorCtl/TorCtl.pyc -usr/share/arm/TorCtl/TorUtil.py -usr/share/arm/TorCtl/TorUtil.pyc -usr/share/arm/TorCtl/__init__.py -usr/share/arm/TorCtl/__init__.pyc -usr/share/arm/TorCtl/example.py -usr/share/arm/TorCtl/example.pyc -usr/share/arm/__init__.py -usr/share/arm/__init__.pyc -usr/share/arm/cli -usr/share/arm/cli/__init__.py -usr/share/arm/cli/__init__.pyc -usr/share/arm/cli/configPanel.py -usr/share/arm/cli/configPanel.pyc -usr/share/arm/cli/connections -usr/share/arm/cli/connections/__init__.py -usr/share/arm/cli/connections/__init__.pyc -usr/share/arm/cli/connections/circEntry.py -usr/share/arm/cli/connections/circEntry.pyc -usr/share/arm/cli/connections/connEntry.py -usr/share/arm/cli/connections/connEntry.pyc -usr/share/arm/cli/connections/connPanel.py -usr/share/arm/cli/connections/connPanel.pyc -usr/share/arm/cli/connections/countPopup.py -usr/share/arm/cli/connections/countPopup.pyc -usr/share/arm/cli/connections/descriptorPopup.py -usr/share/arm/cli/connections/descriptorPopup.pyc -usr/share/arm/cli/connections/entries.py -usr/share/arm/cli/connections/entries.pyc -usr/share/arm/cli/controller.py -usr/share/arm/cli/controller.pyc -usr/share/arm/cli/graphing -usr/share/arm/cli/graphing/__init__.py -usr/share/arm/cli/graphing/__init__.pyc -usr/share/arm/cli/graphing/bandwidthStats.py -usr/share/arm/cli/graphing/bandwidthStats.pyc -usr/share/arm/cli/graphing/connStats.py -usr/share/arm/cli/graphing/connStats.pyc -usr/share/arm/cli/graphing/graphPanel.py -usr/share/arm/cli/graphing/graphPanel.pyc -usr/share/arm/cli/graphing/resourceStats.py -usr/share/arm/cli/graphing/resourceStats.pyc -usr/share/arm/cli/headerPanel.py -usr/share/arm/cli/headerPanel.pyc -usr/share/arm/cli/interpretorPanel.py -usr/share/arm/cli/interpretorPanel.pyc -usr/share/arm/cli/logPanel.py -usr/share/arm/cli/logPanel.pyc -usr/share/arm/cli/menu -usr/share/arm/cli/menu/__init__.py -usr/share/arm/cli/menu/__init__.pyc -usr/share/arm/cli/menu/actions.py -usr/share/arm/cli/menu/actions.pyc -usr/share/arm/cli/menu/item.py -usr/share/arm/cli/menu/item.pyc -usr/share/arm/cli/menu/menu.py -usr/share/arm/cli/menu/menu.pyc -usr/share/arm/cli/popups.py -usr/share/arm/cli/popups.pyc -usr/share/arm/cli/torrcPanel.py -usr/share/arm/cli/torrcPanel.pyc -usr/share/arm/cli/wizard.py -usr/share/arm/cli/wizard.pyc -usr/share/arm/gui -usr/share/arm/gui/__init__.py -usr/share/arm/gui/__init__.pyc -usr/share/arm/gui/arm.xml -usr/share/arm/gui/configPanel.py -usr/share/arm/gui/configPanel.pyc -usr/share/arm/gui/connections -usr/share/arm/gui/connections/__init__.py -usr/share/arm/gui/connections/__init__.pyc -usr/share/arm/gui/connections/circEntry.py -usr/share/arm/gui/connections/circEntry.pyc -usr/share/arm/gui/connections/connEntry.py -usr/share/arm/gui/connections/connEntry.pyc -usr/share/arm/gui/connections/connPanel.py -usr/share/arm/gui/connections/connPanel.pyc -usr/share/arm/gui/controller.py -usr/share/arm/gui/controller.pyc -usr/share/arm/gui/generalPanel.py -usr/share/arm/gui/generalPanel.pyc -usr/share/arm/gui/graphing -usr/share/arm/gui/graphing/__init__.py -usr/share/arm/gui/graphing/__init__.pyc -usr/share/arm/gui/graphing/bandwidthStats.py -usr/share/arm/gui/graphing/bandwidthStats.pyc -usr/share/arm/gui/graphing/graphPanel.py -usr/share/arm/gui/graphing/graphPanel.pyc -usr/share/arm/gui/logPanel.py -usr/share/arm/gui/logPanel.pyc -usr/share/arm/prereq.py -usr/share/arm/prereq.pyc -#usr/share/arm/resources -#usr/share/arm/resources/arm.1 -#usr/share/arm/resources/exitNotice -#usr/share/arm/resources/exitNotice/how_tor_works_thumb.png -#usr/share/arm/resources/exitNotice/index.html -#usr/share/arm/resources/startTor -#usr/share/arm/resources/tor-arm.desktop -#usr/share/arm/resources/tor-arm.svg -#usr/share/arm/resources/torConfigDesc.txt -#usr/share/arm/resources/torrcOverride -#usr/share/arm/resources/torrcOverride/override.c -#usr/share/arm/resources/torrcOverride/override.h -#usr/share/arm/resources/torrcOverride/override.py -#usr/share/arm/resources/torrcTemplate.txt -usr/share/arm/settings.cfg -usr/share/arm/starter.py -usr/share/arm/starter.pyc -usr/share/arm/test.py -usr/share/arm/test.pyc -#usr/share/arm/uninstall -usr/share/arm/util -usr/share/arm/util/__init__.py -usr/share/arm/util/__init__.pyc -usr/share/arm/util/conf.py -usr/share/arm/util/conf.pyc -usr/share/arm/util/connections.py -usr/share/arm/util/connections.pyc -usr/share/arm/util/enum.py -usr/share/arm/util/enum.pyc -usr/share/arm/util/gtkTools.py -usr/share/arm/util/gtkTools.pyc -usr/share/arm/util/hostnames.py -usr/share/arm/util/hostnames.pyc -usr/share/arm/util/log.py -usr/share/arm/util/log.pyc -usr/share/arm/util/panel.py -usr/share/arm/util/panel.pyc -usr/share/arm/util/procName.py -usr/share/arm/util/procName.pyc -usr/share/arm/util/procTools.py -usr/share/arm/util/procTools.pyc -usr/share/arm/util/sysTools.py -usr/share/arm/util/sysTools.pyc -usr/share/arm/util/textInput.py -usr/share/arm/util/textInput.pyc -usr/share/arm/util/torConfig.py -usr/share/arm/util/torConfig.pyc -usr/share/arm/util/torInterpretor.py -usr/share/arm/util/torInterpretor.pyc -usr/share/arm/util/torTools.py -usr/share/arm/util/torTools.pyc -usr/share/arm/util/uiTools.py -usr/share/arm/util/uiTools.pyc -usr/share/arm/version.py -usr/share/arm/version.pyc -#usr/share/doc/arm -#usr/share/doc/arm/armrc.sample -#usr/share/man/man1/arm.1.gz diff --git a/lfs/arm b/lfs/arm deleted file mode 100644 index a8fae41df..000000000 --- a/lfs/arm +++ /dev/null @@ -1,83 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - -VER = 1.4.5.0 - -THISAPP = arm-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/arm -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = arm -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = f85f306e50b90796ab7097d948e8fcf2 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/arm-dont-require-distutils.patch - cd $(DIR_APP) && ./install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 34cc35f02..6adb3829c 100755 --- a/make.sh +++ b/make.sh @@ -1584,7 +1584,6 @@ buildipfire() { lfsmake2 perl-TimeDate lfsmake2 swatch lfsmake2 tor - lfsmake2 arm lfsmake2 wavemon lfsmake2 iptraf-ng lfsmake2 iotop From patchwork Wed Feb 12 09:34:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2777 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZHn3S1Rz3xYL for ; Wed, 12 Feb 2020 09:35:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHm5VXGzj1; Wed, 12 Feb 2020 09:35:16 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHm3K8rz2yxh; Wed, 12 Feb 2020 09:35:16 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHh0trcz2yXw for ; Wed, 12 Feb 2020 09:35:12 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHg70JFzQ1; Wed, 12 Feb 2020 09:35:11 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0+sKFHanmBzCb6taNAJ1RProhUSjWJCG3G+TOot8wSg=; b=0l5KhTyqhN+gpDVADKHDS0uy1Vym/nHqzSRVZTeXKGPhiAiUgN/L33OUYmEVPj5bcsoxdq eotmOYMCiAyEi1Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0+sKFHanmBzCb6taNAJ1RProhUSjWJCG3G+TOot8wSg=; b=L6rc5v4sIPdaL2PMs2bd1Y/NaOykCVITz/wbmHxIQdw+wEKFHrjNDYh8rdmytiGlEokO7i k1sVuSfJMXfe671Sd6VqCf787NTzSUEqn358JCdFJDPvnVBzXuZu7el0B6JPC7r6CM0koj r/+kOOinPctBFygu2KoNa9doxK/QRb4rOmPhC/ux6dM7D5XBSylCY4ps0/gjvhhQb/vbq5 rBuqD+Pf9tYWV9iqrAlanLEDt8TUC9+mr4uQGKVYXyC15qz5LvGJRu4DTjftf9tGeZm5ir 2Lip7iBq8UjlUSIEqq/B6uJMJXk7KSZY8LjxYI7sHeRJL8WfmQbjBtI8Vl7BHQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 02/14] Drop batctl Date: Wed, 12 Feb 2020 09:34:41 +0000 Message-Id: <20200212093453.5732-3-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This package is no longer used. BATMAN is slightly out of fashion and can be disabled in our kernel, too. Signed-off-by: Michael Tremer --- config/rootfiles/common/batctl | 2 - lfs/batctl | 79 ---------------------------------- make.sh | 1 - 3 files changed, 82 deletions(-) delete mode 100644 config/rootfiles/common/batctl delete mode 100644 lfs/batctl diff --git a/config/rootfiles/common/batctl b/config/rootfiles/common/batctl deleted file mode 100644 index a4f49c27e..000000000 --- a/config/rootfiles/common/batctl +++ /dev/null @@ -1,2 +0,0 @@ -usr/sbin/batctl -#usr/share/man/man8/batctl.8 diff --git a/lfs/batctl b/lfs/batctl deleted file mode 100644 index 36401609c..000000000 --- a/lfs/batctl +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - -VER = 2014.3.0 - -THISAPP = batctl-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 7d2b8c129424c014d020c4b1a2add31b - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install PREFIX=/usr - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 6adb3829c..43dc41e6e 100755 --- a/make.sh +++ b/make.sh @@ -1589,7 +1589,6 @@ buildipfire() { lfsmake2 iotop lfsmake2 stunnel lfsmake2 bacula - lfsmake2 batctl lfsmake2 perl-Font-TTF lfsmake2 perl-IO-String lfsmake2 perl-PDF-API2 From patchwork Wed Feb 12 09:34:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2778 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZHp1HWyz3xyT for ; Wed, 12 Feb 2020 09:35:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHn3hKcz12Z; Wed, 12 Feb 2020 09:35:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHn1SFPz2yxh; Wed, 12 Feb 2020 09:35:17 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHh3TTgz2yXw for ; Wed, 12 Feb 2020 09:35:12 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHh0rWXztG; Wed, 12 Feb 2020 09:35:12 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TXmB8Bd/BrMl/mDb1SSUI0+BhrsybhdNZXOUZ8RMf10=; b=I4dCqSI3RbcD1oM14ZYkbPyKynIC0ri8LE7Ogvj3+BaUvXJotOq7cH6Y2Q1U+b2fTF6Ip0 /q4kPbFqAuIBb2Cg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TXmB8Bd/BrMl/mDb1SSUI0+BhrsybhdNZXOUZ8RMf10=; b=KaYvcK9N119raPcF59kivFubDM9MiqR2byz9YwYNqTzhjlTU7TpMq0Xxv8yWC0bpzpack7 MwgdkC/yYUse0UIsSKsASpfxMLCTYaqqu09CG4Q7Q5eD9WR7UWFFL16lYzUpAWGXnxld43 cWkcCDerBydZnDn2Moo1nMBehIvX0dF3WzX+qFpV2qndRpjOqkQRSRJdz7LdnAacQtG4ow q2/LGLc26gv1KsvsUxMj6J+p569a2cAVvN03VacmiBKPk5VtTL9y/UTxDaVjz1qEUiApTm KXeXj0q9/fe5Kbv3JArac5rcegcTkAJh1+T7AYVo7rPx/DMS4Xo9P/WsIpfi/A== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 03/14] Drop multicat & bitstream Date: Wed, 12 Feb 2020 09:34:42 +0000 Message-Id: <20200212093453.5732-4-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This reverts commit 0a21ce42e113f6c75f992d4ad1b88812ecc6b150. These packages have never been updated and nodody in the team is willing to support them. Signed-off-by: Michael Tremer --- config/rootfiles/common/bitstream | 138 --------------------------- config/rootfiles/packages/multicat | 13 --- lfs/bitstream | 84 ---------------- lfs/multicat | 84 ---------------- make.sh | 2 - src/patches/bitstream-makefile.patch | 7 -- src/patches/multicat-makefile.patch | 12 --- 7 files changed, 340 deletions(-) delete mode 100644 config/rootfiles/common/bitstream delete mode 100644 config/rootfiles/packages/multicat delete mode 100644 lfs/bitstream delete mode 100644 lfs/multicat delete mode 100644 src/patches/bitstream-makefile.patch delete mode 100644 src/patches/multicat-makefile.patch diff --git a/config/rootfiles/common/bitstream b/config/rootfiles/common/bitstream deleted file mode 100644 index 583d8f21e..000000000 --- a/config/rootfiles/common/bitstream +++ /dev/null @@ -1,138 +0,0 @@ -#usr/include/bitstream -#usr/include/bitstream/common.h -#usr/include/bitstream/dvb -#usr/include/bitstream/dvb/ci.h -#usr/include/bitstream/dvb/si -#usr/include/bitstream/dvb/si.h -#usr/include/bitstream/dvb/si/bat.h -#usr/include/bitstream/dvb/si/bat_print.h -#usr/include/bitstream/dvb/si/datetime.h -#usr/include/bitstream/dvb/si/desc_40.h -#usr/include/bitstream/dvb/si/desc_41.h -#usr/include/bitstream/dvb/si/desc_42.h -#usr/include/bitstream/dvb/si/desc_43.h -#usr/include/bitstream/dvb/si/desc_44.h -#usr/include/bitstream/dvb/si/desc_45.h -#usr/include/bitstream/dvb/si/desc_46.h -#usr/include/bitstream/dvb/si/desc_47.h -#usr/include/bitstream/dvb/si/desc_48.h -#usr/include/bitstream/dvb/si/desc_49.h -#usr/include/bitstream/dvb/si/desc_4a.h -#usr/include/bitstream/dvb/si/desc_4b.h -#usr/include/bitstream/dvb/si/desc_4c.h -#usr/include/bitstream/dvb/si/desc_4d.h -#usr/include/bitstream/dvb/si/desc_4e.h -#usr/include/bitstream/dvb/si/desc_4f.h -#usr/include/bitstream/dvb/si/desc_50.h -#usr/include/bitstream/dvb/si/desc_51.h -#usr/include/bitstream/dvb/si/desc_52.h -#usr/include/bitstream/dvb/si/desc_53.h -#usr/include/bitstream/dvb/si/desc_54.h -#usr/include/bitstream/dvb/si/desc_55.h -#usr/include/bitstream/dvb/si/desc_56.h -#usr/include/bitstream/dvb/si/desc_57.h -#usr/include/bitstream/dvb/si/desc_58.h -#usr/include/bitstream/dvb/si/desc_59.h -#usr/include/bitstream/dvb/si/desc_5a.h -#usr/include/bitstream/dvb/si/desc_5b.h -#usr/include/bitstream/dvb/si/desc_5c.h -#usr/include/bitstream/dvb/si/desc_5d.h -#usr/include/bitstream/dvb/si/desc_5e.h -#usr/include/bitstream/dvb/si/desc_5f.h -#usr/include/bitstream/dvb/si/desc_60.h -#usr/include/bitstream/dvb/si/desc_61.h -#usr/include/bitstream/dvb/si/desc_62.h -#usr/include/bitstream/dvb/si/desc_63.h -#usr/include/bitstream/dvb/si/desc_64.h -#usr/include/bitstream/dvb/si/desc_65.h -#usr/include/bitstream/dvb/si/desc_66.h -#usr/include/bitstream/dvb/si/desc_67.h -#usr/include/bitstream/dvb/si/desc_68.h -#usr/include/bitstream/dvb/si/desc_69.h -#usr/include/bitstream/dvb/si/desc_6a.h -#usr/include/bitstream/dvb/si/desc_6b.h -#usr/include/bitstream/dvb/si/desc_6c.h -#usr/include/bitstream/dvb/si/desc_6d.h -#usr/include/bitstream/dvb/si/desc_6e.h -#usr/include/bitstream/dvb/si/desc_7a.h -#usr/include/bitstream/dvb/si/desc_7b.h -#usr/include/bitstream/dvb/si/desc_7c.h -#usr/include/bitstream/dvb/si/desc_83p28.h -#usr/include/bitstream/dvb/si/desc_88p28.h -#usr/include/bitstream/dvb/si/descs_list.h -#usr/include/bitstream/dvb/si/dit.h -#usr/include/bitstream/dvb/si/dit_print.h -#usr/include/bitstream/dvb/si/eit.h -#usr/include/bitstream/dvb/si/eit_print.h -#usr/include/bitstream/dvb/si/nit.h -#usr/include/bitstream/dvb/si/nit_print.h -#usr/include/bitstream/dvb/si/numbers.h -#usr/include/bitstream/dvb/si/rst.h -#usr/include/bitstream/dvb/si/rst_print.h -#usr/include/bitstream/dvb/si/sdt.h -#usr/include/bitstream/dvb/si/sdt_print.h -#usr/include/bitstream/dvb/si/sit.h -#usr/include/bitstream/dvb/si/sit_print.h -#usr/include/bitstream/dvb/si/st.h -#usr/include/bitstream/dvb/si/strings.h -#usr/include/bitstream/dvb/si/tdt.h -#usr/include/bitstream/dvb/si/tdt_print.h -#usr/include/bitstream/dvb/si/tot.h -#usr/include/bitstream/dvb/si/tot_print.h -#usr/include/bitstream/dvb/si_print.h -#usr/include/bitstream/dvb/sim.h -#usr/include/bitstream/ietf -#usr/include/bitstream/ietf/rtp.h -#usr/include/bitstream/mpeg -#usr/include/bitstream/mpeg/aac.h -#usr/include/bitstream/mpeg/pes.h -#usr/include/bitstream/mpeg/psi -#usr/include/bitstream/mpeg/psi.h -#usr/include/bitstream/mpeg/psi/cat.h -#usr/include/bitstream/mpeg/psi/cat_print.h -#usr/include/bitstream/mpeg/psi/desc_02.h -#usr/include/bitstream/mpeg/psi/desc_03.h -#usr/include/bitstream/mpeg/psi/desc_04.h -#usr/include/bitstream/mpeg/psi/desc_05.h -#usr/include/bitstream/mpeg/psi/desc_06.h -#usr/include/bitstream/mpeg/psi/desc_07.h -#usr/include/bitstream/mpeg/psi/desc_08.h -#usr/include/bitstream/mpeg/psi/desc_09.h -#usr/include/bitstream/mpeg/psi/desc_0a.h -#usr/include/bitstream/mpeg/psi/desc_0b.h -#usr/include/bitstream/mpeg/psi/desc_0c.h -#usr/include/bitstream/mpeg/psi/desc_0d.h -#usr/include/bitstream/mpeg/psi/desc_0e.h -#usr/include/bitstream/mpeg/psi/desc_0f.h -#usr/include/bitstream/mpeg/psi/desc_10.h -#usr/include/bitstream/mpeg/psi/desc_11.h -#usr/include/bitstream/mpeg/psi/desc_12.h -#usr/include/bitstream/mpeg/psi/desc_1b.h -#usr/include/bitstream/mpeg/psi/desc_1c.h -#usr/include/bitstream/mpeg/psi/desc_1d.h -#usr/include/bitstream/mpeg/psi/desc_1e.h -#usr/include/bitstream/mpeg/psi/desc_1f.h -#usr/include/bitstream/mpeg/psi/desc_20.h -#usr/include/bitstream/mpeg/psi/desc_21.h -#usr/include/bitstream/mpeg/psi/desc_22.h -#usr/include/bitstream/mpeg/psi/desc_23.h -#usr/include/bitstream/mpeg/psi/desc_24.h -#usr/include/bitstream/mpeg/psi/desc_25.h -#usr/include/bitstream/mpeg/psi/desc_26.h -#usr/include/bitstream/mpeg/psi/desc_27.h -#usr/include/bitstream/mpeg/psi/desc_28.h -#usr/include/bitstream/mpeg/psi/desc_2a.h -#usr/include/bitstream/mpeg/psi/desc_2b.h -#usr/include/bitstream/mpeg/psi/desc_2c.h -#usr/include/bitstream/mpeg/psi/descriptors.h -#usr/include/bitstream/mpeg/psi/descs_list.h -#usr/include/bitstream/mpeg/psi/descs_print.h -#usr/include/bitstream/mpeg/psi/pat.h -#usr/include/bitstream/mpeg/psi/pat_print.h -#usr/include/bitstream/mpeg/psi/pmt.h -#usr/include/bitstream/mpeg/psi/pmt_print.h -#usr/include/bitstream/mpeg/psi/psi.h -#usr/include/bitstream/mpeg/psi/tsdt.h -#usr/include/bitstream/mpeg/psi/tsdt_print.h -#usr/include/bitstream/mpeg/psi_print.h -#usr/include/bitstream/mpeg/ts.h diff --git a/config/rootfiles/packages/multicat b/config/rootfiles/packages/multicat deleted file mode 100644 index 8d0600094..000000000 --- a/config/rootfiles/packages/multicat +++ /dev/null @@ -1,13 +0,0 @@ -usr/bin/aggregartp -usr/bin/ingests -usr/bin/lasts -usr/bin/multicat -usr/bin/multicat_validate -usr/bin/offsets -usr/bin/reordertp -#usr/share/man/man1/aggregartp.1 -#usr/share/man/man1/ingests.1 -#usr/share/man/man1/lasts.1 -#usr/share/man/man1/multicat.1 -#usr/share/man/man1/offsets.1 -#usr/share/man/man1/reordertp.1 diff --git a/lfs/bitstream b/lfs/bitstream deleted file mode 100644 index f0ff34b09..000000000 --- a/lfs/bitstream +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - -VER = 1.0 - -THISAPP = bitstream-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = bitstream -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 5ba0c96d6c7c9131ba60a9a8fc147556 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bitstream-makefile.patch - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/multicat b/lfs/multicat deleted file mode 100644 index 827ff8efc..000000000 --- a/lfs/multicat +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - -VER = 2.0 - -THISAPP = multicat-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = multicat -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 3aaa226a421c378c2ede0c8db8fd609c - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/multicat-makefile.patch - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 43dc41e6e..ae70ff316 100755 --- a/make.sh +++ b/make.sh @@ -1573,8 +1573,6 @@ buildipfire() { lfsmake2 ltrace lfsmake2 ipfire-netboot lfsmake2 lcdproc - lfsmake2 bitstream - lfsmake2 multicat lfsmake2 keepalived lfsmake2 ipvsadm lfsmake2 perl-Carp-Clan diff --git a/src/patches/bitstream-makefile.patch b/src/patches/bitstream-makefile.patch deleted file mode 100644 index 35aeac8d9..000000000 --- a/src/patches/bitstream-makefile.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- Makefile.org 2013-06-14 12:59:46.000000000 +0200 -+++ Makefile 2013-06-14 13:00:01.000000000 +0200 -@@ -1,4 +1,4 @@ --PREFIX ?= /usr/local -+PREFIX ?= /usr - INCLUDE = $(subst //,/,$(DESTDIR)/$(PREFIX)/include/bitstream) - VERSION = 1.0 diff --git a/src/patches/multicat-makefile.patch b/src/patches/multicat-makefile.patch deleted file mode 100644 index 60a987bbe..000000000 --- a/src/patches/multicat-makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- Makefile.orig 2013-06-14 12:39:11.000000000 +0200 -+++ Makefile 2013-06-14 12:39:20.000000000 +0200 -@@ -13,7 +13,7 @@ - OBJ_LASTS = lasts.o - OBJ_MULTICAT_VALIDATE = multicat_validate.o util.o - --PREFIX ?= /usr/local -+PREFIX ?= /usr - BIN = $(DESTDIR)/$(PREFIX)/bin - MAN = $(DESTDIR)/$(PREFIX)/share/man/man1 - - From patchwork Wed Feb 12 09:34:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2779 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZHp66xLz3xyQ for ; Wed, 12 Feb 2020 09:35:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHn70wYz12n; Wed, 12 Feb 2020 09:35:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHn4QsFz2yXf; Wed, 12 Feb 2020 09:35:17 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHh4VfJz2yc5 for ; Wed, 12 Feb 2020 09:35:12 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHh3XfyzQ1; Wed, 12 Feb 2020 09:35:12 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0StghI/XuLpYVxFSB+2XDsQ4MW8c3HE/le7rZGEe+QI=; b=LiCP59k5fY09asUtUaKLtIbPDvnL5ZLNuARZzSz8WLzFlhDOE5bDVG5EFYq5742jVUXiUt NrZRc3EC8Eh2tzDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0StghI/XuLpYVxFSB+2XDsQ4MW8c3HE/le7rZGEe+QI=; b=VacB1327/Dk58ZoMEfqGnGoSekYJWW9W//dh2ziXuylSCMBbsaklBaxLppuLQpMQ6eNHiu BXBrgfdXId2Mmb0aNMC6X2FiLIIOeb8uKQfYOeVEAWBCq7LCN5Pqjf+0VZ7Ff5pyAPUGIu SnwmrtGs3bw2D3zJpDxQBUVegMylPQjM4vrVxJcdOKKN7+Sw2SfO0Z3Ui7RCyDaZSGlIIY 5CG661iicELnyxwdP0e55b4GLUIaTgL239r4OaVm9O+aTUvo0y/r6Hdw+OP4hwYl+e3btP 2XiRwOcMQXoxdAg+p0L9pNC8i+7Hftl2roK5q08IIF1ekfo/cOZywrCnqjbDbg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 04/14] Drop check_mk_agent Date: Wed, 12 Feb 2020 09:34:43 +0000 Message-Id: <20200212093453.5732-5-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This add-on is unmaintained in IPFire. Signed-off-by: Michael Tremer --- config/rootfiles/packages/check_mk_agent | 3 - lfs/check_mk_agent | 86 ------------------------ make.sh | 1 - src/paks/check_mk_agent/install.sh | 36 ---------- src/paks/check_mk_agent/uninstall.sh | 35 ---------- src/paks/check_mk_agent/update.sh | 26 ------- 6 files changed, 187 deletions(-) delete mode 100644 config/rootfiles/packages/check_mk_agent delete mode 100644 lfs/check_mk_agent delete mode 100644 src/paks/check_mk_agent/install.sh delete mode 100644 src/paks/check_mk_agent/uninstall.sh delete mode 100644 src/paks/check_mk_agent/update.sh diff --git a/config/rootfiles/packages/check_mk_agent b/config/rootfiles/packages/check_mk_agent deleted file mode 100644 index 1d68f74d6..000000000 --- a/config/rootfiles/packages/check_mk_agent +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/check_mk_agent -etc/xinetd.d/check_mk_agent -usr/bin/waitmax diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent deleted file mode 100644 index ab7f1da95..000000000 --- a/lfs/check_mk_agent +++ /dev/null @@ -1,86 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - -VER = 1.2.4p5 - -THISAPP = check_mk_agent-$(VER) -DL_FILE = check_mk-${VER}.tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/check_mk-${VER} -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = check_mk_agent -PAK_VER = 4 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = ef3055d191bd38295d1716b3f7824115 - -install : $(TARGET) -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist : - $(PAK) - -############################################################################### -# 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) && tar xzf agents.tar.gz - cd $(DIR_APP) && install -v -m 755 check_mk_agent.linux /usr/bin/check_mk_agent - -mkdir /etc/xinetd.d - cd $(DIR_APP) && install -v -m 755 xinetd.conf /etc/xinetd.d/check_mk_agent - cd $(DIR_APP) && gcc $(CFLAGS) waitmax.c -o waitmax - cd $(DIR_APP) && install -v -m 755 waitmax /usr/bin/waitmax - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index ae70ff316..8393cad2f 100755 --- a/make.sh +++ b/make.sh @@ -1565,7 +1565,6 @@ buildipfire() { lfsmake2 stress lfsmake2 libstatgrab lfsmake2 sarg - lfsmake2 check_mk_agent lfsmake2 nginx lfsmake2 sendEmail lfsmake2 sysbench diff --git a/src/paks/check_mk_agent/install.sh b/src/paks/check_mk_agent/install.sh deleted file mode 100644 index 6aed752a8..000000000 --- a/src/paks/check_mk_agent/install.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -restore_backup ${NAME} - -mkdir -p /usr/lib/check_mk_agent/plugins - -if [[ -x /usr/sbin/xinetd ]]; -then - if [[ -x /etc/init.d/xinetd ]] - then - /etc/init.d/xinetd restart - fi -fi diff --git a/src/paks/check_mk_agent/uninstall.sh b/src/paks/check_mk_agent/uninstall.sh deleted file mode 100644 index 51449f55b..000000000 --- a/src/paks/check_mk_agent/uninstall.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_backup_includes -make_backup ${NAME} -remove_files - -if [[ -x /usr/sbin/xinetd ]]; -then - if [[ -x /etc/init.d/xinetd ]] - then - /etc/init.d/xinetd restart - fi -fi diff --git a/src/paks/check_mk_agent/update.sh b/src/paks/check_mk_agent/update.sh deleted file mode 100644 index 89c40d0d7..000000000 --- a/src/paks/check_mk_agent/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh From patchwork Wed Feb 12 09:34:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2780 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZHq0lMTz3xyV for ; Wed, 12 Feb 2020 09:35:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHp24cHz138; Wed, 12 Feb 2020 09:35:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHn6kyJz300H; Wed, 12 Feb 2020 09:35:17 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHj2dHQz2yYk for ; Wed, 12 Feb 2020 09:35:13 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHh4kbzz11k; Wed, 12 Feb 2020 09:35:12 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r/Vtiww4NlRVXVzKEG0Nr+IH4bcfngrfniScbEERw+U=; b=/KM3p8sK6pI0DYrMIT4KET4Gaetila2BpBS7hSiqNWRSiUUl5/GvGY2DcZ09lEfGV5ZSuN tK7KmJiqjauseCDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r/Vtiww4NlRVXVzKEG0Nr+IH4bcfngrfniScbEERw+U=; b=C6l3yFD2BcpYuyQtB96QpZCfAPkw131nlylwMZGDl6+RZlG14hgSZDJSy2po1/ZE59n0D9 OYCy2zK/gW2Tadj7+cmkLHXXN61BLYUkY7LbR2RbLdjqVluTqD0VwRg7hzWSVtE/6x+Kte wyVtL25p8I8Fv3u5mkurZA007dgZXlpGOsun3fRsH4iSysOg7xincngtOhdVI98LTSt3Fy uKA9a49J6nJH9jn1K3EHFVcmsIyCVn+r5vOxjQ8ONQHgH0KZ4P9cLhW+9Y0noQk0PHhLRk LEY47lMweN+FFaklJAa0axFaX908jXAbNdZR2ltYE8dBHLTJenabMNW3HxruZw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 05/14] Drop DirectFB Date: Wed, 12 Feb 2020 09:34:44 +0000 Message-Id: <20200212093453.5732-6-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This package is not very useful on its own and nobody seems to pull this as dependency any more. Signed-off-by: Michael Tremer --- config/rootfiles/packages/aarch64/directfb | 391 ---- config/rootfiles/packages/armv5tel/directfb | 402 ---- config/rootfiles/packages/armv7hl/directfb | 402 ---- config/rootfiles/packages/i586/directfb | 397 ---- config/rootfiles/packages/x86_64/directfb | 397 ---- lfs/directfb | 93 - make.sh | 1 - ...ctFB-1.7.7-add-missing-davinci-files.patch | 1717 ----------------- src/patches/DirectFB-1.7.7-fix_mknod.patch | 22 - 9 files changed, 3822 deletions(-) delete mode 100644 config/rootfiles/packages/aarch64/directfb delete mode 100644 config/rootfiles/packages/armv5tel/directfb delete mode 100644 config/rootfiles/packages/armv7hl/directfb delete mode 100644 config/rootfiles/packages/i586/directfb delete mode 100644 config/rootfiles/packages/x86_64/directfb delete mode 100644 lfs/directfb delete mode 100644 src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch delete mode 100644 src/patches/DirectFB-1.7.7-fix_mknod.patch diff --git a/config/rootfiles/packages/aarch64/directfb b/config/rootfiles/packages/aarch64/directfb deleted file mode 100644 index a3004e5fa..000000000 --- a/config/rootfiles/packages/aarch64/directfb +++ /dev/null @@ -1,391 +0,0 @@ -usr/bin/dfbdump -usr/bin/dfbdumpinput -usr/bin/dfbfx -usr/bin/dfbg -usr/bin/dfbinfo -usr/bin/dfbinput -usr/bin/dfbinspector -usr/bin/dfblayer -usr/bin/dfbmaster -usr/bin/dfbpenmount -usr/bin/dfbplay -usr/bin/dfbscreen -usr/bin/dfbshow -usr/bin/dfbswitch -usr/bin/directfb-config -usr/bin/directfb-csource -usr/bin/mkdfiff -usr/bin/mkdgiff -usr/bin/mkdgifft -usr/bin/pxa3xx_dump -#usr/include/++dfb -#usr/include/++dfb/++dfb.h -#usr/include/++dfb/++dfb_mangle.h -#usr/include/++dfb/++dfb_unmangle.h -#usr/include/++dfb/idirectfb.h -#usr/include/++dfb/idirectfbdatabuffer.h -#usr/include/++dfb/idirectfbdisplaylayer.h -#usr/include/++dfb/idirectfbeventbuffer.h -#usr/include/++dfb/idirectfbfont.h -#usr/include/++dfb/idirectfbimageprovider.h -#usr/include/++dfb/idirectfbinputdevice.h -#usr/include/++dfb/idirectfbpalette.h -#usr/include/++dfb/idirectfbscreen.h -#usr/include/++dfb/idirectfbsurface.h -#usr/include/++dfb/idirectfbvideoprovider.h -#usr/include/++dfb/idirectfbwindow.h -#usr/include/directfb -#usr/include/directfb-internal -#usr/include/directfb-internal/core -#usr/include/directfb-internal/core/CoreDFB.h -#usr/include/directfb-internal/core/CoreDFB_CallMode.h -#usr/include/directfb-internal/core/CoreDFB_includes.h -#usr/include/directfb-internal/core/CoreGraphicsState.h -#usr/include/directfb-internal/core/CoreGraphicsStateClient.h -#usr/include/directfb-internal/core/CoreGraphicsState_includes.h -#usr/include/directfb-internal/core/CoreInputDevice.h -#usr/include/directfb-internal/core/CoreInputDevice_includes.h -#usr/include/directfb-internal/core/CoreLayer.h -#usr/include/directfb-internal/core/CoreLayerContext.h -#usr/include/directfb-internal/core/CoreLayerContext_includes.h -#usr/include/directfb-internal/core/CoreLayerRegion.h -#usr/include/directfb-internal/core/CoreLayerRegion_includes.h -#usr/include/directfb-internal/core/CoreLayer_includes.h -#usr/include/directfb-internal/core/CorePalette.h -#usr/include/directfb-internal/core/CorePalette_includes.h -#usr/include/directfb-internal/core/CoreScreen.h -#usr/include/directfb-internal/core/CoreScreen_includes.h -#usr/include/directfb-internal/core/CoreSlave.h -#usr/include/directfb-internal/core/CoreSlave_includes.h -#usr/include/directfb-internal/core/CoreSurface.h -#usr/include/directfb-internal/core/CoreSurfaceClient.h -#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h -#usr/include/directfb-internal/core/CoreSurface_includes.h -#usr/include/directfb-internal/core/CoreWindow.h -#usr/include/directfb-internal/core/CoreWindowStack.h -#usr/include/directfb-internal/core/CoreWindowStack_includes.h -#usr/include/directfb-internal/core/CoreWindow_includes.h -#usr/include/directfb-internal/core/Debug.h -#usr/include/directfb-internal/core/DisplayTask.h -#usr/include/directfb-internal/core/Fifo.h -#usr/include/directfb-internal/core/Interface.h -#usr/include/directfb-internal/core/PacketBuffer.h -#usr/include/directfb-internal/core/Renderer.h -#usr/include/directfb-internal/core/SurfaceTask.h -#usr/include/directfb-internal/core/Task.h -#usr/include/directfb-internal/core/TaskManager.h -#usr/include/directfb-internal/core/TaskThreadsQ.h -#usr/include/directfb-internal/core/Util.h -#usr/include/directfb-internal/core/clipboard.h -#usr/include/directfb-internal/core/colorhash.h -#usr/include/directfb-internal/core/core.h -#usr/include/directfb-internal/core/core_parts.h -#usr/include/directfb-internal/core/core_strings.h -#usr/include/directfb-internal/core/core_system.h -#usr/include/directfb-internal/core/coredefs.h -#usr/include/directfb-internal/core/coretypes.h -#usr/include/directfb-internal/core/fonts.h -#usr/include/directfb-internal/core/gfxcard.h -#usr/include/directfb-internal/core/graphics_driver.h -#usr/include/directfb-internal/core/graphics_state.h -#usr/include/directfb-internal/core/input.h -#usr/include/directfb-internal/core/input_driver.h -#usr/include/directfb-internal/core/input_hub.h -#usr/include/directfb-internal/core/layer_context.h -#usr/include/directfb-internal/core/layer_control.h -#usr/include/directfb-internal/core/layer_region.h -#usr/include/directfb-internal/core/layers.h -#usr/include/directfb-internal/core/layers_internal.h -#usr/include/directfb-internal/core/palette.h -#usr/include/directfb-internal/core/screen.h -#usr/include/directfb-internal/core/screens.h -#usr/include/directfb-internal/core/screens_internal.h -#usr/include/directfb-internal/core/state.h -#usr/include/directfb-internal/core/surface.h -#usr/include/directfb-internal/core/surface_allocation.h -#usr/include/directfb-internal/core/surface_buffer.h -#usr/include/directfb-internal/core/surface_client.h -#usr/include/directfb-internal/core/surface_core.h -#usr/include/directfb-internal/core/surface_pool.h -#usr/include/directfb-internal/core/surface_pool_bridge.h -#usr/include/directfb-internal/core/system.h -#usr/include/directfb-internal/core/windows.h -#usr/include/directfb-internal/core/windows_internal.h -#usr/include/directfb-internal/core/windowstack.h -#usr/include/directfb-internal/core/wm.h -#usr/include/directfb-internal/core/wm_module.h -#usr/include/directfb-internal/devmem -#usr/include/directfb-internal/devmem/devmem.h -#usr/include/directfb-internal/devmem/surfacemanager.h -#usr/include/directfb-internal/display -#usr/include/directfb-internal/display/idirectfbdisplaylayer.h -#usr/include/directfb-internal/display/idirectfbpalette.h -#usr/include/directfb-internal/display/idirectfbscreen.h -#usr/include/directfb-internal/display/idirectfbsurface.h -#usr/include/directfb-internal/display/idirectfbsurface_layer.h -#usr/include/directfb-internal/display/idirectfbsurface_window.h -#usr/include/directfb-internal/dummy -#usr/include/directfb-internal/dummy/dummy.h -#usr/include/directfb-internal/fbdev -#usr/include/directfb-internal/fbdev/agp.h -#usr/include/directfb-internal/fbdev/fb.h -#usr/include/directfb-internal/fbdev/fbdev.h -#usr/include/directfb-internal/fbdev/surfacemanager.h -#usr/include/directfb-internal/fbdev/vt.h -#usr/include/directfb-internal/gfx -#usr/include/directfb-internal/gfx/clip.h -#usr/include/directfb-internal/gfx/convert.h -#usr/include/directfb-internal/gfx/generic -#usr/include/directfb-internal/gfx/generic/generic.h -#usr/include/directfb-internal/gfx/util.h -#usr/include/directfb-internal/idirectfb.h -#usr/include/directfb-internal/init.h -#usr/include/directfb-internal/input -#usr/include/directfb-internal/input/idirectfbinputbuffer.h -#usr/include/directfb-internal/input/idirectfbinputdevice.h -#usr/include/directfb-internal/media -#usr/include/directfb-internal/media/idirectfbdatabuffer.h -#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h -#usr/include/directfb-internal/media/idirectfbfont.h -#usr/include/directfb-internal/media/idirectfbimageprovider.h -#usr/include/directfb-internal/media/idirectfbimageprovider_client.h -#usr/include/directfb-internal/media/idirectfbvideoprovider.h -#usr/include/directfb-internal/misc -#usr/include/directfb-internal/misc/conf.h -#usr/include/directfb-internal/misc/gfx_util.h -#usr/include/directfb-internal/misc/util.h -#usr/include/directfb-internal/windows -#usr/include/directfb-internal/windows/idirectfbwindow.h -#usr/include/directfb/dfb_types.h -#usr/include/directfb/dfiff.h -#usr/include/directfb/dgiff.h -#usr/include/directfb/direct -#usr/include/directfb/direct/Lists.h -#usr/include/directfb/direct/LockWQ.h -#usr/include/directfb/direct/Magic.h -#usr/include/directfb/direct/Mutex.h -#usr/include/directfb/direct/Performer.h -#usr/include/directfb/direct/String.h -#usr/include/directfb/direct/TLSObject.h -#usr/include/directfb/direct/ToString.h -#usr/include/directfb/direct/Types++.h -#usr/include/directfb/direct/atomic.h -#usr/include/directfb/direct/build.h -#usr/include/directfb/direct/clock.h -#usr/include/directfb/direct/compiler.h -#usr/include/directfb/direct/conf.h -#usr/include/directfb/direct/debug.h -#usr/include/directfb/direct/direct.h -#usr/include/directfb/direct/fastlz.h -#usr/include/directfb/direct/fifo.h -#usr/include/directfb/direct/filesystem.h -#usr/include/directfb/direct/flz.h -#usr/include/directfb/direct/hash.h -#usr/include/directfb/direct/init.h -#usr/include/directfb/direct/interface.h -#usr/include/directfb/direct/interface_implementation.h -#usr/include/directfb/direct/list.h -#usr/include/directfb/direct/log.h -#usr/include/directfb/direct/log_domain.h -#usr/include/directfb/direct/map.h -#usr/include/directfb/direct/mem.h -#usr/include/directfb/direct/memcpy.h -#usr/include/directfb/direct/messages.h -#usr/include/directfb/direct/modules.h -#usr/include/directfb/direct/os -#usr/include/directfb/direct/os/clock.h -#usr/include/directfb/direct/os/filesystem.h -#usr/include/directfb/direct/os/linux -#usr/include/directfb/direct/os/linux/glibc -#usr/include/directfb/direct/os/linux/glibc/filesystem.h -#usr/include/directfb/direct/os/linux/glibc/mutex.h -#usr/include/directfb/direct/os/linux/glibc/thread.h -#usr/include/directfb/direct/os/linux/glibc/types.h -#usr/include/directfb/direct/os/linux/glibc/waitqueue.h -#usr/include/directfb/direct/os/log.h -#usr/include/directfb/direct/os/mem.h -#usr/include/directfb/direct/os/mutex.h -#usr/include/directfb/direct/os/signals.h -#usr/include/directfb/direct/os/system.h -#usr/include/directfb/direct/os/thread.h -#usr/include/directfb/direct/os/types.h -#usr/include/directfb/direct/os/waitqueue.h -#usr/include/directfb/direct/perf.h -#usr/include/directfb/direct/print.h -#usr/include/directfb/direct/processor.h -#usr/include/directfb/direct/result.h -#usr/include/directfb/direct/serial.h -#usr/include/directfb/direct/signals.h -#usr/include/directfb/direct/stream.h -#usr/include/directfb/direct/system.h -#usr/include/directfb/direct/thread.h -#usr/include/directfb/direct/trace.h -#usr/include/directfb/direct/tree.h -#usr/include/directfb/direct/types.h -#usr/include/directfb/direct/utf8.h -#usr/include/directfb/direct/util.h -#usr/include/directfb/direct/uuid.h -#usr/include/directfb/directfb++.h -#usr/include/directfb/directfb.h -#usr/include/directfb/directfb_build.h -#usr/include/directfb/directfb_graphics.h -#usr/include/directfb/directfb_keyboard.h -#usr/include/directfb/directfb_keynames.h -#usr/include/directfb/directfb_strings.h -#usr/include/directfb/directfb_util.h -#usr/include/directfb/directfb_version.h -#usr/include/directfb/directfb_water.h -#usr/include/directfb/directfb_water_strings.h -#usr/include/directfb/directfb_windows.h -#usr/include/directfb/directfbgl.h -#usr/include/directfb/directfbgl2.h -#usr/include/directfb/fusion -#usr/include/directfb/fusion/Debug.h -#usr/include/directfb/fusion/arena.h -#usr/include/directfb/fusion/build.h -#usr/include/directfb/fusion/call.h -#usr/include/directfb/fusion/conf.h -#usr/include/directfb/fusion/fusion.h -#usr/include/directfb/fusion/fusion_internal.h -#usr/include/directfb/fusion/hash.h -#usr/include/directfb/fusion/init.h -#usr/include/directfb/fusion/lock.h -#usr/include/directfb/fusion/object.h -#usr/include/directfb/fusion/property.h -#usr/include/directfb/fusion/protocol.h -#usr/include/directfb/fusion/reactor.h -#usr/include/directfb/fusion/ref.h -#usr/include/directfb/fusion/shm -#usr/include/directfb/fusion/shm/pool.h -#usr/include/directfb/fusion/shm/shm.h -#usr/include/directfb/fusion/shm/shm_internal.h -#usr/include/directfb/fusion/shmalloc.h -#usr/include/directfb/fusion/types.h -#usr/include/directfb/fusion/vector.h -#usr/lib/directfb-1.7-7 -#usr/lib/directfb-1.7-7/gfxdrivers -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so -#usr/lib/directfb-1.7-7/inputdrivers -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so -#usr/lib/directfb-1.7-7/interfaces -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so -#usr/lib/directfb-1.7-7/interfaces/IWater -#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la -usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so -#usr/lib/directfb-1.7-7/systems -#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la -usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la -usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la -usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la -usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so -#usr/lib/directfb-1.7-7/wm -#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la -usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so -usr/lib/lib++dfb-1.7.so.7 -usr/lib/lib++dfb-1.7.so.7.0.0 -#usr/lib/lib++dfb.la -#usr/lib/lib++dfb.so -usr/lib/libdirect-1.7.so.7 -usr/lib/libdirect-1.7.so.7.0.0 -#usr/lib/libdirect.la -#usr/lib/libdirect.so -usr/lib/libdirectfb-1.7.so.7 -usr/lib/libdirectfb-1.7.so.7.0.0 -#usr/lib/libdirectfb.la -#usr/lib/libdirectfb.so -usr/lib/libfusion-1.7.so.7 -usr/lib/libfusion-1.7.so.7.0.0 -#usr/lib/libfusion.la -#usr/lib/libfusion.so -#usr/lib/pkgconfig/++dfb.pc -#usr/lib/pkgconfig/direct.pc -#usr/lib/pkgconfig/directfb-internal.pc -#usr/lib/pkgconfig/directfb.pc -#usr/lib/pkgconfig/fusion.pc -#usr/share/directfb-1.7.7 -usr/share/directfb-1.7.7/cursor.dat -usr/share/directfb-1.7.7/cursor.png -usr/share/directfb-1.7.7/decker.dgiff -usr/share/directfb-1.7.7/decker.ttf -#usr/share/man/man1/dfbg.1 -#usr/share/man/man1/directfb-csource.1 -#usr/share/man/man5/directfbrc.5 diff --git a/config/rootfiles/packages/armv5tel/directfb b/config/rootfiles/packages/armv5tel/directfb deleted file mode 100644 index d77367ba0..000000000 --- a/config/rootfiles/packages/armv5tel/directfb +++ /dev/null @@ -1,402 +0,0 @@ -usr/bin/c64xdump -usr/bin/dfbdump -usr/bin/dfbdumpinput -usr/bin/dfbfx -usr/bin/dfbg -usr/bin/dfbinfo -usr/bin/dfbinput -usr/bin/dfbinspector -usr/bin/dfblayer -usr/bin/dfbmaster -usr/bin/dfbpenmount -usr/bin/dfbplay -usr/bin/dfbscreen -usr/bin/dfbshow -usr/bin/dfbswitch -usr/bin/directfb-config -usr/bin/directfb-csource -usr/bin/mkdfiff -usr/bin/mkdgiff -usr/bin/mkdgifft -usr/bin/pxa3xx_dump -#usr/include/++dfb -#usr/include/++dfb/++dfb.h -#usr/include/++dfb/++dfb_mangle.h -#usr/include/++dfb/++dfb_unmangle.h -#usr/include/++dfb/idirectfb.h -#usr/include/++dfb/idirectfbdatabuffer.h -#usr/include/++dfb/idirectfbdisplaylayer.h -#usr/include/++dfb/idirectfbeventbuffer.h -#usr/include/++dfb/idirectfbfont.h -#usr/include/++dfb/idirectfbimageprovider.h -#usr/include/++dfb/idirectfbinputdevice.h -#usr/include/++dfb/idirectfbpalette.h -#usr/include/++dfb/idirectfbscreen.h -#usr/include/++dfb/idirectfbsurface.h -#usr/include/++dfb/idirectfbvideoprovider.h -#usr/include/++dfb/idirectfbwindow.h -#usr/include/directfb -#usr/include/directfb-internal -#usr/include/directfb-internal/core -#usr/include/directfb-internal/core/CoreDFB.h -#usr/include/directfb-internal/core/CoreDFB_CallMode.h -#usr/include/directfb-internal/core/CoreDFB_includes.h -#usr/include/directfb-internal/core/CoreGraphicsState.h -#usr/include/directfb-internal/core/CoreGraphicsStateClient.h -#usr/include/directfb-internal/core/CoreGraphicsState_includes.h -#usr/include/directfb-internal/core/CoreInputDevice.h -#usr/include/directfb-internal/core/CoreInputDevice_includes.h -#usr/include/directfb-internal/core/CoreLayer.h -#usr/include/directfb-internal/core/CoreLayerContext.h -#usr/include/directfb-internal/core/CoreLayerContext_includes.h -#usr/include/directfb-internal/core/CoreLayerRegion.h -#usr/include/directfb-internal/core/CoreLayerRegion_includes.h -#usr/include/directfb-internal/core/CoreLayer_includes.h -#usr/include/directfb-internal/core/CorePalette.h -#usr/include/directfb-internal/core/CorePalette_includes.h -#usr/include/directfb-internal/core/CoreScreen.h -#usr/include/directfb-internal/core/CoreScreen_includes.h -#usr/include/directfb-internal/core/CoreSlave.h -#usr/include/directfb-internal/core/CoreSlave_includes.h -#usr/include/directfb-internal/core/CoreSurface.h -#usr/include/directfb-internal/core/CoreSurfaceClient.h -#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h -#usr/include/directfb-internal/core/CoreSurface_includes.h -#usr/include/directfb-internal/core/CoreWindow.h -#usr/include/directfb-internal/core/CoreWindowStack.h -#usr/include/directfb-internal/core/CoreWindowStack_includes.h -#usr/include/directfb-internal/core/CoreWindow_includes.h -#usr/include/directfb-internal/core/Debug.h -#usr/include/directfb-internal/core/DisplayTask.h -#usr/include/directfb-internal/core/Fifo.h -#usr/include/directfb-internal/core/Interface.h -#usr/include/directfb-internal/core/PacketBuffer.h -#usr/include/directfb-internal/core/Renderer.h -#usr/include/directfb-internal/core/SurfaceTask.h -#usr/include/directfb-internal/core/Task.h -#usr/include/directfb-internal/core/TaskManager.h -#usr/include/directfb-internal/core/TaskThreadsQ.h -#usr/include/directfb-internal/core/Util.h -#usr/include/directfb-internal/core/clipboard.h -#usr/include/directfb-internal/core/colorhash.h -#usr/include/directfb-internal/core/core.h -#usr/include/directfb-internal/core/core_parts.h -#usr/include/directfb-internal/core/core_strings.h -#usr/include/directfb-internal/core/core_system.h -#usr/include/directfb-internal/core/coredefs.h -#usr/include/directfb-internal/core/coretypes.h -#usr/include/directfb-internal/core/fonts.h -#usr/include/directfb-internal/core/gfxcard.h -#usr/include/directfb-internal/core/graphics_driver.h -#usr/include/directfb-internal/core/graphics_state.h -#usr/include/directfb-internal/core/input.h -#usr/include/directfb-internal/core/input_driver.h -#usr/include/directfb-internal/core/input_hub.h -#usr/include/directfb-internal/core/layer_context.h -#usr/include/directfb-internal/core/layer_control.h -#usr/include/directfb-internal/core/layer_region.h -#usr/include/directfb-internal/core/layers.h -#usr/include/directfb-internal/core/layers_internal.h -#usr/include/directfb-internal/core/palette.h -#usr/include/directfb-internal/core/screen.h -#usr/include/directfb-internal/core/screens.h -#usr/include/directfb-internal/core/screens_internal.h -#usr/include/directfb-internal/core/state.h -#usr/include/directfb-internal/core/surface.h -#usr/include/directfb-internal/core/surface_allocation.h -#usr/include/directfb-internal/core/surface_buffer.h -#usr/include/directfb-internal/core/surface_client.h -#usr/include/directfb-internal/core/surface_core.h -#usr/include/directfb-internal/core/surface_pool.h -#usr/include/directfb-internal/core/surface_pool_bridge.h -#usr/include/directfb-internal/core/system.h -#usr/include/directfb-internal/core/windows.h -#usr/include/directfb-internal/core/windows_internal.h -#usr/include/directfb-internal/core/windowstack.h -#usr/include/directfb-internal/core/wm.h -#usr/include/directfb-internal/core/wm_module.h -#usr/include/directfb-internal/devmem -#usr/include/directfb-internal/devmem/devmem.h -#usr/include/directfb-internal/devmem/surfacemanager.h -#usr/include/directfb-internal/display -#usr/include/directfb-internal/display/idirectfbdisplaylayer.h -#usr/include/directfb-internal/display/idirectfbpalette.h -#usr/include/directfb-internal/display/idirectfbscreen.h -#usr/include/directfb-internal/display/idirectfbsurface.h -#usr/include/directfb-internal/display/idirectfbsurface_layer.h -#usr/include/directfb-internal/display/idirectfbsurface_window.h -#usr/include/directfb-internal/dummy -#usr/include/directfb-internal/dummy/dummy.h -#usr/include/directfb-internal/fbdev -#usr/include/directfb-internal/fbdev/agp.h -#usr/include/directfb-internal/fbdev/fb.h -#usr/include/directfb-internal/fbdev/fbdev.h -#usr/include/directfb-internal/fbdev/surfacemanager.h -#usr/include/directfb-internal/fbdev/vt.h -#usr/include/directfb-internal/gfx -#usr/include/directfb-internal/gfx/clip.h -#usr/include/directfb-internal/gfx/convert.h -#usr/include/directfb-internal/gfx/generic -#usr/include/directfb-internal/gfx/generic/generic.h -#usr/include/directfb-internal/gfx/util.h -#usr/include/directfb-internal/idirectfb.h -#usr/include/directfb-internal/init.h -#usr/include/directfb-internal/input -#usr/include/directfb-internal/input/idirectfbinputbuffer.h -#usr/include/directfb-internal/input/idirectfbinputdevice.h -#usr/include/directfb-internal/media -#usr/include/directfb-internal/media/idirectfbdatabuffer.h -#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h -#usr/include/directfb-internal/media/idirectfbfont.h -#usr/include/directfb-internal/media/idirectfbimageprovider.h -#usr/include/directfb-internal/media/idirectfbimageprovider_client.h -#usr/include/directfb-internal/media/idirectfbvideoprovider.h -#usr/include/directfb-internal/misc -#usr/include/directfb-internal/misc/conf.h -#usr/include/directfb-internal/misc/gfx_util.h -#usr/include/directfb-internal/misc/util.h -#usr/include/directfb-internal/windows -#usr/include/directfb-internal/windows/idirectfbwindow.h -#usr/include/directfb/dfb_types.h -#usr/include/directfb/dfiff.h -#usr/include/directfb/dgiff.h -#usr/include/directfb/direct -#usr/include/directfb/direct/Lists.h -#usr/include/directfb/direct/LockWQ.h -#usr/include/directfb/direct/Magic.h -#usr/include/directfb/direct/Mutex.h -#usr/include/directfb/direct/Performer.h -#usr/include/directfb/direct/String.h -#usr/include/directfb/direct/TLSObject.h -#usr/include/directfb/direct/ToString.h -#usr/include/directfb/direct/Types++.h -#usr/include/directfb/direct/atomic.h -#usr/include/directfb/direct/build.h -#usr/include/directfb/direct/clock.h -#usr/include/directfb/direct/compiler.h -#usr/include/directfb/direct/conf.h -#usr/include/directfb/direct/debug.h -#usr/include/directfb/direct/direct.h -#usr/include/directfb/direct/fastlz.h -#usr/include/directfb/direct/fifo.h -#usr/include/directfb/direct/filesystem.h -#usr/include/directfb/direct/flz.h -#usr/include/directfb/direct/hash.h -#usr/include/directfb/direct/init.h -#usr/include/directfb/direct/interface.h -#usr/include/directfb/direct/interface_implementation.h -#usr/include/directfb/direct/list.h -#usr/include/directfb/direct/log.h -#usr/include/directfb/direct/log_domain.h -#usr/include/directfb/direct/map.h -#usr/include/directfb/direct/mem.h -#usr/include/directfb/direct/memcpy.h -#usr/include/directfb/direct/messages.h -#usr/include/directfb/direct/modules.h -#usr/include/directfb/direct/os -#usr/include/directfb/direct/os/clock.h -#usr/include/directfb/direct/os/filesystem.h -#usr/include/directfb/direct/os/linux -#usr/include/directfb/direct/os/linux/glibc -#usr/include/directfb/direct/os/linux/glibc/filesystem.h -#usr/include/directfb/direct/os/linux/glibc/mutex.h -#usr/include/directfb/direct/os/linux/glibc/thread.h -#usr/include/directfb/direct/os/linux/glibc/types.h -#usr/include/directfb/direct/os/linux/glibc/waitqueue.h -#usr/include/directfb/direct/os/log.h -#usr/include/directfb/direct/os/mem.h -#usr/include/directfb/direct/os/mutex.h -#usr/include/directfb/direct/os/signals.h -#usr/include/directfb/direct/os/system.h -#usr/include/directfb/direct/os/thread.h -#usr/include/directfb/direct/os/types.h -#usr/include/directfb/direct/os/waitqueue.h -#usr/include/directfb/direct/perf.h -#usr/include/directfb/direct/print.h -#usr/include/directfb/direct/processor.h -#usr/include/directfb/direct/result.h -#usr/include/directfb/direct/serial.h -#usr/include/directfb/direct/signals.h -#usr/include/directfb/direct/stream.h -#usr/include/directfb/direct/system.h -#usr/include/directfb/direct/thread.h -#usr/include/directfb/direct/trace.h -#usr/include/directfb/direct/tree.h -#usr/include/directfb/direct/types.h -#usr/include/directfb/direct/utf8.h -#usr/include/directfb/direct/util.h -#usr/include/directfb/direct/uuid.h -#usr/include/directfb/directfb++.h -#usr/include/directfb/directfb.h -#usr/include/directfb/directfb_build.h -#usr/include/directfb/directfb_graphics.h -#usr/include/directfb/directfb_keyboard.h -#usr/include/directfb/directfb_keynames.h -#usr/include/directfb/directfb_strings.h -#usr/include/directfb/directfb_util.h -#usr/include/directfb/directfb_version.h -#usr/include/directfb/directfb_water.h -#usr/include/directfb/directfb_water_strings.h -#usr/include/directfb/directfb_windows.h -#usr/include/directfb/directfbgl.h -#usr/include/directfb/directfbgl2.h -#usr/include/directfb/fusion -#usr/include/directfb/fusion/Debug.h -#usr/include/directfb/fusion/arena.h -#usr/include/directfb/fusion/build.h -#usr/include/directfb/fusion/call.h -#usr/include/directfb/fusion/conf.h -#usr/include/directfb/fusion/fusion.h -#usr/include/directfb/fusion/fusion_internal.h -#usr/include/directfb/fusion/hash.h -#usr/include/directfb/fusion/init.h -#usr/include/directfb/fusion/lock.h -#usr/include/directfb/fusion/object.h -#usr/include/directfb/fusion/property.h -#usr/include/directfb/fusion/protocol.h -#usr/include/directfb/fusion/reactor.h -#usr/include/directfb/fusion/ref.h -#usr/include/directfb/fusion/shm -#usr/include/directfb/fusion/shm/pool.h -#usr/include/directfb/fusion/shm/shm.h -#usr/include/directfb/fusion/shm/shm_internal.h -#usr/include/directfb/fusion/shmalloc.h -#usr/include/directfb/fusion/types.h -#usr/include/directfb/fusion/vector.h -#usr/lib/directfb-1.7-7 -#usr/lib/directfb-1.7-7/gfxdrivers -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so -#usr/lib/directfb-1.7-7/inputdrivers -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so -#usr/lib/directfb-1.7-7/interfaces -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la -usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so -#usr/lib/directfb-1.7-7/interfaces/IWater -#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la -usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so -#usr/lib/directfb-1.7-7/systems -#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la -usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la -usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la -usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la -usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so -#usr/lib/directfb-1.7-7/wm -#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la -usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so -usr/lib/lib++dfb-1.7.so.7 -usr/lib/lib++dfb-1.7.so.7.0.0 -#usr/lib/lib++dfb.la -#usr/lib/lib++dfb.so -#usr/lib/libdavinci_c64x.la -#usr/lib/libdavinci_c64x.so -usr/lib/libdavinci_c64x.so.0 -usr/lib/libdavinci_c64x.so.0.0.0 -usr/lib/libdirect-1.7.so.7 -usr/lib/libdirect-1.7.so.7.0.0 -#usr/lib/libdirect.la -usr/lib/libdirect.so -usr/lib/libdirectfb-1.7.so.7 -usr/lib/libdirectfb-1.7.so.7.0.0 -#usr/lib/libdirectfb.la -usr/lib/libdirectfb.so -usr/lib/libfusion-1.7.so.7 -usr/lib/libfusion-1.7.so.7.0.0 -#usr/lib/libfusion.la -usr/lib/libfusion.so -#usr/lib/pkgconfig/++dfb.pc -#usr/lib/pkgconfig/direct.pc -#usr/lib/pkgconfig/directfb-internal.pc -#usr/lib/pkgconfig/directfb.pc -#usr/lib/pkgconfig/fusion.pc -#usr/share/directfb-1.7.7 -usr/share/directfb-1.7.7/cursor.dat -usr/share/directfb-1.7.7/cursor.png -usr/share/directfb-1.7.7/decker.dgiff -usr/share/directfb-1.7.7/decker.ttf -#usr/share/man/man1/dfbg.1 -#usr/share/man/man1/directfb-csource.1 -#usr/share/man/man5/directfbrc.5 diff --git a/config/rootfiles/packages/armv7hl/directfb b/config/rootfiles/packages/armv7hl/directfb deleted file mode 100644 index 9863c68af..000000000 --- a/config/rootfiles/packages/armv7hl/directfb +++ /dev/null @@ -1,402 +0,0 @@ -usr/bin/c64xdump -usr/bin/dfbdump -usr/bin/dfbdumpinput -usr/bin/dfbfx -usr/bin/dfbg -usr/bin/dfbinfo -usr/bin/dfbinput -usr/bin/dfbinspector -usr/bin/dfblayer -usr/bin/dfbmaster -usr/bin/dfbpenmount -usr/bin/dfbplay -usr/bin/dfbscreen -usr/bin/dfbshow -usr/bin/dfbswitch -usr/bin/directfb-config -usr/bin/directfb-csource -usr/bin/mkdfiff -usr/bin/mkdgiff -usr/bin/mkdgifft -usr/bin/pxa3xx_dump -#usr/include/++dfb -#usr/include/++dfb/++dfb.h -#usr/include/++dfb/++dfb_mangle.h -#usr/include/++dfb/++dfb_unmangle.h -#usr/include/++dfb/idirectfb.h -#usr/include/++dfb/idirectfbdatabuffer.h -#usr/include/++dfb/idirectfbdisplaylayer.h -#usr/include/++dfb/idirectfbeventbuffer.h -#usr/include/++dfb/idirectfbfont.h -#usr/include/++dfb/idirectfbimageprovider.h -#usr/include/++dfb/idirectfbinputdevice.h -#usr/include/++dfb/idirectfbpalette.h -#usr/include/++dfb/idirectfbscreen.h -#usr/include/++dfb/idirectfbsurface.h -#usr/include/++dfb/idirectfbvideoprovider.h -#usr/include/++dfb/idirectfbwindow.h -#usr/include/directfb -#usr/include/directfb-internal -#usr/include/directfb-internal/core -#usr/include/directfb-internal/core/CoreDFB.h -#usr/include/directfb-internal/core/CoreDFB_CallMode.h -#usr/include/directfb-internal/core/CoreDFB_includes.h -#usr/include/directfb-internal/core/CoreGraphicsState.h -#usr/include/directfb-internal/core/CoreGraphicsStateClient.h -#usr/include/directfb-internal/core/CoreGraphicsState_includes.h -#usr/include/directfb-internal/core/CoreInputDevice.h -#usr/include/directfb-internal/core/CoreInputDevice_includes.h -#usr/include/directfb-internal/core/CoreLayer.h -#usr/include/directfb-internal/core/CoreLayerContext.h -#usr/include/directfb-internal/core/CoreLayerContext_includes.h -#usr/include/directfb-internal/core/CoreLayerRegion.h -#usr/include/directfb-internal/core/CoreLayerRegion_includes.h -#usr/include/directfb-internal/core/CoreLayer_includes.h -#usr/include/directfb-internal/core/CorePalette.h -#usr/include/directfb-internal/core/CorePalette_includes.h -#usr/include/directfb-internal/core/CoreScreen.h -#usr/include/directfb-internal/core/CoreScreen_includes.h -#usr/include/directfb-internal/core/CoreSlave.h -#usr/include/directfb-internal/core/CoreSlave_includes.h -#usr/include/directfb-internal/core/CoreSurface.h -#usr/include/directfb-internal/core/CoreSurfaceClient.h -#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h -#usr/include/directfb-internal/core/CoreSurface_includes.h -#usr/include/directfb-internal/core/CoreWindow.h -#usr/include/directfb-internal/core/CoreWindowStack.h -#usr/include/directfb-internal/core/CoreWindowStack_includes.h -#usr/include/directfb-internal/core/CoreWindow_includes.h -#usr/include/directfb-internal/core/Debug.h -#usr/include/directfb-internal/core/DisplayTask.h -#usr/include/directfb-internal/core/Fifo.h -#usr/include/directfb-internal/core/Interface.h -#usr/include/directfb-internal/core/PacketBuffer.h -#usr/include/directfb-internal/core/Renderer.h -#usr/include/directfb-internal/core/SurfaceTask.h -#usr/include/directfb-internal/core/Task.h -#usr/include/directfb-internal/core/TaskManager.h -#usr/include/directfb-internal/core/TaskThreadsQ.h -#usr/include/directfb-internal/core/Util.h -#usr/include/directfb-internal/core/clipboard.h -#usr/include/directfb-internal/core/colorhash.h -#usr/include/directfb-internal/core/core.h -#usr/include/directfb-internal/core/core_parts.h -#usr/include/directfb-internal/core/core_strings.h -#usr/include/directfb-internal/core/core_system.h -#usr/include/directfb-internal/core/coredefs.h -#usr/include/directfb-internal/core/coretypes.h -#usr/include/directfb-internal/core/fonts.h -#usr/include/directfb-internal/core/gfxcard.h -#usr/include/directfb-internal/core/graphics_driver.h -#usr/include/directfb-internal/core/graphics_state.h -#usr/include/directfb-internal/core/input.h -#usr/include/directfb-internal/core/input_driver.h -#usr/include/directfb-internal/core/input_hub.h -#usr/include/directfb-internal/core/layer_context.h -#usr/include/directfb-internal/core/layer_control.h -#usr/include/directfb-internal/core/layer_region.h -#usr/include/directfb-internal/core/layers.h -#usr/include/directfb-internal/core/layers_internal.h -#usr/include/directfb-internal/core/palette.h -#usr/include/directfb-internal/core/screen.h -#usr/include/directfb-internal/core/screens.h -#usr/include/directfb-internal/core/screens_internal.h -#usr/include/directfb-internal/core/state.h -#usr/include/directfb-internal/core/surface.h -#usr/include/directfb-internal/core/surface_allocation.h -#usr/include/directfb-internal/core/surface_buffer.h -#usr/include/directfb-internal/core/surface_client.h -#usr/include/directfb-internal/core/surface_core.h -#usr/include/directfb-internal/core/surface_pool.h -#usr/include/directfb-internal/core/surface_pool_bridge.h -#usr/include/directfb-internal/core/system.h -#usr/include/directfb-internal/core/windows.h -#usr/include/directfb-internal/core/windows_internal.h -#usr/include/directfb-internal/core/windowstack.h -#usr/include/directfb-internal/core/wm.h -#usr/include/directfb-internal/core/wm_module.h -#usr/include/directfb-internal/devmem -#usr/include/directfb-internal/devmem/devmem.h -#usr/include/directfb-internal/devmem/surfacemanager.h -#usr/include/directfb-internal/display -#usr/include/directfb-internal/display/idirectfbdisplaylayer.h -#usr/include/directfb-internal/display/idirectfbpalette.h -#usr/include/directfb-internal/display/idirectfbscreen.h -#usr/include/directfb-internal/display/idirectfbsurface.h -#usr/include/directfb-internal/display/idirectfbsurface_layer.h -#usr/include/directfb-internal/display/idirectfbsurface_window.h -#usr/include/directfb-internal/dummy -#usr/include/directfb-internal/dummy/dummy.h -#usr/include/directfb-internal/fbdev -#usr/include/directfb-internal/fbdev/agp.h -#usr/include/directfb-internal/fbdev/fb.h -#usr/include/directfb-internal/fbdev/fbdev.h -#usr/include/directfb-internal/fbdev/surfacemanager.h -#usr/include/directfb-internal/fbdev/vt.h -#usr/include/directfb-internal/gfx -#usr/include/directfb-internal/gfx/clip.h -#usr/include/directfb-internal/gfx/convert.h -#usr/include/directfb-internal/gfx/generic -#usr/include/directfb-internal/gfx/generic/generic.h -#usr/include/directfb-internal/gfx/util.h -#usr/include/directfb-internal/idirectfb.h -#usr/include/directfb-internal/init.h -#usr/include/directfb-internal/input -#usr/include/directfb-internal/input/idirectfbinputbuffer.h -#usr/include/directfb-internal/input/idirectfbinputdevice.h -#usr/include/directfb-internal/media -#usr/include/directfb-internal/media/idirectfbdatabuffer.h -#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h -#usr/include/directfb-internal/media/idirectfbfont.h -#usr/include/directfb-internal/media/idirectfbimageprovider.h -#usr/include/directfb-internal/media/idirectfbimageprovider_client.h -#usr/include/directfb-internal/media/idirectfbvideoprovider.h -#usr/include/directfb-internal/misc -#usr/include/directfb-internal/misc/conf.h -#usr/include/directfb-internal/misc/gfx_util.h -#usr/include/directfb-internal/misc/util.h -#usr/include/directfb-internal/windows -#usr/include/directfb-internal/windows/idirectfbwindow.h -#usr/include/directfb/dfb_types.h -#usr/include/directfb/dfiff.h -#usr/include/directfb/dgiff.h -#usr/include/directfb/direct -#usr/include/directfb/direct/Lists.h -#usr/include/directfb/direct/LockWQ.h -#usr/include/directfb/direct/Magic.h -#usr/include/directfb/direct/Mutex.h -#usr/include/directfb/direct/Performer.h -#usr/include/directfb/direct/String.h -#usr/include/directfb/direct/TLSObject.h -#usr/include/directfb/direct/ToString.h -#usr/include/directfb/direct/Types++.h -#usr/include/directfb/direct/atomic.h -#usr/include/directfb/direct/build.h -#usr/include/directfb/direct/clock.h -#usr/include/directfb/direct/compiler.h -#usr/include/directfb/direct/conf.h -#usr/include/directfb/direct/debug.h -#usr/include/directfb/direct/direct.h -#usr/include/directfb/direct/fastlz.h -#usr/include/directfb/direct/fifo.h -#usr/include/directfb/direct/filesystem.h -#usr/include/directfb/direct/flz.h -#usr/include/directfb/direct/hash.h -#usr/include/directfb/direct/init.h -#usr/include/directfb/direct/interface.h -#usr/include/directfb/direct/interface_implementation.h -#usr/include/directfb/direct/list.h -#usr/include/directfb/direct/log.h -#usr/include/directfb/direct/log_domain.h -#usr/include/directfb/direct/map.h -#usr/include/directfb/direct/mem.h -#usr/include/directfb/direct/memcpy.h -#usr/include/directfb/direct/messages.h -#usr/include/directfb/direct/modules.h -#usr/include/directfb/direct/os -#usr/include/directfb/direct/os/clock.h -#usr/include/directfb/direct/os/filesystem.h -#usr/include/directfb/direct/os/linux -#usr/include/directfb/direct/os/linux/glibc -#usr/include/directfb/direct/os/linux/glibc/filesystem.h -#usr/include/directfb/direct/os/linux/glibc/mutex.h -#usr/include/directfb/direct/os/linux/glibc/thread.h -#usr/include/directfb/direct/os/linux/glibc/types.h -#usr/include/directfb/direct/os/linux/glibc/waitqueue.h -#usr/include/directfb/direct/os/log.h -#usr/include/directfb/direct/os/mem.h -#usr/include/directfb/direct/os/mutex.h -#usr/include/directfb/direct/os/signals.h -#usr/include/directfb/direct/os/system.h -#usr/include/directfb/direct/os/thread.h -#usr/include/directfb/direct/os/types.h -#usr/include/directfb/direct/os/waitqueue.h -#usr/include/directfb/direct/perf.h -#usr/include/directfb/direct/print.h -#usr/include/directfb/direct/processor.h -#usr/include/directfb/direct/result.h -#usr/include/directfb/direct/serial.h -#usr/include/directfb/direct/signals.h -#usr/include/directfb/direct/stream.h -#usr/include/directfb/direct/system.h -#usr/include/directfb/direct/thread.h -#usr/include/directfb/direct/trace.h -#usr/include/directfb/direct/tree.h -#usr/include/directfb/direct/types.h -#usr/include/directfb/direct/utf8.h -#usr/include/directfb/direct/util.h -#usr/include/directfb/direct/uuid.h -#usr/include/directfb/directfb++.h -#usr/include/directfb/directfb.h -#usr/include/directfb/directfb_build.h -#usr/include/directfb/directfb_graphics.h -#usr/include/directfb/directfb_keyboard.h -#usr/include/directfb/directfb_keynames.h -#usr/include/directfb/directfb_strings.h -#usr/include/directfb/directfb_util.h -#usr/include/directfb/directfb_version.h -#usr/include/directfb/directfb_water.h -#usr/include/directfb/directfb_water_strings.h -#usr/include/directfb/directfb_windows.h -#usr/include/directfb/directfbgl.h -#usr/include/directfb/directfbgl2.h -#usr/include/directfb/fusion -#usr/include/directfb/fusion/Debug.h -#usr/include/directfb/fusion/arena.h -#usr/include/directfb/fusion/build.h -#usr/include/directfb/fusion/call.h -#usr/include/directfb/fusion/conf.h -#usr/include/directfb/fusion/fusion.h -#usr/include/directfb/fusion/fusion_internal.h -#usr/include/directfb/fusion/hash.h -#usr/include/directfb/fusion/init.h -#usr/include/directfb/fusion/lock.h -#usr/include/directfb/fusion/object.h -#usr/include/directfb/fusion/property.h -#usr/include/directfb/fusion/protocol.h -#usr/include/directfb/fusion/reactor.h -#usr/include/directfb/fusion/ref.h -#usr/include/directfb/fusion/shm -#usr/include/directfb/fusion/shm/pool.h -#usr/include/directfb/fusion/shm/shm.h -#usr/include/directfb/fusion/shm/shm_internal.h -#usr/include/directfb/fusion/shmalloc.h -#usr/include/directfb/fusion/types.h -#usr/include/directfb/fusion/vector.h -#usr/lib/directfb-1.7-7 -#usr/lib/directfb-1.7-7/gfxdrivers -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so -#usr/lib/directfb-1.7-7/inputdrivers -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so -#usr/lib/directfb-1.7-7/interfaces -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la -usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so -#usr/lib/directfb-1.7-7/interfaces/IWater -#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la -usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so -#usr/lib/directfb-1.7-7/systems -#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la -usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la -usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la -usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la -usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so -#usr/lib/directfb-1.7-7/wm -#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la -usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so -usr/lib/lib++dfb-1.7.so.7 -usr/lib/lib++dfb-1.7.so.7.0.0 -#usr/lib/lib++dfb.la -#usr/lib/lib++dfb.so -#usr/lib/libdavinci_c64x.la -#usr/lib/libdavinci_c64x.so -usr/lib/libdavinci_c64x.so.0 -usr/lib/libdavinci_c64x.so.0.0.0 -usr/lib/libdirect-1.7.so.7 -usr/lib/libdirect-1.7.so.7.0.0 -#usr/lib/libdirect.la -#usr/lib/libdirect.so -usr/lib/libdirectfb-1.7.so.7 -usr/lib/libdirectfb-1.7.so.7.0.0 -#usr/lib/libdirectfb.la -#usr/lib/libdirectfb.so -usr/lib/libfusion-1.7.so.7 -usr/lib/libfusion-1.7.so.7.0.0 -#usr/lib/libfusion.la -#usr/lib/libfusion.so -#usr/lib/pkgconfig/++dfb.pc -#usr/lib/pkgconfig/direct.pc -#usr/lib/pkgconfig/directfb-internal.pc -#usr/lib/pkgconfig/directfb.pc -#usr/lib/pkgconfig/fusion.pc -#usr/share/directfb-1.7.7 -usr/share/directfb-1.7.7/cursor.dat -usr/share/directfb-1.7.7/cursor.png -usr/share/directfb-1.7.7/decker.dgiff -usr/share/directfb-1.7.7/decker.ttf -#usr/share/man/man1/dfbg.1 -#usr/share/man/man1/directfb-csource.1 -#usr/share/man/man5/directfbrc.5 diff --git a/config/rootfiles/packages/i586/directfb b/config/rootfiles/packages/i586/directfb deleted file mode 100644 index 9e61f8bf8..000000000 --- a/config/rootfiles/packages/i586/directfb +++ /dev/null @@ -1,397 +0,0 @@ -usr/bin/dfbdump -usr/bin/dfbdumpinput -usr/bin/dfbfx -usr/bin/dfbg -usr/bin/dfbinfo -usr/bin/dfbinput -usr/bin/dfbinspector -usr/bin/dfblayer -usr/bin/dfbmaster -usr/bin/dfbpenmount -usr/bin/dfbplay -usr/bin/dfbscreen -usr/bin/dfbshow -usr/bin/dfbswitch -usr/bin/directfb-config -usr/bin/directfb-csource -usr/bin/mkdfiff -usr/bin/mkdgiff -usr/bin/mkdgifft -usr/bin/pxa3xx_dump -#usr/include/++dfb -#usr/include/++dfb/++dfb.h -#usr/include/++dfb/++dfb_mangle.h -#usr/include/++dfb/++dfb_unmangle.h -#usr/include/++dfb/idirectfb.h -#usr/include/++dfb/idirectfbdatabuffer.h -#usr/include/++dfb/idirectfbdisplaylayer.h -#usr/include/++dfb/idirectfbeventbuffer.h -#usr/include/++dfb/idirectfbfont.h -#usr/include/++dfb/idirectfbimageprovider.h -#usr/include/++dfb/idirectfbinputdevice.h -#usr/include/++dfb/idirectfbpalette.h -#usr/include/++dfb/idirectfbscreen.h -#usr/include/++dfb/idirectfbsurface.h -#usr/include/++dfb/idirectfbvideoprovider.h -#usr/include/++dfb/idirectfbwindow.h -#usr/include/directfb -#usr/include/directfb-internal -#usr/include/directfb-internal/core -#usr/include/directfb-internal/core/CoreDFB.h -#usr/include/directfb-internal/core/CoreDFB_CallMode.h -#usr/include/directfb-internal/core/CoreDFB_includes.h -#usr/include/directfb-internal/core/CoreGraphicsState.h -#usr/include/directfb-internal/core/CoreGraphicsStateClient.h -#usr/include/directfb-internal/core/CoreGraphicsState_includes.h -#usr/include/directfb-internal/core/CoreInputDevice.h -#usr/include/directfb-internal/core/CoreInputDevice_includes.h -#usr/include/directfb-internal/core/CoreLayer.h -#usr/include/directfb-internal/core/CoreLayerContext.h -#usr/include/directfb-internal/core/CoreLayerContext_includes.h -#usr/include/directfb-internal/core/CoreLayerRegion.h -#usr/include/directfb-internal/core/CoreLayerRegion_includes.h -#usr/include/directfb-internal/core/CoreLayer_includes.h -#usr/include/directfb-internal/core/CorePalette.h -#usr/include/directfb-internal/core/CorePalette_includes.h -#usr/include/directfb-internal/core/CoreScreen.h -#usr/include/directfb-internal/core/CoreScreen_includes.h -#usr/include/directfb-internal/core/CoreSlave.h -#usr/include/directfb-internal/core/CoreSlave_includes.h -#usr/include/directfb-internal/core/CoreSurface.h -#usr/include/directfb-internal/core/CoreSurfaceClient.h -#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h -#usr/include/directfb-internal/core/CoreSurface_includes.h -#usr/include/directfb-internal/core/CoreWindow.h -#usr/include/directfb-internal/core/CoreWindowStack.h -#usr/include/directfb-internal/core/CoreWindowStack_includes.h -#usr/include/directfb-internal/core/CoreWindow_includes.h -#usr/include/directfb-internal/core/Debug.h -#usr/include/directfb-internal/core/DisplayTask.h -#usr/include/directfb-internal/core/Fifo.h -#usr/include/directfb-internal/core/Interface.h -#usr/include/directfb-internal/core/PacketBuffer.h -#usr/include/directfb-internal/core/Renderer.h -#usr/include/directfb-internal/core/SurfaceTask.h -#usr/include/directfb-internal/core/Task.h -#usr/include/directfb-internal/core/TaskManager.h -#usr/include/directfb-internal/core/TaskThreadsQ.h -#usr/include/directfb-internal/core/Util.h -#usr/include/directfb-internal/core/clipboard.h -#usr/include/directfb-internal/core/colorhash.h -#usr/include/directfb-internal/core/core.h -#usr/include/directfb-internal/core/core_parts.h -#usr/include/directfb-internal/core/core_strings.h -#usr/include/directfb-internal/core/core_system.h -#usr/include/directfb-internal/core/coredefs.h -#usr/include/directfb-internal/core/coretypes.h -#usr/include/directfb-internal/core/fonts.h -#usr/include/directfb-internal/core/gfxcard.h -#usr/include/directfb-internal/core/graphics_driver.h -#usr/include/directfb-internal/core/graphics_state.h -#usr/include/directfb-internal/core/input.h -#usr/include/directfb-internal/core/input_driver.h -#usr/include/directfb-internal/core/input_hub.h -#usr/include/directfb-internal/core/layer_context.h -#usr/include/directfb-internal/core/layer_control.h -#usr/include/directfb-internal/core/layer_region.h -#usr/include/directfb-internal/core/layers.h -#usr/include/directfb-internal/core/layers_internal.h -#usr/include/directfb-internal/core/palette.h -#usr/include/directfb-internal/core/screen.h -#usr/include/directfb-internal/core/screens.h -#usr/include/directfb-internal/core/screens_internal.h -#usr/include/directfb-internal/core/state.h -#usr/include/directfb-internal/core/surface.h -#usr/include/directfb-internal/core/surface_allocation.h -#usr/include/directfb-internal/core/surface_buffer.h -#usr/include/directfb-internal/core/surface_client.h -#usr/include/directfb-internal/core/surface_core.h -#usr/include/directfb-internal/core/surface_pool.h -#usr/include/directfb-internal/core/surface_pool_bridge.h -#usr/include/directfb-internal/core/system.h -#usr/include/directfb-internal/core/windows.h -#usr/include/directfb-internal/core/windows_internal.h -#usr/include/directfb-internal/core/windowstack.h -#usr/include/directfb-internal/core/wm.h -#usr/include/directfb-internal/core/wm_module.h -#usr/include/directfb-internal/devmem -#usr/include/directfb-internal/devmem/devmem.h -#usr/include/directfb-internal/devmem/surfacemanager.h -#usr/include/directfb-internal/display -#usr/include/directfb-internal/display/idirectfbdisplaylayer.h -#usr/include/directfb-internal/display/idirectfbpalette.h -#usr/include/directfb-internal/display/idirectfbscreen.h -#usr/include/directfb-internal/display/idirectfbsurface.h -#usr/include/directfb-internal/display/idirectfbsurface_layer.h -#usr/include/directfb-internal/display/idirectfbsurface_window.h -#usr/include/directfb-internal/dummy -#usr/include/directfb-internal/dummy/dummy.h -#usr/include/directfb-internal/fbdev -#usr/include/directfb-internal/fbdev/agp.h -#usr/include/directfb-internal/fbdev/fb.h -#usr/include/directfb-internal/fbdev/fbdev.h -#usr/include/directfb-internal/fbdev/surfacemanager.h -#usr/include/directfb-internal/fbdev/vt.h -#usr/include/directfb-internal/gfx -#usr/include/directfb-internal/gfx/clip.h -#usr/include/directfb-internal/gfx/convert.h -#usr/include/directfb-internal/gfx/generic -#usr/include/directfb-internal/gfx/generic/generic.h -#usr/include/directfb-internal/gfx/util.h -#usr/include/directfb-internal/idirectfb.h -#usr/include/directfb-internal/init.h -#usr/include/directfb-internal/input -#usr/include/directfb-internal/input/idirectfbinputbuffer.h -#usr/include/directfb-internal/input/idirectfbinputdevice.h -#usr/include/directfb-internal/media -#usr/include/directfb-internal/media/idirectfbdatabuffer.h -#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h -#usr/include/directfb-internal/media/idirectfbfont.h -#usr/include/directfb-internal/media/idirectfbimageprovider.h -#usr/include/directfb-internal/media/idirectfbimageprovider_client.h -#usr/include/directfb-internal/media/idirectfbvideoprovider.h -#usr/include/directfb-internal/misc -#usr/include/directfb-internal/misc/conf.h -#usr/include/directfb-internal/misc/gfx_util.h -#usr/include/directfb-internal/misc/util.h -#usr/include/directfb-internal/windows -#usr/include/directfb-internal/windows/idirectfbwindow.h -#usr/include/directfb/dfb_types.h -#usr/include/directfb/dfiff.h -#usr/include/directfb/dgiff.h -#usr/include/directfb/direct -#usr/include/directfb/direct/Lists.h -#usr/include/directfb/direct/LockWQ.h -#usr/include/directfb/direct/Magic.h -#usr/include/directfb/direct/Mutex.h -#usr/include/directfb/direct/Performer.h -#usr/include/directfb/direct/String.h -#usr/include/directfb/direct/TLSObject.h -#usr/include/directfb/direct/ToString.h -#usr/include/directfb/direct/Types++.h -#usr/include/directfb/direct/atomic.h -#usr/include/directfb/direct/build.h -#usr/include/directfb/direct/clock.h -#usr/include/directfb/direct/compiler.h -#usr/include/directfb/direct/conf.h -#usr/include/directfb/direct/debug.h -#usr/include/directfb/direct/direct.h -#usr/include/directfb/direct/fastlz.h -#usr/include/directfb/direct/fifo.h -#usr/include/directfb/direct/filesystem.h -#usr/include/directfb/direct/flz.h -#usr/include/directfb/direct/hash.h -#usr/include/directfb/direct/init.h -#usr/include/directfb/direct/interface.h -#usr/include/directfb/direct/interface_implementation.h -#usr/include/directfb/direct/list.h -#usr/include/directfb/direct/log.h -#usr/include/directfb/direct/log_domain.h -#usr/include/directfb/direct/map.h -#usr/include/directfb/direct/mem.h -#usr/include/directfb/direct/memcpy.h -#usr/include/directfb/direct/messages.h -#usr/include/directfb/direct/modules.h -#usr/include/directfb/direct/os -#usr/include/directfb/direct/os/clock.h -#usr/include/directfb/direct/os/filesystem.h -#usr/include/directfb/direct/os/linux -#usr/include/directfb/direct/os/linux/glibc -#usr/include/directfb/direct/os/linux/glibc/filesystem.h -#usr/include/directfb/direct/os/linux/glibc/mutex.h -#usr/include/directfb/direct/os/linux/glibc/thread.h -#usr/include/directfb/direct/os/linux/glibc/types.h -#usr/include/directfb/direct/os/linux/glibc/waitqueue.h -#usr/include/directfb/direct/os/log.h -#usr/include/directfb/direct/os/mem.h -#usr/include/directfb/direct/os/mutex.h -#usr/include/directfb/direct/os/signals.h -#usr/include/directfb/direct/os/system.h -#usr/include/directfb/direct/os/thread.h -#usr/include/directfb/direct/os/types.h -#usr/include/directfb/direct/os/waitqueue.h -#usr/include/directfb/direct/perf.h -#usr/include/directfb/direct/print.h -#usr/include/directfb/direct/processor.h -#usr/include/directfb/direct/result.h -#usr/include/directfb/direct/serial.h -#usr/include/directfb/direct/signals.h -#usr/include/directfb/direct/stream.h -#usr/include/directfb/direct/system.h -#usr/include/directfb/direct/thread.h -#usr/include/directfb/direct/trace.h -#usr/include/directfb/direct/tree.h -#usr/include/directfb/direct/types.h -#usr/include/directfb/direct/utf8.h -#usr/include/directfb/direct/util.h -#usr/include/directfb/direct/uuid.h -#usr/include/directfb/directfb++.h -#usr/include/directfb/directfb.h -#usr/include/directfb/directfb_build.h -#usr/include/directfb/directfb_graphics.h -#usr/include/directfb/directfb_keyboard.h -#usr/include/directfb/directfb_keynames.h -#usr/include/directfb/directfb_strings.h -#usr/include/directfb/directfb_util.h -#usr/include/directfb/directfb_version.h -#usr/include/directfb/directfb_water.h -#usr/include/directfb/directfb_water_strings.h -#usr/include/directfb/directfb_windows.h -#usr/include/directfb/directfbgl.h -#usr/include/directfb/directfbgl2.h -#usr/include/directfb/fusion -#usr/include/directfb/fusion/Debug.h -#usr/include/directfb/fusion/arena.h -#usr/include/directfb/fusion/build.h -#usr/include/directfb/fusion/call.h -#usr/include/directfb/fusion/conf.h -#usr/include/directfb/fusion/fusion.h -#usr/include/directfb/fusion/fusion_internal.h -#usr/include/directfb/fusion/hash.h -#usr/include/directfb/fusion/init.h -#usr/include/directfb/fusion/lock.h -#usr/include/directfb/fusion/object.h -#usr/include/directfb/fusion/property.h -#usr/include/directfb/fusion/protocol.h -#usr/include/directfb/fusion/reactor.h -#usr/include/directfb/fusion/ref.h -#usr/include/directfb/fusion/shm -#usr/include/directfb/fusion/shm/pool.h -#usr/include/directfb/fusion/shm/shm.h -#usr/include/directfb/fusion/shm/shm_internal.h -#usr/include/directfb/fusion/shmalloc.h -#usr/include/directfb/fusion/types.h -#usr/include/directfb/fusion/vector.h -#usr/lib/directfb-1.7-7 -#usr/lib/directfb-1.7-7/gfxdrivers -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so -#usr/lib/directfb-1.7-7/inputdrivers -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so -#usr/lib/directfb-1.7-7/interfaces -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la -usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so -#usr/lib/directfb-1.7-7/interfaces/IWater -#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la -usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so -#usr/lib/directfb-1.7-7/systems -#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la -usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la -usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la -usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la -usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so -#usr/lib/directfb-1.7-7/wm -#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la -usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so -usr/lib/lib++dfb-1.7.so.7 -usr/lib/lib++dfb-1.7.so.7.0.0 -#usr/lib/lib++dfb.la -#usr/lib/lib++dfb.so -usr/lib/libdirect-1.7.so.7 -usr/lib/libdirect-1.7.so.7.0.0 -#usr/lib/libdirect.la -#usr/lib/libdirect.so -usr/lib/libdirectfb-1.7.so.7 -usr/lib/libdirectfb-1.7.so.7.0.0 -#usr/lib/libdirectfb.la -usr/lib/libdirectfb.so -usr/lib/libfusion-1.7.so.7 -usr/lib/libfusion-1.7.so.7.0.0 -#usr/lib/libfusion.la -#usr/lib/libfusion.so -#usr/lib/pkgconfig/++dfb.pc -#usr/lib/pkgconfig/direct.pc -#usr/lib/pkgconfig/directfb-internal.pc -#usr/lib/pkgconfig/directfb.pc -#usr/lib/pkgconfig/fusion.pc -#usr/share/directfb-1.7.7 -usr/share/directfb-1.7.7/cursor.dat -usr/share/directfb-1.7.7/cursor.png -usr/share/directfb-1.7.7/decker.dgiff -usr/share/directfb-1.7.7/decker.ttf -#usr/share/man/man1/dfbg.1 -#usr/share/man/man1/directfb-csource.1 -#usr/share/man/man5/directfbrc.5 diff --git a/config/rootfiles/packages/x86_64/directfb b/config/rootfiles/packages/x86_64/directfb deleted file mode 100644 index dc291bf12..000000000 --- a/config/rootfiles/packages/x86_64/directfb +++ /dev/null @@ -1,397 +0,0 @@ -usr/bin/dfbdump -usr/bin/dfbdumpinput -usr/bin/dfbfx -usr/bin/dfbg -usr/bin/dfbinfo -usr/bin/dfbinput -usr/bin/dfbinspector -usr/bin/dfblayer -usr/bin/dfbmaster -usr/bin/dfbpenmount -usr/bin/dfbplay -usr/bin/dfbscreen -usr/bin/dfbshow -usr/bin/dfbswitch -usr/bin/directfb-config -usr/bin/directfb-csource -usr/bin/mkdfiff -usr/bin/mkdgiff -usr/bin/mkdgifft -usr/bin/pxa3xx_dump -#usr/include/++dfb -#usr/include/++dfb/++dfb.h -#usr/include/++dfb/++dfb_mangle.h -#usr/include/++dfb/++dfb_unmangle.h -#usr/include/++dfb/idirectfb.h -#usr/include/++dfb/idirectfbdatabuffer.h -#usr/include/++dfb/idirectfbdisplaylayer.h -#usr/include/++dfb/idirectfbeventbuffer.h -#usr/include/++dfb/idirectfbfont.h -#usr/include/++dfb/idirectfbimageprovider.h -#usr/include/++dfb/idirectfbinputdevice.h -#usr/include/++dfb/idirectfbpalette.h -#usr/include/++dfb/idirectfbscreen.h -#usr/include/++dfb/idirectfbsurface.h -#usr/include/++dfb/idirectfbvideoprovider.h -#usr/include/++dfb/idirectfbwindow.h -#usr/include/directfb -#usr/include/directfb-internal -#usr/include/directfb-internal/core -#usr/include/directfb-internal/core/CoreDFB.h -#usr/include/directfb-internal/core/CoreDFB_CallMode.h -#usr/include/directfb-internal/core/CoreDFB_includes.h -#usr/include/directfb-internal/core/CoreGraphicsState.h -#usr/include/directfb-internal/core/CoreGraphicsStateClient.h -#usr/include/directfb-internal/core/CoreGraphicsState_includes.h -#usr/include/directfb-internal/core/CoreInputDevice.h -#usr/include/directfb-internal/core/CoreInputDevice_includes.h -#usr/include/directfb-internal/core/CoreLayer.h -#usr/include/directfb-internal/core/CoreLayerContext.h -#usr/include/directfb-internal/core/CoreLayerContext_includes.h -#usr/include/directfb-internal/core/CoreLayerRegion.h -#usr/include/directfb-internal/core/CoreLayerRegion_includes.h -#usr/include/directfb-internal/core/CoreLayer_includes.h -#usr/include/directfb-internal/core/CorePalette.h -#usr/include/directfb-internal/core/CorePalette_includes.h -#usr/include/directfb-internal/core/CoreScreen.h -#usr/include/directfb-internal/core/CoreScreen_includes.h -#usr/include/directfb-internal/core/CoreSlave.h -#usr/include/directfb-internal/core/CoreSlave_includes.h -#usr/include/directfb-internal/core/CoreSurface.h -#usr/include/directfb-internal/core/CoreSurfaceClient.h -#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h -#usr/include/directfb-internal/core/CoreSurface_includes.h -#usr/include/directfb-internal/core/CoreWindow.h -#usr/include/directfb-internal/core/CoreWindowStack.h -#usr/include/directfb-internal/core/CoreWindowStack_includes.h -#usr/include/directfb-internal/core/CoreWindow_includes.h -#usr/include/directfb-internal/core/Debug.h -#usr/include/directfb-internal/core/DisplayTask.h -#usr/include/directfb-internal/core/Fifo.h -#usr/include/directfb-internal/core/Interface.h -#usr/include/directfb-internal/core/PacketBuffer.h -#usr/include/directfb-internal/core/Renderer.h -#usr/include/directfb-internal/core/SurfaceTask.h -#usr/include/directfb-internal/core/Task.h -#usr/include/directfb-internal/core/TaskManager.h -#usr/include/directfb-internal/core/TaskThreadsQ.h -#usr/include/directfb-internal/core/Util.h -#usr/include/directfb-internal/core/clipboard.h -#usr/include/directfb-internal/core/colorhash.h -#usr/include/directfb-internal/core/core.h -#usr/include/directfb-internal/core/core_parts.h -#usr/include/directfb-internal/core/core_strings.h -#usr/include/directfb-internal/core/core_system.h -#usr/include/directfb-internal/core/coredefs.h -#usr/include/directfb-internal/core/coretypes.h -#usr/include/directfb-internal/core/fonts.h -#usr/include/directfb-internal/core/gfxcard.h -#usr/include/directfb-internal/core/graphics_driver.h -#usr/include/directfb-internal/core/graphics_state.h -#usr/include/directfb-internal/core/input.h -#usr/include/directfb-internal/core/input_driver.h -#usr/include/directfb-internal/core/input_hub.h -#usr/include/directfb-internal/core/layer_context.h -#usr/include/directfb-internal/core/layer_control.h -#usr/include/directfb-internal/core/layer_region.h -#usr/include/directfb-internal/core/layers.h -#usr/include/directfb-internal/core/layers_internal.h -#usr/include/directfb-internal/core/palette.h -#usr/include/directfb-internal/core/screen.h -#usr/include/directfb-internal/core/screens.h -#usr/include/directfb-internal/core/screens_internal.h -#usr/include/directfb-internal/core/state.h -#usr/include/directfb-internal/core/surface.h -#usr/include/directfb-internal/core/surface_allocation.h -#usr/include/directfb-internal/core/surface_buffer.h -#usr/include/directfb-internal/core/surface_client.h -#usr/include/directfb-internal/core/surface_core.h -#usr/include/directfb-internal/core/surface_pool.h -#usr/include/directfb-internal/core/surface_pool_bridge.h -#usr/include/directfb-internal/core/system.h -#usr/include/directfb-internal/core/windows.h -#usr/include/directfb-internal/core/windows_internal.h -#usr/include/directfb-internal/core/windowstack.h -#usr/include/directfb-internal/core/wm.h -#usr/include/directfb-internal/core/wm_module.h -#usr/include/directfb-internal/devmem -#usr/include/directfb-internal/devmem/devmem.h -#usr/include/directfb-internal/devmem/surfacemanager.h -#usr/include/directfb-internal/display -#usr/include/directfb-internal/display/idirectfbdisplaylayer.h -#usr/include/directfb-internal/display/idirectfbpalette.h -#usr/include/directfb-internal/display/idirectfbscreen.h -#usr/include/directfb-internal/display/idirectfbsurface.h -#usr/include/directfb-internal/display/idirectfbsurface_layer.h -#usr/include/directfb-internal/display/idirectfbsurface_window.h -#usr/include/directfb-internal/dummy -#usr/include/directfb-internal/dummy/dummy.h -#usr/include/directfb-internal/fbdev -#usr/include/directfb-internal/fbdev/agp.h -#usr/include/directfb-internal/fbdev/fb.h -#usr/include/directfb-internal/fbdev/fbdev.h -#usr/include/directfb-internal/fbdev/surfacemanager.h -#usr/include/directfb-internal/fbdev/vt.h -#usr/include/directfb-internal/gfx -#usr/include/directfb-internal/gfx/clip.h -#usr/include/directfb-internal/gfx/convert.h -#usr/include/directfb-internal/gfx/generic -#usr/include/directfb-internal/gfx/generic/generic.h -#usr/include/directfb-internal/gfx/util.h -#usr/include/directfb-internal/idirectfb.h -#usr/include/directfb-internal/init.h -#usr/include/directfb-internal/input -#usr/include/directfb-internal/input/idirectfbinputbuffer.h -#usr/include/directfb-internal/input/idirectfbinputdevice.h -#usr/include/directfb-internal/media -#usr/include/directfb-internal/media/idirectfbdatabuffer.h -#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h -#usr/include/directfb-internal/media/idirectfbfont.h -#usr/include/directfb-internal/media/idirectfbimageprovider.h -#usr/include/directfb-internal/media/idirectfbimageprovider_client.h -#usr/include/directfb-internal/media/idirectfbvideoprovider.h -#usr/include/directfb-internal/misc -#usr/include/directfb-internal/misc/conf.h -#usr/include/directfb-internal/misc/gfx_util.h -#usr/include/directfb-internal/misc/util.h -#usr/include/directfb-internal/windows -#usr/include/directfb-internal/windows/idirectfbwindow.h -#usr/include/directfb/dfb_types.h -#usr/include/directfb/dfiff.h -#usr/include/directfb/dgiff.h -#usr/include/directfb/direct -#usr/include/directfb/direct/Lists.h -#usr/include/directfb/direct/LockWQ.h -#usr/include/directfb/direct/Magic.h -#usr/include/directfb/direct/Mutex.h -#usr/include/directfb/direct/Performer.h -#usr/include/directfb/direct/String.h -#usr/include/directfb/direct/TLSObject.h -#usr/include/directfb/direct/ToString.h -#usr/include/directfb/direct/Types++.h -#usr/include/directfb/direct/atomic.h -#usr/include/directfb/direct/build.h -#usr/include/directfb/direct/clock.h -#usr/include/directfb/direct/compiler.h -#usr/include/directfb/direct/conf.h -#usr/include/directfb/direct/debug.h -#usr/include/directfb/direct/direct.h -#usr/include/directfb/direct/fastlz.h -#usr/include/directfb/direct/fifo.h -#usr/include/directfb/direct/filesystem.h -#usr/include/directfb/direct/flz.h -#usr/include/directfb/direct/hash.h -#usr/include/directfb/direct/init.h -#usr/include/directfb/direct/interface.h -#usr/include/directfb/direct/interface_implementation.h -#usr/include/directfb/direct/list.h -#usr/include/directfb/direct/log.h -#usr/include/directfb/direct/log_domain.h -#usr/include/directfb/direct/map.h -#usr/include/directfb/direct/mem.h -#usr/include/directfb/direct/memcpy.h -#usr/include/directfb/direct/messages.h -#usr/include/directfb/direct/modules.h -#usr/include/directfb/direct/os -#usr/include/directfb/direct/os/clock.h -#usr/include/directfb/direct/os/filesystem.h -#usr/include/directfb/direct/os/linux -#usr/include/directfb/direct/os/linux/glibc -#usr/include/directfb/direct/os/linux/glibc/filesystem.h -#usr/include/directfb/direct/os/linux/glibc/mutex.h -#usr/include/directfb/direct/os/linux/glibc/thread.h -#usr/include/directfb/direct/os/linux/glibc/types.h -#usr/include/directfb/direct/os/linux/glibc/waitqueue.h -#usr/include/directfb/direct/os/log.h -#usr/include/directfb/direct/os/mem.h -#usr/include/directfb/direct/os/mutex.h -#usr/include/directfb/direct/os/signals.h -#usr/include/directfb/direct/os/system.h -#usr/include/directfb/direct/os/thread.h -#usr/include/directfb/direct/os/types.h -#usr/include/directfb/direct/os/waitqueue.h -#usr/include/directfb/direct/perf.h -#usr/include/directfb/direct/print.h -#usr/include/directfb/direct/processor.h -#usr/include/directfb/direct/result.h -#usr/include/directfb/direct/serial.h -#usr/include/directfb/direct/signals.h -#usr/include/directfb/direct/stream.h -#usr/include/directfb/direct/system.h -#usr/include/directfb/direct/thread.h -#usr/include/directfb/direct/trace.h -#usr/include/directfb/direct/tree.h -#usr/include/directfb/direct/types.h -#usr/include/directfb/direct/utf8.h -#usr/include/directfb/direct/util.h -#usr/include/directfb/direct/uuid.h -#usr/include/directfb/directfb++.h -#usr/include/directfb/directfb.h -#usr/include/directfb/directfb_build.h -#usr/include/directfb/directfb_graphics.h -#usr/include/directfb/directfb_keyboard.h -#usr/include/directfb/directfb_keynames.h -#usr/include/directfb/directfb_strings.h -#usr/include/directfb/directfb_util.h -#usr/include/directfb/directfb_version.h -#usr/include/directfb/directfb_water.h -#usr/include/directfb/directfb_water_strings.h -#usr/include/directfb/directfb_windows.h -#usr/include/directfb/directfbgl.h -#usr/include/directfb/directfbgl2.h -#usr/include/directfb/fusion -#usr/include/directfb/fusion/Debug.h -#usr/include/directfb/fusion/arena.h -#usr/include/directfb/fusion/build.h -#usr/include/directfb/fusion/call.h -#usr/include/directfb/fusion/conf.h -#usr/include/directfb/fusion/fusion.h -#usr/include/directfb/fusion/fusion_internal.h -#usr/include/directfb/fusion/hash.h -#usr/include/directfb/fusion/init.h -#usr/include/directfb/fusion/lock.h -#usr/include/directfb/fusion/object.h -#usr/include/directfb/fusion/property.h -#usr/include/directfb/fusion/protocol.h -#usr/include/directfb/fusion/reactor.h -#usr/include/directfb/fusion/ref.h -#usr/include/directfb/fusion/shm -#usr/include/directfb/fusion/shm/pool.h -#usr/include/directfb/fusion/shm/shm.h -#usr/include/directfb/fusion/shm/shm_internal.h -#usr/include/directfb/fusion/shmalloc.h -#usr/include/directfb/fusion/types.h -#usr/include/directfb/fusion/vector.h -#usr/lib/directfb-1.7-7 -#usr/lib/directfb-1.7-7/gfxdrivers -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so -#usr/lib/directfb-1.7-7/inputdrivers -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so -#usr/lib/directfb-1.7-7/interfaces -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la -usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so -#usr/lib/directfb-1.7-7/interfaces/IWater -#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la -usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so -#usr/lib/directfb-1.7-7/systems -#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la -usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la -usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la -usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la -usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so -#usr/lib/directfb-1.7-7/wm -#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la -usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so -usr/lib/lib++dfb-1.7.so.7 -usr/lib/lib++dfb-1.7.so.7.0.0 -#usr/lib/lib++dfb.la -#usr/lib/lib++dfb.so -usr/lib/libdirect-1.7.so.7 -usr/lib/libdirect-1.7.so.7.0.0 -#usr/lib/libdirect.la -usr/lib/libdirect.so -usr/lib/libdirectfb-1.7.so.7 -usr/lib/libdirectfb-1.7.so.7.0.0 -#usr/lib/libdirectfb.la -usr/lib/libdirectfb.so -usr/lib/libfusion-1.7.so.7 -usr/lib/libfusion-1.7.so.7.0.0 -#usr/lib/libfusion.la -usr/lib/libfusion.so -#usr/lib/pkgconfig/++dfb.pc -#usr/lib/pkgconfig/direct.pc -#usr/lib/pkgconfig/directfb-internal.pc -#usr/lib/pkgconfig/directfb.pc -#usr/lib/pkgconfig/fusion.pc -#usr/share/directfb-1.7.7 -#usr/share/directfb-1.7.7/cursor.dat -#usr/share/directfb-1.7.7/cursor.png -#usr/share/directfb-1.7.7/decker.dgiff -#usr/share/directfb-1.7.7/decker.ttf -#usr/share/man/man1/dfbg.1 -#usr/share/man/man1/directfb-csource.1 -#usr/share/man/man5/directfbrc.5 diff --git a/lfs/directfb b/lfs/directfb deleted file mode 100644 index 8b2ff6022..000000000 --- a/lfs/directfb +++ /dev/null @@ -1,93 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - -VER = 1.7.7 - -THISAPP = DirectFB-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = directfb -PAK_VER = 3 - -DEPS = "" - - - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 152cf1863b1a3a28aa1370e9053440bf - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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) && patch -Np1 < $(DIR_SRC)/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/DirectFB-1.7.7-fix_mknod.patch - - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --disable-x11 \ - --enable-sdl \ - --enable-video4linux2 - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 8393cad2f..ca02c40f4 100755 --- a/make.sh +++ b/make.sh @@ -1454,7 +1454,6 @@ buildipfire() { lfsmake2 icinga lfsmake2 observium-agent lfsmake2 ebtables - lfsmake2 directfb lfsmake2 faad2 lfsmake2 alac lfsmake2 ffmpeg diff --git a/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch b/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch deleted file mode 100644 index 078754ef3..000000000 --- a/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch +++ /dev/null @@ -1,1717 +0,0 @@ -From: Sebastian Ramacher -Date: Thu, 16 Mar 2017 20:53:09 +0100 -Subject: Add missing files from upstream - -Closes: #598976 ---- - gfxdrivers/davinci/davinci_c64x.h | 935 +++++++++++++++++++++++++++++++++ - gfxdrivers/davinci/davinci_gfxdriver.h | 169 ++++++ - gfxdrivers/davinci/davincifb.h | 581 ++++++++++++++++++++ - 3 files changed, 1685 insertions(+) - create mode 100644 gfxdrivers/davinci/davinci_c64x.h - create mode 100644 gfxdrivers/davinci/davinci_gfxdriver.h - create mode 100644 gfxdrivers/davinci/davincifb.h - -diff --git a/gfxdrivers/davinci/davinci_c64x.h b/gfxdrivers/davinci/davinci_c64x.h -new file mode 100644 -index 0000000..682da22 ---- /dev/null -+++ b/gfxdrivers/davinci/davinci_c64x.h -@@ -0,0 +1,935 @@ -+/* -+ TI Davinci driver - C64X+ DSP Library -+ -+ (c) Copyright 2008 directfb.org -+ (c) Copyright 2007 Telio AG -+ -+ Written by Denis Oliver Kropp and -+ Olaf Dreesen . -+ -+ All rights reserved. -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License -+ version 2 as published by the Free Software Foundation. -+ -+ This library 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 library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef __DAVINCI_C64X_H__ -+#define __DAVINCI_C64X_H__ -+ -+#include -+ -+#include -+ -+#include -+#include -+ -+#include -+ -+#define mb() __asm__ __volatile__ ("" : : : "memory") -+ -+/**********************************************************************************************************************/ -+ -+typedef struct { -+ int magic; -+ -+ int fd; -+ c64xTaskControl *ctl; -+ void *mem; -+ -+ c64xTask *QueueL; -+} DavinciC64x; -+ -+typedef struct { -+ int magic; -+ unsigned int max_tasks; -+ unsigned int num_tasks; -+ c64xTask *tasks; -+} DavinciC64xTasks; -+ -+typedef enum { -+ C64X_TEF_NONE = 0x0000, -+ C64X_TEF_RESET = 0x0001 -+} DavinciC64xEmitFlags; -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_open ( DavinciC64x *c64x ); -+ -+DFBResult davinci_c64x_close ( DavinciC64x *c64x ); -+ -+DFBResult davinci_c64x_wait_low( DavinciC64x *c64x ); -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_tasks_init ( DavinciC64xTasks *tasks, -+ unsigned int size ); -+ -+DFBResult davinci_c64x_tasks_destroy( DavinciC64xTasks *tasks ); -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_emit_tasks( DavinciC64x *c64x, -+ DavinciC64xTasks *tasks, -+ DavinciC64xEmitFlags flags ); -+ -+/**********************************************************************************************************************/ -+ -+static const char *state_names[] = { "DONE", "ERROR", "TODO", "RUNNING" }; -+ -+static inline c64xTask * -+c64x_get_task( DavinciC64x *c64x ) -+{ -+ c64xTaskControl *ctl = c64x->ctl; -+ uint32_t idx = ctl->QL_arm; -+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK; -+ c64xTask *task = &c64x->QueueL[idx]; -+ int loops = 0; -+ uint32_t idle = 0; -+ -+ /* Wait for the entry (and next) to be processed by the DSP (rare case). */ -+ while (task->c64x_flags & C64X_FLAG_TODO || ctl->QL_dsp == next) { -+ if (loops > 666 || (idle && ctl->idlecounter - idle > 666)) { -+ c64xTask *dsp_task = &c64x->QueueL[ctl->QL_dsp]; -+ -+ D_PERROR( "Davinci/C64X+: Blocked! [DSP %d / %d (%s), ARM %d / %d (%s)]\n", -+ ctl->QL_dsp, -+ (dsp_task->c64x_function >> 2) & 0x3fff, -+ state_names[dsp_task->c64x_function & 3], -+ ctl->QL_arm, -+ (task->c64x_function >> 2) & 0x3fff, -+ state_names[task->c64x_function & 3] ); -+ -+ break; -+ } -+ -+ idle = ctl->idlecounter; -+ -+ /* Queue is full, waiting 10-20ms should not be too bad. */ -+ if (loops++ > 10) -+ usleep( 5000 ); -+ } -+ -+ return task; -+} -+ -+static inline void -+c64x_submit_task( DavinciC64x *c64x, c64xTask *task ) -+{ -+ c64xTaskControl *ctl = c64x->ctl; -+ uint32_t idx = ctl->QL_arm; -+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK; -+ -+ mb(); -+ -+ ctl->QL_arm = next; -+ -+ mb(); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_wb_inv_range( DavinciC64x *c64x, -+ unsigned long start, -+ u32 length, -+ u32 func ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = start; -+ task->c64x_arg[1] = length; -+ task->c64x_arg[2] = func; -+ -+ task->c64x_function = C64X_WB_INV_RANGE | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_write_back_all( DavinciC64x *c64x ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_function = C64X_WRITE_BACK_ALL | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_load_block__L( DavinciC64xTasks *tasks, -+ unsigned long words, -+ u32 num, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = words; -+ task->c64x_arg[1] = num; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_load_block( DavinciC64x *c64x, -+ unsigned long words, -+ u32 num, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = words; -+ task->c64x_arg[1] = num; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fetch_uyvy( DavinciC64x *c64x, -+ unsigned long dest, -+ unsigned long source, -+ u32 pitch, -+ u32 height, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = source; -+ task->c64x_arg[2] = pitch; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_FETCH_UYVY | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_mc( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long source0, -+ unsigned long source1, -+ u32 spitch, -+ u32 height, -+ int func ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = source0; -+ task->c64x_arg[3] = source1; -+ task->c64x_arg[4] = spitch; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = func | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_idct_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_idct_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_mc_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_mc_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_sum_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_sum_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dva_begin_frame__L( DavinciC64xTasks *tasks, -+ u32 pitch, -+ unsigned long current, -+ unsigned long past, -+ unsigned long future, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = pitch; -+ task->c64x_arg[1] = current; -+ task->c64x_arg[2] = past; -+ task->c64x_arg[3] = future; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dva_begin_frame( DavinciC64x *c64x, -+ u32 pitch, -+ unsigned long current, -+ unsigned long past, -+ unsigned long future, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = pitch; -+ task->c64x_arg[1] = current; -+ task->c64x_arg[2] = past; -+ task->c64x_arg[3] = future; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dva_motion_block__L( DavinciC64xTasks *tasks, -+ unsigned long macroblock ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = macroblock; -+ -+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dva_motion_block( DavinciC64x *c64x, -+ unsigned long macroblock ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = macroblock; -+ -+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_dva_idct( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ unsigned long source ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = source; -+ -+ task->c64x_function = C64X_DVA_IDCT | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_put_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ unsigned long source, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = source; -+ task->c64x_arg[3] = flags; -+ -+ task->c64x_function = C64X_PUT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dither_argb__L( DavinciC64xTasks *tasks, -+ unsigned long dst_rgb, -+ unsigned long dst_alpha, -+ u32 dst_pitch, -+ unsigned long source, -+ u32 src_pitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dst_rgb; -+ task->c64x_arg[1] = dst_alpha; -+ task->c64x_arg[2] = dst_pitch; -+ task->c64x_arg[3] = source; -+ task->c64x_arg[4] = src_pitch; -+ task->c64x_arg[5] = width; -+ task->c64x_arg[6] = height; -+ -+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dither_argb( DavinciC64x *c64x, -+ unsigned long dst_rgb, -+ unsigned long dst_alpha, -+ u32 dst_pitch, -+ unsigned long source, -+ u32 src_pitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dst_rgb; -+ task->c64x_arg[1] = dst_alpha; -+ task->c64x_arg[2] = dst_pitch; -+ task->c64x_arg[3] = source; -+ task->c64x_arg[4] = src_pitch; -+ task->c64x_arg[5] = width; -+ task->c64x_arg[6] = height; -+ -+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fill_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_fill_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fill_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_fill_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_stretch_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 dw, -+ u32 dh, -+ u32 sw, -+ u32 sh, -+ const DFBRegion *clip ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = src; -+ task->c64x_arg[2] = dpitch | (spitch << 16); -+ task->c64x_arg[3] = dh | (dw << 16); -+ task->c64x_arg[4] = sh | (sw << 16); -+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16); -+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16); -+ -+ if (sw > dw && sh > dh) -+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO; -+ else -+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_stretch_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 dw, -+ u32 dh, -+ u32 sw, -+ u32 sh, -+ const DFBRegion *clip ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = src; -+ task->c64x_arg[2] = dpitch | (spitch << 16); -+ task->c64x_arg[3] = dh | (dw << 16); -+ task->c64x_arg[4] = sh | (sw << 16); -+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16); -+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16); -+ -+ if (sw > dw && sh > dh) -+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO; -+ else -+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_blend_32__L( DavinciC64xTasks *tasks, -+ u32 sub_func, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 argb, -+ u8 alpha ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width | (height << 16); -+ task->c64x_arg[5] = argb; -+ task->c64x_arg[6] = alpha; -+ -+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_blend_32( DavinciC64x *c64x, -+ u32 sub_func, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 argb, -+ u8 alpha ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width | (height << 16); -+ task->c64x_arg[5] = argb; -+ task->c64x_arg[6] = alpha; -+ -+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_keyed_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_keyed_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_keyed_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_keyed_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+#endif -+ -diff --git a/gfxdrivers/davinci/davinci_gfxdriver.h b/gfxdrivers/davinci/davinci_gfxdriver.h -new file mode 100644 -index 0000000..4ca79b3 ---- /dev/null -+++ b/gfxdrivers/davinci/davinci_gfxdriver.h -@@ -0,0 +1,169 @@ -+/* -+ TI Davinci driver - Graphics Driver -+ -+ (c) Copyright 2007 Telio AG -+ -+ Written by Denis Oliver Kropp -+ -+ Code is derived from VMWare driver. -+ -+ (c) Copyright 2001-2009 The world wide DirectFB Open Source Community (directfb.org) -+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH -+ -+ All rights reserved. -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library 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 -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef __DAVINCI_GFXDRIVER_H__ -+#define __DAVINCI_GFXDRIVER_H__ -+ -+#include -+#include -+ -+#include -+ -+#include "davincifb.h" -+ -+#include "davinci_c64x.h" -+ -+ -+typedef struct { -+ /* validation flags */ -+ int v_flags; -+ -+ /* cached/computed values */ -+ void *dst_addr; -+ unsigned long dst_phys; -+ unsigned int dst_size; -+ unsigned long dst_pitch; -+ DFBSurfacePixelFormat dst_format; -+ unsigned long dst_bpp; -+ -+ void *src_addr; -+ unsigned long src_phys; -+ unsigned long src_pitch; -+ DFBSurfacePixelFormat src_format; -+ unsigned long src_bpp; -+ -+ unsigned long source_mult; -+ -+ unsigned long fillcolor; -+ -+ int blit_blend_sub_function; -+ int draw_blend_sub_function; -+ -+ DFBColor color; -+ unsigned long color_argb; -+ unsigned long colorkey; -+ -+ DFBSurfaceBlittingFlags blitting_flags; -+ -+ DFBRegion clip; -+ -+ /** Add shared data here... **/ -+ struct fb_fix_screeninfo fix[4]; -+ -+ CoreSurfacePool *osd_pool; -+ CoreSurfacePool *video_pool; -+ -+ bool synced; -+} DavinciDeviceData; -+ -+ -+typedef struct { -+ int num; -+ int fd; -+ void *mem; -+ int size; -+} DavinciFB; -+ -+typedef struct { -+ DavinciDeviceData *ddev; -+ -+ CoreDFB *core; -+ -+ CoreScreen *screen; -+ CoreLayer *osd; -+ CoreLayer *video; -+ -+ DavinciFB fb[4]; -+ -+ DavinciC64x c64x; -+ bool c64x_present; -+ -+ DavinciC64xTasks tasks; -+} DavinciDriverData; -+ -+ -+static inline DFBResult -+davincifb_pan_display( const DavinciFB *fb, -+ struct fb_var_screeninfo *var, -+ const CoreSurfaceBufferLock *lock, -+ DFBSurfaceFlipFlags flags, -+ int x, -+ int y ) -+{ -+ int ret; -+ -+ if (lock) { -+#ifdef FBIO_SET_START -+ CoreSurfaceBuffer *buffer = lock->buffer; -+ struct fb_set_start set_start; -+ -+ /* physical mode */ -+ set_start.offset = -1; -+ set_start.sync = (flags & DSFLIP_ONSYNC) ? 1 : 0; -+ -+ /* life's so easy */ -+ set_start.physical = lock->phys + DFB_BYTES_PER_LINE( buffer->format, x ) + y * lock->pitch; -+ -+ ret = ioctl( fb->fd, FBIO_SET_START, &set_start ); -+ if (ret < 0) -+ D_DEBUG( "FBIO_SET_START (0x%08lx, sync %llu) failed!\n", -+ set_start.physical, set_start.sync ); -+ -+ if (ret == 0) { -+ if (flags & DSFLIP_WAIT) -+ ioctl( fb->fd, FBIO_WAITFORVSYNC ); -+ -+ return DFB_OK; -+ } -+ -+ /* fallback */ -+#endif -+ var->xoffset = x; /* poor version */ -+ var->yoffset = y + lock->offset / lock->pitch; -+ } -+ else { -+ var->xoffset = x; -+ var->yoffset = y; -+ } -+ -+ var->activate = /*(flags & DSFLIP_ONSYNC) ? FB_ACTIVATE_VBL :*/ FB_ACTIVATE_NOW; -+ -+ ret = ioctl( fb->fd, FBIOPAN_DISPLAY, var ); -+ if (ret) -+ D_PERROR( "Davinci/FB: FBIOPAN_DISPLAY (fb%d - %d,%d) failed!\n", -+ fb->num, var->xoffset, var->yoffset ); -+ -+ if (flags & DSFLIP_WAIT) -+ ioctl( fb->fd, FBIO_WAITFORVSYNC ); -+ -+ return DFB_OK; -+} -+ -+#endif -diff --git a/gfxdrivers/davinci/davincifb.h b/gfxdrivers/davinci/davincifb.h -new file mode 100644 -index 0000000..35eb169 ---- /dev/null -+++ b/gfxdrivers/davinci/davincifb.h -@@ -0,0 +1,581 @@ -+/* -+ * Copyright (C) 2006 Texas Instruments Inc -+ * -+ * 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 2 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, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * File: davincifb.h -+ */ -+ -+#ifndef DAVINVI_VPBE_H -+#define DAVINVI_VPBE_H -+ -+/* include Linux files */ -+#include -+ -+/* define the custom FBIO_WAITFORVSYNC ioctl */ -+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) -+#define FBIO_SETATTRIBUTE _IOW('F', 0x21, struct fb_fillrect) -+ -+/* Backported IOCTLS. */ -+#define FBIO_SETPOSX _IOW('F', 0x22, u_int32_t) -+#define FBIO_SETPOSY _IOW('F', 0x23, u_int32_t) -+#define FBIO_SETZOOM _IOW('F', 0x24, struct zoom_params) -+#define FBIO_GETSTD _IOR('F', 0x25, u_int32_t) -+#define FBIO_RESIZER _IOW('F', 0x26, struct vpfe_resizer_params) -+#define FBIO_SYNC _IOW('F', 0x27, u_int32_t) -+ -+typedef struct zoom_params { -+ u_int32_t window_id; -+ u_int32_t zoom_h; -+ u_int32_t zoom_v; -+} zoom_params_t; -+ -+typedef struct vpfe_resizer_params -+{ -+ u_int32_t rsz_cnt; //busy-lock -+ u_int32_t out_size; //busy-lock -+ u_int32_t in_start; //busy-lock -+ u_int32_t in_size; //busy-lock -+ u_int32_t sdr_inadd; //shadowed -+ u_int32_t sdr_inoff; //shadowed -+ u_int32_t sdr_outadd; //shadowed -+ u_int32_t sdr_outoff; //shadowed -+ u_int32_t hfilt[16]; //busy-lock -+ u_int32_t vfilt[16]; //busy-lock -+ u_int32_t yenh; //busy-lock -+} vpfe_resizer_params_t; -+ -+typedef struct fb_set_start { -+ int offset; /* offset from smem_start */ -+ unsigned long physical; /* absolute physical address when offset < 0 */ -+ -+ u_int64_t sync; /* input: target sync counter for change or 0 for no sync at all, -+ output: sync counter of actual change or 0 if still pending */ -+} fb_set_start_t; -+ -+ -+#ifdef _IOC_TYPECHECK -+#undef _IOC_TYPECHECK -+#define _IOC_TYPECHECK(x) (sizeof(x)) -+#endif -+ -+#define RAM_CLUT_SIZE 256*3 -+#define FBIO_ENABLE_DISABLE_WIN \ -+ _IOW('F', 0x30, unsigned char) -+#define FBIO_SET_BITMAP_BLEND_FACTOR \ -+ _IOW('F', 0x31, vpbe_bitmap_blend_params_t) -+#define FBIO_SET_BITMAP_WIN_RAM_CLUT \ -+ _IOW('F', 0x32, unsigned char)*RAM_CLUT_SIZE) -+#define FBIO_ENABLE_DISABLE_ATTRIBUTE_WIN \ -+ _IOW('F', 0x33, unsigned int) -+#define FBIO_GET_BLINK_INTERVAL \ -+ _IOR('F', 0x34, vpbe_blink_option_t) -+#define FBIO_SET_BLINK_INTERVAL \ -+ _IOW('F', 0x35, vpbe_blink_option_t) -+#define FBIO_GET_VIDEO_CONFIG_PARAMS \ -+ _IOR('F', 0x36, vpbe_video_config_params_t) -+#define FBIO_SET_VIDEO_CONFIG_PARAMS \ -+ _IOW('F', 0x37, vpbe_video_config_params_t) -+#define FBIO_GET_BITMAP_CONFIG_PARAMS \ -+ _IOR('F', 0x38, vpbe_bitmap_config_params_t) -+#define FBIO_SET_BITMAP_CONFIG_PARAMS \ -+ _IOW('F', 0x39, vpbe_bitmap_config_params_t) -+#define FBIO_SET_DCLK \ -+ _IOW('F', 0x40, vpbe_dclk_t) -+#define FBIO_SET_INTERFACE \ -+ _IOW('F', 0x41, unsigned char) -+#define FBIO_GET_INTERFACE \ -+ _IOR('F', 0x42, unsigned char) -+#define FBIO_QUERY_TIMING \ -+ _IOWR('F', 0x43, struct vpbe_mode_info) -+#define FBIO_SET_TIMING \ -+ _IOW('F', 0x44, struct vpbe_fb_videomode) -+#define FBIO_GET_TIMING \ -+ _IOR('F', 0x45, struct vpbe_fb_videomode) -+#define FBIO_SET_VENC_CLK_SOURCE \ -+ _IOW('F', 0x46, unsigned char) -+#define FBIO_SET_BACKG_COLOR \ -+ _IOW('F', 0x47, vpbe_backg_color_t) -+#define FBIO_ENABLE_DISPLAY \ -+ _IOW('F', 0x48, unsigned char) -+#define FBIO_SETPOS \ -+ _IOW('F', 0x49, u_int32_t) -+#define FBIO_SET_CURSOR \ -+ _IOW('F', 0x50, struct fb_cursor) -+#define FBIO_SET_START \ -+ _IOW('F', 0x66, struct fb_set_start) -+ -+/* -+ * Defines and Constants -+ */ -+#ifdef __KERNEL__ -+#define DAVINCIFB_DEVICE "davincifb" -+#define DAVINCIFB_DRIVER "davincifb" -+ -+#define MULTIPLE_BUFFERING 1 -+ -+#ifdef MULTIPLE_BUFFERING -+#define DOUBLE_BUF 2 -+#define TRIPLE_BUF 3 -+#else -+#define DOUBLE_BUF 1 -+#define TRIPLE_BUF 1 -+#endif -+ -+/* usage: if (is_win(info->fix.id, OSD0)) ... */ -+#define is_win(name, x) ((strcmp(name, x ## _FBNAME) == 0) ? 1 : 0) -+ -+/* -+ * display controller register I/O routines -+ */ -+u32 dispc_reg_in(u32 offset); -+u32 dispc_reg_out(u32 offset, u32 val); -+u32 dispc_reg_merge(u32 offset, u32 val, u32 mask); -+ -+#endif /*__KERNEL__*/ -+ -+/* Error return codes */ -+#define VPBE_INVALID_PARA_VALUE 700 -+#define VPBE_WRONG_WINDOW_ID 701 -+#define VPBE_CURRENTLY_IN_REQUIRED_MODE 702 -+#define VPBE_INSUFFICIENT_CLUT_VALUES 703 -+#define VPBE_CLUT_WRITE_TIMEOUT 704 -+#define VPBE_VID0_BUF_ADR_NULL 705 -+#define VPBE_WINDOW_NOT_DISABLED 706 -+#define VPBE_WINDOW_NOT_ENABLED 707 -+ -+#ifndef __KERNEL__ -+/* Window ID definations */ -+#define OSD0 0 -+#define VID0 1 -+#define OSD1 2 -+#define VID1 3 -+#endif -+ -+/* There are 4 framebuffers, each represented by an fb_info and -+ * a dm_win_info structure */ -+#define OSD0_FBNAME "dm_osd0_fb" -+#define OSD1_FBNAME "dm_osd1_fb" -+#define VID0_FBNAME "dm_vid0_fb" -+#define VID1_FBNAME "dm_vid1_fb" -+ -+/* FIXME: Digital LCD RGB matrix coefficients */ -+#define DLCD_DGY_VAL 0 -+#define DLCD_DRV_VAL 0 -+#define DLCD_DGU_VAL 0 -+#define DLCD_DBU_VAL 0 -+ -+/* Defines for bitmap format */ -+#define VPBE_BITMAP_BIT_1 1 -+#define VPBE_BITMAP_BIT_2 2 -+#define VPBE_BITMAP_BIT_4 4 -+#define VPBE_BITMAP_BIT_8 8 -+#define VPBE_BITMAP_RGB565 16 -+#define VPBE_VIDEO_YUV422 16 -+#define VPBE_VIDEO_RGB888 24 -+ -+/* Defines foe cursor parameter validation*/ -+#define MAX_CURSOR_WIDTH 0x3FF -+#define MAX_CURSOR_HEIGHT 0x1FF -+#define MAX_CURSOR_LINEWIDTH 7 -+ -+#define BASEX 0x80 -+#define BASEY 0x12 -+#define BASEX_DLCD 0x59 -+#define BASEY_DLCD 0x22 -+ -+/* -+ * Enumerations -+ */ -+/* Enum for blending factor */ -+typedef enum vpbe_blend_factor { -+ OSD_CONTRIBUTION_ZERO = 0, -+ OSD_CONTRIBUTION_1_BY_8 = 1, -+ OSD_CONTRIBUTION_2_BY_8 = 2, -+ OSD_CONTRIBUTION_3_BY_8 = 3, -+ OSD_CONTRIBUTION_4_BY_8 = 4, -+ OSD_CONTRIBUTION_5_BY_8 = 5, -+ OSD_CONTRIBUTION_6_BY_8 = 6, -+ OSD_CONTRIBUTION_ONE = 7 -+} vpbe_blend_factor_t; -+ -+/* Enum for Boolean variables */ -+typedef enum { -+ SET_0 = 0, -+ SET_1 = 1 -+} CB_CR_ORDER, ATTRIBUTE, ROM_RAM_CLUT; -+ -+/* Defines for Display Interface */ -+#define PRGB 0 -+#define COMPOSITE 1 -+#define SVIDEO 2 -+#define COMPONENT 3 -+#define RGB 4 -+#define YCC16 5 -+#define YCC8 6 -+#define SRGB 7 -+#define EPSON 8 -+#define CASIO1G 9 -+#define UDISP 10 -+#define STN 11 -+#define VPBE_MAX_INTERFACES 12 -+ -+/* Defines for Display Mode */ -+#define LCD 0 -+#define NTSC 1 -+#define PAL 2 -+#define P525 3 -+#define P625 4 -+ -+#define DEFAULT_MODE 0 -+#define P480 0 -+#define P400 1 -+#define P350 2 -+#define NON_EXISTING_MODE 255 -+/* Enable/Disable enum */ -+typedef enum { -+ VPBE_DISABLE = 0, -+ VPBE_ENABLE = 1 -+} ATTENUATION, TRANSPARENCY, EXPANSION, BLINKING; -+ -+typedef enum clk_source { -+ CLK_SOURCE_CLK27 = 0, -+ CLK_SOURCE_CLK54 = 1, -+ CLK_SOURCE_VPBECLK = 2 -+} CLK_SOURCE; -+ -+/* -+ * Structures and Union Definitions -+ */ -+ -+/* Structure for transparency and the blending factor for the bitmap window */ -+typedef struct vpbe_bitmap_blend_params { -+ unsigned int colorkey; /* color key to be blend */ -+ unsigned int enable_colorkeying; /* enable color keying */ -+ unsigned int bf; /* valid range from 0 to 7 only. */ -+} vpbe_bitmap_blend_params_t; -+ -+/* Structure for window expansion */ -+typedef struct vpbe_win_expansion { -+ EXPANSION horizontal; -+ EXPANSION vertical; /* 1: Enable 0:disable */ -+} vpbe_win_expansion_t; -+ -+/* Structure for OSD window blinking options */ -+typedef struct vpbe_blink_option { -+ BLINKING blinking; /* 1: Enable blinking 0: Disable */ -+ unsigned int interval; /* Valid only if blinking is 1 */ -+} vpbe_blink_option_t; -+ -+/* Structure for DCLK parameters */ -+typedef struct vpbe_dclk { -+ unsigned char dclk_pattern_width; -+ unsigned int dclk_pattern0; -+ unsigned int dclk_pattern1; -+ unsigned int dclk_pattern2; -+ unsigned int dclk_pattern3; -+} vpbe_dclk_t; -+ -+/* Structure for display format */ -+typedef struct vpbe_display_format { -+ unsigned char interface; /* Output interface type */ -+ unsigned char mode; /* output mode */ -+} vpbe_display_format_t; -+ -+/* Structure for background color */ -+typedef struct vpbe_backg_color { -+ unsigned char clut_select; /* 2: RAM CLUT 1:ROM1 CLUT 0:ROM0 CLUT */ -+ unsigned char color_offset; /* index of color */ -+} vpbe_backg_color_t; -+ -+/* Structure for Video window configurable parameters */ -+typedef struct vpbe_video_config_params { -+ CB_CR_ORDER cb_cr_order; /*Cb/Cr order in input data for a pixel. */ -+ /* 0: cb cr 1: cr cb */ -+ vpbe_win_expansion_t exp_info; /* HZ/VT Expansion enable disable */ -+} vpbe_video_config_params_t; -+ -+/*Union of structures giving the CLUT index for the 1, 2, 4 bit bitmap values.*/ -+typedef union vpbe_clut_idx { -+ struct _for_4bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char bitmap_val_1; -+ unsigned char bitmap_val_2; -+ unsigned char bitmap_val_3; -+ unsigned char bitmap_val_4; -+ unsigned char bitmap_val_5; -+ unsigned char bitmap_val_6; -+ unsigned char bitmap_val_7; -+ unsigned char bitmap_val_8; -+ unsigned char bitmap_val_9; -+ unsigned char bitmap_val_10; -+ unsigned char bitmap_val_11; -+ unsigned char bitmap_val_12; -+ unsigned char bitmap_val_13; -+ unsigned char bitmap_val_14; -+ unsigned char bitmap_val_15; -+ } for_4bit_bimap; -+ struct _for_2bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char dummy0[4]; -+ unsigned char bitmap_val_1; -+ unsigned char dummy1[4]; -+ unsigned char bitmap_val_2; -+ unsigned char dummy2[4]; -+ unsigned char bitmap_val_3; -+ } for_2bit_bimap; -+ struct _for_1bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char dummy0[14]; -+ unsigned char bitmap_val_1; -+ } for_1bit_bimap; -+} vpbe_clut_idx_t; -+ -+/* Structure for bitmap window configurable parameters */ -+typedef struct vpbe_bitmap_config_params { -+ /* Only for bitmap width = 1,2,4 bits */ -+ vpbe_clut_idx_t clut_idx; -+ /* Attenuation value for YUV o/p for bitmap window */ -+ unsigned char attenuation_enable; -+ /* 0: ROM DM270, 1:ROM DM320, 2:RAM CLUT */ -+ unsigned char clut_select; -+} vpbe_bitmap_config_params_t; -+ -+/* Unioun for video/OSD configuration parameters */ -+typedef union vpbe_conf_params { -+ -+ struct vpbe_video_params { -+ CB_CR_ORDER cb_cr_order; -+ /* HZ/VT Expansion enable disable */ -+ vpbe_win_expansion_t exp_info; -+ } video_params; -+ -+ struct vpbe_bitmap_params { -+ /* Attenuation value for YUV o/p */ -+ ATTENUATION attenuation_enable; -+ /* 0: ROM DM270, 1: ROM DM320, 2:RAM CLUT */ -+ unsigned char clut_select; -+ /* Only for bitmap width = 1,2,4 bits */ -+ vpbe_clut_idx_t clut_idx; -+ /* 0: OSD window is bitmap window */ -+ /* 1: OSD window is attribute window */ -+ ATTRIBUTE enable_attribute; -+ /* To hold bps value. -+ Used to switch back from attribute to bitmap. */ -+ unsigned int stored_bits_per_pixel; -+ /* Blending information */ -+ vpbe_bitmap_blend_params_t blend_info; -+ /* OSD Blinking information */ -+ vpbe_blink_option_t blink_info; -+ } bitmap_params; -+ -+} vpbe_conf_params_t; -+ -+typedef struct vpbe_video_params vpbe_video_params_t; -+typedef struct vpbe_bitmap_params vpbe_bitmap_params_t; -+ -+/* Structure to hold window position */ -+typedef struct vpbe_window_position { -+ unsigned int xpos; /* X position of the window */ -+ unsigned int ypos; /* Y position of the window */ -+} vpbe_window_position_t; -+ -+#ifdef __KERNEL__ -+/* Structure for each window */ -+typedef struct vpbe_dm_win_info { -+ struct fb_info info; -+ vpbe_window_position_t win_pos; /* X,Y position of window */ -+ /* Size of window is already there in var_info structure. */ -+ -+ dma_addr_t fb_base_phys; /*framebuffer area */ -+ unsigned int fb_base; /*window memory pointer */ -+ unsigned int fb_size; /*memory size */ -+ unsigned int pseudo_palette[17]; -+ int alloc_fb_mem; -+ /*flag to identify if framebuffer area is fixed or not */ -+ unsigned long sdram_address; -+ struct vpbe_dm_info *dm; -+ unsigned char window_enable; /*Additions for all windows */ -+ zoom_params_t zoom; /*Zooming parameters */ -+ unsigned char field_frame_select; /*To select Field or frame */ -+ unsigned char numbufs; /*Number of buffers valid 2 or 3 */ -+ vpbe_conf_params_t conf_params; -+ /*window configuration parameter union pointer */ -+} vpbe_dm_win_info_t; -+#endif /*__KERNEL__*/ -+ -+/* -+ * Videmode structure for display interface and mode settings -+ */ -+typedef struct vpbe_fb_videomode { -+ unsigned char name[10]; /* Mode name ( NTSC , PAL) */ -+ unsigned int vmode; /* FB_MODE_INTERLACED or FB_MODE_NON_INTERLACED */ -+ unsigned int xres; /* X Resolution of the display */ -+ unsigned int yres; /* Y Resolution of the display */ -+ unsigned int fps; /* frames per second */ -+ /* Timing Parameters applicable for std = 0 only */ -+ unsigned int left_margin; -+ unsigned int right_margin; -+ unsigned int upper_margin; -+ unsigned int lower_margin; -+ unsigned int hsync_len; -+ unsigned int vsync_len; -+ unsigned int sync; /* 0: hsync -ve/vsync -ve */ -+ /*1: hsync -ve/vsync +ve */ -+ /*2: hsync +ve/vsync -ve */ -+ /*3: hsync +ve/vsync +ve */ -+ unsigned int basepx; /* Display x,y start position */ -+ unsigned int basepy; -+/* 1= Mode s available in modelist 0=Mode is not available in modelist */ -+ unsigned int std; -+} vpbe_fb_videomode_t; -+ -+/* Structure to interface videomode to application*/ -+typedef struct vpbe_mode_info { -+ vpbe_fb_videomode_t vid_mode; -+ unsigned char interface; -+ unsigned char mode_idx; -+} vpbe_mode_info_t; -+ -+#ifdef __KERNEL__ -+/* -+ * Structure for the driver holding information of windows, -+ * memory base addresses etc. -+ */ -+typedef struct vpbe_dm_info { -+ vpbe_dm_win_info_t *osd0; -+ vpbe_dm_win_info_t *osd1; -+ vpbe_dm_win_info_t *vid0; -+ vpbe_dm_win_info_t *vid1; -+ -+/* to map the registers */ -+ dma_addr_t mmio_base_phys; -+ unsigned int mmio_base; -+ unsigned int mmio_size; -+ -+ wait_queue_head_t vsync_wait; -+ unsigned int vsync_cnt; -+ int timeout; -+ -+ /* this is the function that configures the output device (NTSC/PAL/LCD) -+ * for the required output format (composite/s-video/component/rgb) -+ */ -+ void (*output_device_config) (void); -+ -+ struct device *dev; -+ -+ vpbe_backg_color_t backg; /* background color */ -+ vpbe_dclk_t dclk; /*DCLK parameters */ -+ vpbe_display_format_t display; /*Display interface and mode */ -+ vpbe_fb_videomode_t videomode; /*Cuurent videomode */ -+ char ram_clut[256][3]; /*RAM CLUT array */ -+ struct fb_cursor cursor; /* cursor config params from fb.h */ -+/*Flag that indicates whether any of the display is enabled or not*/ -+ int display_enable; -+} vpbe_dm_info_t; -+ -+/* -+ * Functions Definitions for 'davincifb' module -+ */ -+int vpbe_mem_alloc_window_buf(vpbe_dm_win_info_t *); -+int vpbe_mem_release_window_buf(vpbe_dm_win_info_t *); -+void init_display_function(vpbe_display_format_t *); -+int vpbe_mem_alloc_struct(vpbe_dm_win_info_t **); -+void set_vid0_default_conf(void); -+void set_vid1_default_conf(void); -+void set_osd0_default_conf(void); -+void set_osd1_default_conf(void); -+void set_cursor_default_conf(void); -+void set_dm_default_conf(void); -+void set_win_enable(char *, unsigned int); -+int within_vid0_limits(u32, u32, u32, u32); -+void vpbe_set_display_default(void); -+#ifdef __KERNEL__ -+void set_win_position(char *, u32, u32, u32, u32); -+void change_win_param(int); -+void set_interlaced(char *, unsigned int); -+#endif /* __KERNEL__ */ -+ -+/* -+ * Function definations for 'osd' module -+ */ -+ -+int vpbe_enable_window(vpbe_dm_win_info_t *); -+int vpbe_disable_window(vpbe_dm_win_info_t *); -+int vpbe_vid_osd_select_field_frame(u8 *, u8); -+int vpbe_bitmap_set_blend_factor(u8 *, vpbe_bitmap_blend_params_t *); -+int vpbe_bitmap_set_ram_clut(void); -+int vpbe_enable_disable_attribute_window(u32); -+int vpbe_get_blinking(u8 *, vpbe_blink_option_t *); -+int vpbe_set_blinking(u8 *, vpbe_blink_option_t *); -+int vpbe_set_vid_params(u8 *, vpbe_video_config_params_t *); -+int vpbe_get_vid_params(u8 *, vpbe_video_config_params_t *); -+int vpbe_bitmap_get_params(u8 *, vpbe_bitmap_config_params_t *); -+int vpbe_bitmap_set_params(u8 *, vpbe_bitmap_config_params_t *); -+int vpbe_set_cursor_params(struct fb_cursor *); -+int vpbe_set_vid_expansion(vpbe_win_expansion_t *); -+int vpbe_set_dclk(vpbe_dclk_t *); -+int vpbe_set_display_format(vpbe_display_format_t *); -+int vpbe_set_backg_color(vpbe_backg_color_t *); -+int vpbe_set_interface(u8); -+int vpbe_query_mode(vpbe_mode_info_t *); -+int vpbe_set_mode(struct vpbe_fb_videomode *); -+int vpbe_set_venc_clk_source(u8); -+void set_vid0_default_conf(void); -+void set_osd0_default_conf(void); -+void set_vid1_default_conf(void); -+void set_osd1_default_conf(void); -+void set_cursor_default_conf(void); -+void set_dm_default_conf(void); -+/* -+ * Function definations for 'venc' module -+ */ -+ -+void davincifb_ntsc_composite_config(void); -+void davincifb_ntsc_svideo_config(void); -+void davincifb_ntsc_component_config(void); -+void davincifb_pal_composite_config(void); -+void davincifb_pal_svideo_config(void); -+void davincifb_pal_component_config(void); -+ -+void vpbe_davincifb_ntsc_rgb_config(void); -+void vpbe_davincifb_pal_rgb_config(void); -+void vpbe_davincifb_525p_component_config(void); -+void vpbe_davincifb_625p_component_config(void); -+ -+void vpbe_enable_venc(int); -+void vpbe_enable_dacs(int); -+/* -+ * Function definations for 'dlcd' module -+ */ -+void vpbe_davincifb_480p_prgb_config(void); -+void vpbe_davincifb_400p_prgb_config(void); -+void vpbe_davincifb_350p_prgb_config(void); -+void vpbe_set_display_timing(struct vpbe_fb_videomode *); -+ -+void vpbe_enable_lcd(int); -+/* -+ * Following functions are not implemented -+ */ -+void vpbe_davincifb_default_ycc16_config(void); -+void vpbe_davincifb_default_ycc8_config(void); -+void vpbe_davincifb_default_srgb_config(void); -+void vpbe_davincifb_default_epson_config(void); -+void vpbe_davincifb_default_casio_config(void); -+void vpbe_davincifb_default_UDISP_config(void); -+void vpbe_davincifb_default_STN_config(void); -+#endif /*__KERNEL__*/ -+ -+#endif /* End of #ifndef DAVINCI_VPBE_H */ diff --git a/src/patches/DirectFB-1.7.7-fix_mknod.patch b/src/patches/DirectFB-1.7.7-fix_mknod.patch deleted file mode 100644 index 12ac2cac5..000000000 --- a/src/patches/DirectFB-1.7.7-fix_mknod.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Debian Multimedia Maintainers - -Date: Thu, 16 Mar 2017 20:48:20 +0100 -Subject: _fix_mknod - ---- - gfxdrivers/davinci/davinci_c64x.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gfxdrivers/davinci/davinci_c64x.c b/gfxdrivers/davinci/davinci_c64x.c -index 431ffdd..420b567 100644 ---- a/gfxdrivers/davinci/davinci_c64x.c -+++ b/gfxdrivers/davinci/davinci_c64x.c -@@ -37,6 +37,8 @@ - #include - #include - #include -+#include -+#include - #include - - #include From patchwork Wed Feb 12 09:34:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2782 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZHr2l3Xz3xYL for ; Wed, 12 Feb 2020 09:35:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHq2T3Hz11v; Wed, 12 Feb 2020 09:35:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHq04ylz2ywy; Wed, 12 Feb 2020 09:35:19 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHj3brpz2yvn for ; Wed, 12 Feb 2020 09:35:13 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHj2j7qzQ1; Wed, 12 Feb 2020 09:35:13 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RdQSVmfLqTBJ0a8rrCPRi9afKBz++SSIaYrHuYIPE1o=; b=S0YfZGN8Jb8AgjWbxg34NH0aDOFbWp6O9v7qAih1+a9ORJg6004BuwQz+yNJXLz+GrFXHc bUaAtCes0k5mCDAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RdQSVmfLqTBJ0a8rrCPRi9afKBz++SSIaYrHuYIPE1o=; b=gJjdxyPQaf2K1Pl9wuLpg7G5FgTrEX7YHrNVo/mV+IGvENVn9DP/3aoQ3UX1exxbUaOCBz +o33EyS5NEyYtzeDNL7PB5t0pvBsELsmOcQWnidLJp40qW0Bi/4Jsaeg2EYnIi5zz2XIgv lxYUPOJ+8YpQZE/qSrf0WUzCDMtUQJ+rxggZXIavcmvF/o17qUNC4c56o+Wp77YUSweoBM sKOSQLuq2vVHL0ORPIcvLEc4ZcdkqeA2NKMsKLN11CTpSEuT5KEuW6n6rhR9WpSo8J8kdE yqt1+uZjtnOV9F2MWnd/WcQegy3KBbfcEiP8e93F4zHFOSe+riEchuInDUW+TQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 06/14] Drop ez-ipupdate Date: Wed, 12 Feb 2020 09:34:45 +0000 Message-Id: <20200212093453.5732-7-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" We do not use this at all any more, because it has been replaced by ddns. Signed-off-by: Michael Tremer --- config/rootfiles/common/ez-ipupdate | 1 - lfs/ez-ipupdate | 79 ------------------- make.sh | 1 - ...ez-ipupdate-3.0.11b8-zoneedit-server.patch | 13 --- src/patches/ez-ipupdate.formstring.patch | 11 --- 5 files changed, 105 deletions(-) delete mode 100644 config/rootfiles/common/ez-ipupdate delete mode 100644 lfs/ez-ipupdate delete mode 100644 src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch delete mode 100644 src/patches/ez-ipupdate.formstring.patch diff --git a/config/rootfiles/common/ez-ipupdate b/config/rootfiles/common/ez-ipupdate deleted file mode 100644 index 58125d790..000000000 --- a/config/rootfiles/common/ez-ipupdate +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ez-ipupdate diff --git a/lfs/ez-ipupdate b/lfs/ez-ipupdate deleted file mode 100644 index bd2523607..000000000 --- a/lfs/ez-ipupdate +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - -VER = 3.0.11b8 - -THISAPP = ez-ipupdate-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 000211add4c4845ffa4211841bff4fb0 - -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) && patch -Np0 < $(DIR_SRC)/src/patches/ez-ipupdate.formstring.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index ca02c40f4..1a2dd3de7 100755 --- a/make.sh +++ b/make.sh @@ -1267,7 +1267,6 @@ buildipfire() { lfsmake2 fuse lfsmake2 ntfs-3g lfsmake2 ethtool - lfsmake2 ez-ipupdate lfsmake2 fcron lfsmake2 perl-GD lfsmake2 GD-Graph diff --git a/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch b/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch deleted file mode 100644 index 0fbc07a50..000000000 --- a/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ez-ipupdate.c b/ez-ipupdate.c -index 9aea495..a6d2528 100644 ---- a/ez-ipupdate.c -+++ b/ez-ipupdate.c -@@ -95,7 +95,7 @@ - #define HN_DEFAULT_PORT "80" - #define HN_REQUEST "/vanity/update" - --#define ZONEEDIT_DEFAULT_SERVER "www.zoneedit.com" -+#define ZONEEDIT_DEFAULT_SERVER "dynamic.zoneedit.com" - #define ZONEEDIT_DEFAULT_PORT "80" - #define ZONEEDIT_REQUEST "/auth/dynamic.html" - diff --git a/src/patches/ez-ipupdate.formstring.patch b/src/patches/ez-ipupdate.formstring.patch deleted file mode 100644 index 83187d197..000000000 --- a/src/patches/ez-ipupdate.formstring.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ez-ipupdate.c.old 2002-03-12 00:31:47.000000000 +0100 -+++ ez-ipupdate.c 2004-11-10 15:28:23.000000000 +0100 -@@ -798,7 +798,7 @@ void show_message(char *fmt, ...) - sprintf(buf, "message incomplete because your OS sucks: %s\n", fmt); - #endif - -- syslog(LOG_NOTICE, buf); -+ syslog(LOG_NOTICE, "%s", buf); - } - else - { From patchwork Wed Feb 12 09:34:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2781 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZHq4TDTz3xyY for ; Wed, 12 Feb 2020 09:35:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHp57s5z13G; Wed, 12 Feb 2020 09:35:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHp35Kvz2ydt; Wed, 12 Feb 2020 09:35:18 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHj51HWz2ywn for ; Wed, 12 Feb 2020 09:35:13 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHj3fzCztG; Wed, 12 Feb 2020 09:35:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cNahbrwB3I0L+5dQP6fk0Ru9V0f2aHloUkxM8M8LCz8=; b=HzMGvqeiqTHvj7Nwo0Jg0fGHjycbi19WlMT6qwFc6FcRE+95G8JkTstne2ck2qnVhc3KOe axhpVjB2VZnkFZ5wdnsTy0rRGEOjc3kFepkwgj06vLNBcONWhXg8u6WeZpHilkv7kdRK9P FTYE7OK9bBy4U0bg/gk92H5CKkGQ66RngDLecgkNmRjF5RCSRwrFt0XtjpvbnxwCHc7gxU a44CqIoryYal3yaFAvz8NviXS32YWLf4acwYFLRwCkTCMJ549WJgwo1dkwvKGEhH4PqDTn 32Dk9WLDnBDvtwK21zQDWoxpBqdSDddh7kGmsi8bLogrh8B2q9JmvNgowsUHdQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cNahbrwB3I0L+5dQP6fk0Ru9V0f2aHloUkxM8M8LCz8=; b=t3gRVwe6xwjuKs65887a3HWmdDCJaqMLYSYLcBZet/ZN93SV5RXWv/OGC9T52LlNfAJkK7 Xmz0xx2AR+vHfFDQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 07/14] Drop i2c-tools Date: Wed, 12 Feb 2020 09:34:46 +0000 Message-Id: <20200212093453.5732-8-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This reverts commit 429af17883be439db0b67d05b43ad66c9c000382. The product we built this for has never been released. Signed-off-by: Michael Tremer --- config/rootfiles/common/i2c-tools | 16 ---- .../rootfiles/oldcore/119/filelists/i2c-tools | 1 - lfs/i2c-tools | 79 ------------------- make.sh | 1 - 4 files changed, 97 deletions(-) delete mode 100644 config/rootfiles/common/i2c-tools delete mode 120000 config/rootfiles/oldcore/119/filelists/i2c-tools delete mode 100644 lfs/i2c-tools diff --git a/config/rootfiles/common/i2c-tools b/config/rootfiles/common/i2c-tools deleted file mode 100644 index fb5ee8326..000000000 --- a/config/rootfiles/common/i2c-tools +++ /dev/null @@ -1,16 +0,0 @@ -usr/bin/ddcmon -usr/bin/decode-dimms -usr/bin/decode-edid -usr/bin/decode-vaio -usr/sbin/i2c-stub-from-dump -usr/sbin/i2cdetect -usr/sbin/i2cdump -usr/sbin/i2cget -usr/sbin/i2cset -#usr/share/man/man1/decode-dimms.1 -#usr/share/man/man1/decode-vaio.1 -#usr/share/man/man8/i2c-stub-from-dump.8 -#usr/share/man/man8/i2cdetect.8 -#usr/share/man/man8/i2cdump.8 -#usr/share/man/man8/i2cget.8 -#usr/share/man/man8/i2cset.8 diff --git a/config/rootfiles/oldcore/119/filelists/i2c-tools b/config/rootfiles/oldcore/119/filelists/i2c-tools deleted file mode 120000 index c5f5af9e4..000000000 --- a/config/rootfiles/oldcore/119/filelists/i2c-tools +++ /dev/null @@ -1 +0,0 @@ -../../../common/i2c-tools \ No newline at end of file diff --git a/lfs/i2c-tools b/lfs/i2c-tools deleted file mode 100644 index d16e4aaae..000000000 --- a/lfs/i2c-tools +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - -VER = 3.1.2 - -THISAPP = i2c-tools-$(VER) -DL_FILE = $(THISAPP).tar.xz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 7fad5c6f6eb8aa35cf588a2fda5bcede - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install prefix=/usr - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 1a2dd3de7..e137d98e5 100755 --- a/make.sh +++ b/make.sh @@ -1611,7 +1611,6 @@ buildipfire() { lfsmake2 wio lfsmake2 iftop lfsmake2 mdns-repeater - lfsmake2 i2c-tools lfsmake2 nss-myhostname lfsmake2 dehydrated lfsmake2 shairport-sync From patchwork Wed Feb 12 09:34:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2783 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZHr6Sj8z3xyZ for ; Wed, 12 Feb 2020 09:35:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHr0XnLz12X; Wed, 12 Feb 2020 09:35:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHq4Mhhz2ywy; Wed, 12 Feb 2020 09:35:19 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHj5fvxz2ywy for ; Wed, 12 Feb 2020 09:35:13 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHj4c03z11k; Wed, 12 Feb 2020 09:35:13 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PvYKmGchyabFOhTOlbEZNwZOP+LV/x16FossbWASzaY=; b=GovWQ+Kq0m1EadwNp7/G6+JGHWibWezIph9+udtAPsGLQvk5FyFd4sVEpfkjgvJVwOY/L6 BWa56DImdm+AxtAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PvYKmGchyabFOhTOlbEZNwZOP+LV/x16FossbWASzaY=; b=ZyLMl/y47hGfvSZwscF6Oo8wGlqo+/DA+K10dYC2191J2386kQstIZOnZCF4/+u1GWzXQD wK/WncFzgpKdYA/C1cBU2/dYdaSopJZpQKYGpH9Ab/AfJ9i0naWK3ew0g/8QfIFwGJ3wVs gn0bN6xKc66SvoP7my5WanBkuE5vBr4WmENqEyP6cbaDC+z7nOPk5txaqFFb7D89JazvqC +nV8qRYYKqKEIZ47Qo3THmdDHVEOwIQjk4JmQXm8A8/HP2fYQ+vloWp+lxWjZGxhFY3Cui 2y0xJL3FJ9IM9kqr8ExfDKOsXvaLTFY54SjI6wfUIQT+6pBI5ZBCHUVCtlXsxQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 08/14] Drop icecast Date: Wed, 12 Feb 2020 09:34:47 +0000 Message-Id: <20200212093453.5732-9-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is unmaintained for a very long time. Signed-off-by: Michael Tremer --- config/rootfiles/packages/icecast | 55 -------------------- lfs/icecast | 85 ------------------------------- make.sh | 1 - 3 files changed, 141 deletions(-) delete mode 100644 config/rootfiles/packages/icecast delete mode 100644 lfs/icecast diff --git a/config/rootfiles/packages/icecast b/config/rootfiles/packages/icecast deleted file mode 100644 index 7a79bb518..000000000 --- a/config/rootfiles/packages/icecast +++ /dev/null @@ -1,55 +0,0 @@ -usr/bin/icecast -usr/etc/icecast.xml -#usr/share/doc/icecast -#usr/share/doc/icecast/AUTHORS -#usr/share/doc/icecast/COPYING -#usr/share/doc/icecast/ChangeLog -#usr/share/doc/icecast/NEWS -#usr/share/doc/icecast/README -#usr/share/doc/icecast/TODO -usr/share/doc/icecast/icecast2_admin.html -usr/share/doc/icecast/icecast2_basicsetup.html -usr/share/doc/icecast/icecast2_changes.html -usr/share/doc/icecast/icecast2_config_file.html -usr/share/doc/icecast/icecast2_faq.html -usr/share/doc/icecast/icecast2_glossary.html -usr/share/doc/icecast/icecast2_introduction.html -usr/share/doc/icecast/icecast2_listenerauth.html -usr/share/doc/icecast/icecast2_relay.html -usr/share/doc/icecast/icecast2_stats.html -usr/share/doc/icecast/icecast2_win32.html -usr/share/doc/icecast/icecast2_yp.html -usr/share/doc/icecast/index.html -usr/share/doc/icecast/listener_auth1.jpg -usr/share/doc/icecast/listener_auth2.jpg -usr/share/doc/icecast/listener_auth3.jpg -#usr/share/icecast -#usr/share/icecast/admin -usr/share/icecast/admin/listclients.xsl -usr/share/icecast/admin/listmounts.xsl -usr/share/icecast/admin/manageauth.xsl -usr/share/icecast/admin/moveclients.xsl -usr/share/icecast/admin/response.xsl -usr/share/icecast/admin/stats.xsl -usr/share/icecast/admin/updatemetadata.xsl -#usr/share/icecast/doc -usr/share/icecast/doc/icecast.xml.dist -usr/share/icecast/doc/icecast_minimal.xml.dist -usr/share/icecast/doc/icecast_shoutcast_compat.xml.dist -usr/share/icecast/doc/icecast_urlauth.xml.dist -#usr/share/icecast/web -usr/share/icecast/web/auth.xsl -usr/share/icecast/web/corner_bottomleft.jpg -usr/share/icecast/web/corner_bottomright.jpg -usr/share/icecast/web/corner_topleft.jpg -usr/share/icecast/web/corner_topright.jpg -usr/share/icecast/web/icecast.png -usr/share/icecast/web/key.gif -usr/share/icecast/web/key.png -usr/share/icecast/web/server_version.xsl -usr/share/icecast/web/status.xsl -usr/share/icecast/web/status2.xsl -usr/share/icecast/web/style.css -usr/share/icecast/web/tunein.png -usr/share/doc/icecast/masterslave.png -usr/share/doc/icecast/relay.png diff --git a/lfs/icecast b/lfs/icecast deleted file mode 100644 index c59fba8f3..000000000 --- a/lfs/icecast +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - -VER = 2.3.2 - -THISAPP = icecast-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = icecast -PAK_VER = 3 - -DEPS = "libshout lame sox libvorbis libogg" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = ff516b3ccd2bcc31e68f460cd316093f - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 - cd $(DIR_APP) && make - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index e137d98e5..1fcb65d3b 100755 --- a/make.sh +++ b/make.sh @@ -1462,7 +1462,6 @@ buildipfire() { lfsmake2 vdr_dvbapi lfsmake2 vdr_eepg lfsmake2 w_scan - lfsmake2 icecast lfsmake2 icegenerator lfsmake2 mpd lfsmake2 libmpdclient From patchwork Wed Feb 12 09:34:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2784 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZHs1brqz3xyd for ; Wed, 12 Feb 2020 09:35:21 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHr3BCfz17N; Wed, 12 Feb 2020 09:35:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHr18y1z2yyt; Wed, 12 Feb 2020 09:35:20 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHj6gDvz2yK5 for ; Wed, 12 Feb 2020 09:35:13 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHj5fcbzQ1; Wed, 12 Feb 2020 09:35:13 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lk0o23p/74TKOMAS4BBfyj9hcqfo8bz76/nyCNYHdGU=; b=5QbdzmU+oA0NAbWQuPeBpjLKpDbIBjSACtXcDOBKoHgSIKS+7burn8nVsORhWH07WyQdtN HRKQWUKEXFgitYAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lk0o23p/74TKOMAS4BBfyj9hcqfo8bz76/nyCNYHdGU=; b=Cqs57DDXdcFZaO/BP7IKqrzNkgetxX82fWnMriDszE7SZhqDjB/fjLIALtYY2CSi9hQJMv zbo8RQBq3QUEt8vqRVxAN/SweVAuLDVnMZdVki4ryBtnT309kilfKQ6b3m8037EJgy1/4F mKRgJNIPVDC+xV8hMaDNh2ji+49TzqRlLKUNVNkC43yOrjqoJWnCC/zSMx6KBrJzYmfvBz Gb6o6wiYaXBxJ3fhUfIbJ/6rXCsFibKHoo9zEZPLfhu0crDT69iqRaUxCHdXoFVW/zhKgz 0+ZLoPg9DDb5Iejv9QmV2s0oteYtR1w0KRbmwY2ttsSe7tUXiXORauKbuLbEkA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 09/14] Drop icegenerator Date: Wed, 12 Feb 2020 09:34:48 +0000 Message-Id: <20200212093453.5732-10-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is only useful with icecast. Signed-off-by: Michael Tremer --- config/rootfiles/packages/icegenerator | 1 - lfs/icegenerator | 85 -------------------------- make.sh | 1 - 3 files changed, 87 deletions(-) delete mode 100644 config/rootfiles/packages/icegenerator delete mode 100644 lfs/icegenerator diff --git a/config/rootfiles/packages/icegenerator b/config/rootfiles/packages/icegenerator deleted file mode 100644 index 940c82947..000000000 --- a/config/rootfiles/packages/icegenerator +++ /dev/null @@ -1 +0,0 @@ -usr/local/bin/icegenerator diff --git a/lfs/icegenerator b/lfs/icegenerator deleted file mode 100644 index 84cede07a..000000000 --- a/lfs/icegenerator +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - -VER = 0.5.5-pre2 - -THISAPP = icegenerator-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = icegenerator -PAK_VER = 1 - -DEPS = "icecast" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 71515d79bc43ca53baffc96c4ada946a - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 --with-id3 - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 1fcb65d3b..5ac026e94 100755 --- a/make.sh +++ b/make.sh @@ -1462,7 +1462,6 @@ buildipfire() { lfsmake2 vdr_dvbapi lfsmake2 vdr_eepg lfsmake2 w_scan - lfsmake2 icegenerator lfsmake2 mpd lfsmake2 libmpdclient lfsmake2 mpc From patchwork Wed Feb 12 09:34:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2786 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZJ03jCXz3xYL for ; Wed, 12 Feb 2020 09:35:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHs11fpz12G; Wed, 12 Feb 2020 09:35:21 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHr4gKYz2yyB; Wed, 12 Feb 2020 09:35:20 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHk1TjHz2yZn for ; Wed, 12 Feb 2020 09:35:14 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHj6HNDz11l; Wed, 12 Feb 2020 09:35:13 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PnySO/egNavhVaQ0he1HwMPC5gUqm+viUO0mwCn5tk4=; b=nS4k0HGf8ZGbUYqsiXFhAcwNCvRBkXE3+1dcA6/yf+s5+OXgL2y7ixapBqf8v5j+RYMtWu DPSkOX+chkQIaXDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PnySO/egNavhVaQ0he1HwMPC5gUqm+viUO0mwCn5tk4=; b=FC8L8uFCm2/BAWX914v4YE6R8nKzUErnpLKArJLuEAzUi8TzZ9cT0isHxCta26ROTrArJI xBJGYFin7Ps2oTTbL4ekeg0++AM6YlwYjatwq9u6dJk37x7bGwalJEIMY67rNaFafecPBr VQzBKXfA4wmnzGhaktjznqEwhWiKEVU9Gj2H7ZQRQy7P5YZkGDVmWskC/HMZ3kMrCaplGo K++/If5P+8HoiJ7cNcISYpWHgx73dhAZaE7bgEdGj4URWuRbB06i5RQOXApHpx4tfz1Lxa qDMIJy1kliUt7mnwWNDst++q58vDaO0pRgYhANna2yfxeWtNr4LgGTtb05pW/w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 10/14] Drop rtpproxy Date: Wed, 12 Feb 2020 09:34:49 +0000 Message-Id: <20200212093453.5732-11-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This probably has only been used by me and we do not need it any more. Signed-off-by: Michael Tremer --- config/rootfiles/packages/rtpproxy | 5 -- lfs/rtpproxy | 87 ------------------------------ make.sh | 1 - src/initscripts/packages/rtpproxy | 66 ----------------------- src/paks/rtpproxy/install.sh | 29 ---------- src/paks/rtpproxy/uninstall.sh | 27 ---------- src/paks/rtpproxy/update.sh | 26 --------- 7 files changed, 241 deletions(-) delete mode 100644 config/rootfiles/packages/rtpproxy delete mode 100644 lfs/rtpproxy delete mode 100755 src/initscripts/packages/rtpproxy delete mode 100644 src/paks/rtpproxy/install.sh delete mode 100644 src/paks/rtpproxy/uninstall.sh delete mode 100644 src/paks/rtpproxy/update.sh diff --git a/config/rootfiles/packages/rtpproxy b/config/rootfiles/packages/rtpproxy deleted file mode 100644 index 6fcc1e44c..000000000 --- a/config/rootfiles/packages/rtpproxy +++ /dev/null @@ -1,5 +0,0 @@ -etc/rc.d/init.d/rtpproxy -usr/bin/makeann -usr/bin/rtpproxy -#usr/bin/rtpproxy_debug -#usr/share/man/man8/rtpproxy.8 diff --git a/lfs/rtpproxy b/lfs/rtpproxy deleted file mode 100644 index 204f44bca..000000000 --- a/lfs/rtpproxy +++ /dev/null @@ -1,87 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - -VER = 2.0.0 - -THISAPP = rtpproxy-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = rtpproxy -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 8d36fcc1dd93994ac5376d145f19ac73 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - #install initscripts - $(call INSTALL_INITSCRIPT,rtpproxy) - @rm -rf $(DIR_APP) - @$(POSTBUILD) - diff --git a/make.sh b/make.sh index 5ac026e94..247cdb001 100755 --- a/make.sh +++ b/make.sh @@ -1597,7 +1597,6 @@ buildipfire() { lfsmake2 frr lfsmake2 dmidecode lfsmake2 mcelog - lfsmake2 rtpproxy lfsmake2 util-macros lfsmake2 libpciaccess lfsmake2 libyajl diff --git a/src/initscripts/packages/rtpproxy b/src/initscripts/packages/rtpproxy deleted file mode 100755 index 3ea72f5f0..000000000 --- a/src/initscripts/packages/rtpproxy +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/rtpproxy -# -# Description : -# -# Authors : -# -# Version : 00.00 -# -# Notes : -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) - -PORT_MIN=10000 -PORT_MAX=10100 -SOCKET="/var/run/rtpproxy.sock" -LISTEN="${GREEN_ADDRESS}" -CUSTOM_ARGS="" - -PIDFILE="/var/run/rtpproxy.pid" - -if [ -r "/etc/sysconfig/rtpproxy" ]; then - . /etc/sysconfig/rtpproxy -fi - -case "${1}" in - start) - boot_mesg "Starting rtpproxy..." - loadproc /usr/bin/rtpproxy -u nobody -p ${PIDFILE} \ - -m ${PORT_MIN} -M ${PORT_MAX} -s ${SOCKET} \ - -l ${LISTEN} ${CUSTOM_ARGS} - ;; - - stop) - boot_mesg "Stopping rtpproxy..." - killproc /usr/bin/rtpproxy - ;; - - reload) - boot_mesg "Reloading rtpproxy..." - reloadproc /usr/bin/rtpproxy - ;; - - restart) - ${0} stop - sleep 1 - ${0} start - ;; - - status) - statusproc /usr/bin/rtpproxy - ;; - - *) - echo "Usage: ${0} {start|stop|reload|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/rtpproxy diff --git a/src/paks/rtpproxy/install.sh b/src/paks/rtpproxy/install.sh deleted file mode 100644 index 02a521998..000000000 --- a/src/paks/rtpproxy/install.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -start_service ${NAME} -ln -svf ../init.d/rtpproxy /etc/rc.d/rc0.d/K00rtpproxy -ln -svf ../init.d/rtpproxy /etc/rc.d/rc3.d/S99rtpproxy -ln -svf ../init.d/rtpproxy /etc/rc.d/rc6.d/K00rtpproxy diff --git a/src/paks/rtpproxy/uninstall.sh b/src/paks/rtpproxy/uninstall.sh deleted file mode 100644 index e9076d104..000000000 --- a/src/paks/rtpproxy/uninstall.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} -remove_files -rm -rf /etc/rc.d/rc*.d/*rtpproxy diff --git a/src/paks/rtpproxy/update.sh b/src/paks/rtpproxy/update.sh deleted file mode 100644 index 89c40d0d7..000000000 --- a/src/paks/rtpproxy/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh From patchwork Wed Feb 12 09:34:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2785 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZHx6VCVz3xyQ for ; Wed, 12 Feb 2020 09:35:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHr52jnz17V; Wed, 12 Feb 2020 09:35:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHr2bldz2yj5; Wed, 12 Feb 2020 09:35:20 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHk6fGCz2yvp for ; Wed, 12 Feb 2020 09:35:14 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHk0JfxztG; Wed, 12 Feb 2020 09:35:14 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l9M0mGmc6RnIrCdY46Dcb73OweFjleIYMPhiOf+fyjA=; b=BDNMGHRDB4iBrzCe1mIBc4geCsODy/28aiP8+PbchQzkAuYJwyIUPUqzPOgUaSRv2lg4o1 EXITSRuucT00V0AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l9M0mGmc6RnIrCdY46Dcb73OweFjleIYMPhiOf+fyjA=; b=ctMgUDzxArmMwn3E7YFNNMsswXe1/KVtT5xjt2lUEVeQgwY01tUKJHdtxUZuOFlY2nyTiA urQA1lDOpWIxsJpLQgi6jUuwnXe8cNlqbNhw0W7J9qF+VkFFo3H58NTO0n0SImFCpwl+4J k9vpANqIkAd2G+Qn9D+UfJGsh7gXW/22TetLq/zHqdxsHqocwdvDB3e/X+1DamTZDiH6QB rLJbqY1jdQHdi7LZ3nKnHCvdbMUtiVXUqKiVwBgWdHgYuA+yioJY+DRQgHn+D5dh9W7uBy cy2cVZsSmNTVVNH1hiTCYllEHun9S/0YUC4x6j37WLt4Bi7Aw+iJWEonsK1Pcw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 11/14] Drop setserial Date: Wed, 12 Feb 2020 09:34:50 +0000 Message-Id: <20200212093453.5732-12-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This package was used internally and we have no script that uses it any more. Signed-off-by: Michael Tremer --- config/rootfiles/common/setserial | 2 - lfs/setserial | 77 ------------------------------- make.sh | 1 - 3 files changed, 80 deletions(-) delete mode 100644 config/rootfiles/common/setserial delete mode 100644 lfs/setserial diff --git a/config/rootfiles/common/setserial b/config/rootfiles/common/setserial deleted file mode 100644 index 72fc32ea3..000000000 --- a/config/rootfiles/common/setserial +++ /dev/null @@ -1,2 +0,0 @@ -bin/setserial -#usr/man/man8/setserial.8 diff --git a/lfs/setserial b/lfs/setserial deleted file mode 100644 index 739e7f686..000000000 --- a/lfs/setserial +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - -VER = 2.17 - -THISAPP = setserial-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = c4867d72c41564318e0107745eb7a0f2 - -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 --disable-nls - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 247cdb001..e5d2fbb02 100755 --- a/make.sh +++ b/make.sh @@ -1340,7 +1340,6 @@ buildipfire() { lfsmake2 cairo lfsmake2 pango lfsmake2 rrdtool - lfsmake2 setserial lfsmake2 setup lfsmake2 libdnet lfsmake2 rust From patchwork Wed Feb 12 09:34:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2787 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZJ46kmdz3xYL for ; Wed, 12 Feb 2020 09:35:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHs34QZz19h; Wed, 12 Feb 2020 09:35:21 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHs0zRYz2yK5; Wed, 12 Feb 2020 09:35:21 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHk6mvYz2yCW for ; Wed, 12 Feb 2020 09:35:14 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHk1KW8z122; Wed, 12 Feb 2020 09:35:14 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+5DjBPU7Gxwid87FWsOLXMfrtYPlWtcYs8pCT/AWwG0=; b=QHHVUgomiYmI+FPL/whTtbtfTMgqJAU3PLiYPie54Y5BUvaUfbN6SIcFv93it71C4tDyQs EHvdh1G8/dFqEeAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+5DjBPU7Gxwid87FWsOLXMfrtYPlWtcYs8pCT/AWwG0=; b=LY8mYGaNV3GWmpn3NfuYvfTE0pM6LyeQBo6McMmj3KG3joRzjo68wujQM3h10ZEo5fFGvD LGykBCTd8TQsLceRp02CRWVylgJWsWnwVRR/g8bPFPMeKc1YhN6u5BLp0G1Qfv9dWgFxZQ +02cRBGqQMx5zCBYffZCJS+q9dBxKAhdDZaUcLAQBE+WghQstBH0NS1ik4WM4zaSOI9Vnr 0JkmkF2g5LP06aGsEEtsRWOlSUq2UMnKiGbwsgN8MvsTd+e+UqHbhRQzU61R3VhVgg9ZVz SBHuLyolZ5Uj4YnzKnDg9Fl/kKb/l6OdoZEpJDdA5jHZGhG+Mvgiz3MlW8gQ6A== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 12/14] Drop streamripper Date: Wed, 12 Feb 2020 09:34:51 +0000 Message-Id: <20200212093453.5732-13-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/packages/streamripper | 14 ----- lfs/streamripper | 85 -------------------------- make.sh | 1 - 3 files changed, 100 deletions(-) delete mode 100644 config/rootfiles/packages/streamripper delete mode 100644 lfs/streamripper diff --git a/config/rootfiles/packages/streamripper b/config/rootfiles/packages/streamripper deleted file mode 100644 index f3abba584..000000000 --- a/config/rootfiles/packages/streamripper +++ /dev/null @@ -1,14 +0,0 @@ -usr/bin/agrep -usr/bin/streamripper -#usr/include/tre -#usr/include/tre/regex.h -#usr/include/tre/tre-config.h -#usr/lib/libtre.a -#usr/lib/libtre.la -usr/lib/libtre.so -usr/lib/libtre.so.4 -usr/lib/libtre.so.4.2.2 -#usr/lib/pkgconfig/tre.pc -#usr/share/locale/fi/LC_MESSAGES/tre.mo -#usr/share/man/man1/agrep.1 -#usr/share/man/man1/streamripper.1 diff --git a/lfs/streamripper b/lfs/streamripper deleted file mode 100644 index 223152acd..000000000 --- a/lfs/streamripper +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - -VER = 1.63.5 - -THISAPP = streamripper-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = streamripper -PAK_VER = 1 - -DEPS = "libmad libogg libvorbis faad2" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 73a63383dca00615c3328cf51bf2fa56 - -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) - -dist: - @$(PAK) - -############################################################################### -# 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 - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index e5d2fbb02..64210a68b 100755 --- a/make.sh +++ b/make.sh @@ -1488,7 +1488,6 @@ buildipfire() { lfsmake2 iperf3 lfsmake2 7zip lfsmake2 lynis - lfsmake2 streamripper lfsmake2 sshfs lfsmake2 taglib lfsmake2 sslh From patchwork Wed Feb 12 09:34:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2788 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZJB6pctz3xYL for ; Wed, 12 Feb 2020 09:35:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHv2LDfz1B3; Wed, 12 Feb 2020 09:35:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHt6QbSz2ydW; Wed, 12 Feb 2020 09:35:22 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHl2CBqz2yK5 for ; Wed, 12 Feb 2020 09:35:15 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHl0whZzQ1; Wed, 12 Feb 2020 09:35:15 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VYlidqavJQW8McXIiJnF9tLDtpZZRBcWmT5N5Lq3/kk=; b=IVIJbvVYYRX0wGkAy3/J7fBlzd7FBwd8ntkwxNT72pScXgHwDPGQfhbZpPRfgypi6kmCFe gvCbfSmMAOtFUVDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VYlidqavJQW8McXIiJnF9tLDtpZZRBcWmT5N5Lq3/kk=; b=HICOv9wk5rumkDSDpPoP0rNp/gazEbnCwK8nNO/6Ft/r4hbu21aLSFOzPN4bIpF3cPPoe3 mdibjAEn57I4vY5C5vL/gKIVE/GE7bewAUO/g/MX09IeyFx1eYH33wsCDzM3kINuq6wAQ5 pVSgEcmpDC8v1wkQEjigQSsFOe1kfNgQKyIank0e9M5v+Y3X22p/xyywc5txUlynZsMpDV /wbqJjrnL8E54O3j0QXmdqOESo7F7qGVDQWUJZrOd/lNRK1hmuMgglqJzsLFvuz+sektsk 6yQf82qnGz/9wloo3U6zClNXGHzcQirmT2rA4FH5M1iovCLkBBi0PM0LLnxl3A== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 14/14] Drop w_scan Date: Wed, 12 Feb 2020 09:34:53 +0000 Message-Id: <20200212093453.5732-15-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This package is useless without VDR. Signed-off-by: Michael Tremer --- config/rootfiles/packages/w_scan | 3 - config/w_scan/w_scan_start | 148 ------------------------------- lfs/w_scan | 86 ------------------ make.sh | 1 - 4 files changed, 238 deletions(-) delete mode 100644 config/rootfiles/packages/w_scan delete mode 100755 config/w_scan/w_scan_start delete mode 100644 lfs/w_scan diff --git a/config/rootfiles/packages/w_scan b/config/rootfiles/packages/w_scan deleted file mode 100644 index b0744c261..000000000 --- a/config/rootfiles/packages/w_scan +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/w_scan -usr/bin/w_scan_start -#usr/share/man/man1/w_scan.1 diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start deleted file mode 100755 index c424f5f14..000000000 --- a/config/w_scan/w_scan_start +++ /dev/null @@ -1,148 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 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 . # -# # -############################################################################### -############################################################################### -# w_scan_start for IPFire v 1.02 - 2013-04-30 Arne Fitzenreiter - add atsc # -# - 2013-04-20 Arne Fitzenreiter - path vdr 2 # -# - 2012-11-15 Arne Fitzenreiter - inital vers.# -############################################################################### - -err_msg () -{ - whiptail --msgbox "$1" 8 70 --title "Error" - clear - exit 1 -} - -chk_cancel () -{ - if [ ! "${?}" == 0 ];then - clear - echo "Terminated by user!" - exit 0 - fi -} - -yes_no () -{ - whiptail --yesno "$1" 8 70 - chk_cancel -} - -WSCAN=$(which w_scan) - -# Whiptail does not like en_US.UTF-8 -LANG=c - -# Some initial checks... -if [ -z $WSCAN ];then - err_msg "w_scan not found!"; -fi -if [ ! -e /dev/dvb/adapter[0-9]/frontend[0-9] ];then - err_msg "No dvb tuner frontend found!"; -fi - -# Is vdr running? -if [ "$(ps -A | grep " runvdr$")" != "" ] ;then - yes_no "VDR is running. Cannot scan with active VDR. Should I stop it?" - clear - /etc/init.d/vdr stop -fi - -# Select system type -whiptail --checklist "\nSelect system type" 12 40 5 \ - DVB-T "Terrestrial" yes \ - DVB-C "Cable" no \ - DVB-S "Satellite" no \ - ATSC-T "Terrestrial" no \ - ATSC-C "Cable" no \ - 2>/tmp/w_scan_type -chk_cancel -W_SCAN_TYPE=$(cat /tmp/w_scan_type) -rm /tmp/w_scan_type - -if [[ "$W_SCAN_TYPE" == *ATSC* ]] || [[ "$W_SCAN_TYPE" == *DVB-T* ]] || [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then - # Generate and run separate country menubox and default germany - echo '#!/bin/bash' > /tmp/w_scan_countryselect.sh - echo 'whiptail --radiolist "\nSelect country" 19 70 10 \' >> /tmp/w_scan_countryselect.sh - $WSCAN -c? 2>&1 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|"GERMANY" off |"GERMANY" on |g' >> /tmp/w_scan_countryselect.sh - echo ' 2>/tmp/w_scan_country' >> /tmp/w_scan_countryselect.sh - sh /tmp/w_scan_countryselect.sh - chk_cancel - rm /tmp/w_scan_countryselect.sh - W_SCAN_COUNTRY=$(cat /tmp/w_scan_country) - rm /tmp/w_scan_country -fi - -if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then - # Generate and run separate satelite menubox and default astra - echo '#!/bin/bash' > /tmp/w_scan_satselect.sh - echo 'whiptail --checklist "\nSelect satellites" 19 70 10 \' >> /tmp/w_scan_satselect.sh - $WSCAN -s? 2>&1 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|19.2 east.*|19.2 east Astra 1F/1G/1H/1KR/1L" on \\|g' >> /tmp/w_scan_satselect.sh - echo ' 2>/tmp/w_scan_satellite' >> /tmp/w_scan_satselect.sh - sh /tmp/w_scan_satselect.sh - chk_cancel - rm /tmp/w_scan_satselect.sh - W_SCAN_SATELLITE=$(cat /tmp/w_scan_satellite | sed 's|"||g') - rm /tmp/w_scan_satellite -fi - -# Now start the scan ... -clear -rm -rf /tmp/channels.conf -if [[ "$W_SCAN_TYPE" == *DVB-T* ]]; then - echo ":->W-SCAN DVB-T $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f t -c $W_SCAN_COUNTRY -C UTF-8 -o 2 >>/tmp/channels.conf -fi -if [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then - echo ":->W-SCAN DVB-C $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f c -c $W_SCAN_COUNTRY -C UTF-8 -o 2 >>/tmp/channels.conf -fi -if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then - for SATELLITE in $W_SCAN_SATELLITE; - do - echo ":->W-SCAN DVB-S $SATELLITE $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f s -s $SATELLITE -C UTF-8 -o 2 >>/tmp/channels.conf - done -fi -if [[ "$W_SCAN_TYPE" == *ATSC-T* ]]; then - echo ":->W-SCAN ATSC-T $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f a -A 1 -c $W_SCAN_COUNTRY -C UTF-8 -o 2 >>/tmp/channels.conf -fi -if [[ "$W_SCAN_TYPE" == *ATSC-C* ]]; then - echo ":->W-SCAN ATSC-C $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f a -A 2 -c $W_SCAN_COUNTRY -C UTF-8 -o 2 >>/tmp/channels.conf -fi - -# Save result to current dir. -cp /tmp/channels.conf w_scan-$(date +%Y%m%d%H%M).channels.conf -echo Results saved to w_scan-$(date +%Y%m%d%H%M).channels.conf - -# Do this only if vdr is installed ... -if [ -e /opt/pakfire/db/installed/meta-vdr ]; then - yes_no "Install new channels-conf for VDR." - # Backup old channels conf... - cp -f /etc/vdr/channels.conf \ - /etc/vdr/channels.conf.backup$(date +%Y%m%d%H%M) - cp -f /tmp/channels.conf /etc/vdr/ - yes_no "Should i start the VDR?" - clear - /etc/init.d/vdr start -fi diff --git a/lfs/w_scan b/lfs/w_scan deleted file mode 100644 index 369c1554c..000000000 --- a/lfs/w_scan +++ /dev/null @@ -1,86 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 - - -VER = 20130331 - -THISAPP = w_scan-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = w_scan -PAK_VER = 5 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = dfc14a4707321e068a594d6899398df8 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - install -m 755 $(DIR_SRC)/config/w_scan/w_scan_start /usr/bin/ - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 7572c54dd..5e0971a4f 100755 --- a/make.sh +++ b/make.sh @@ -1455,7 +1455,6 @@ buildipfire() { lfsmake2 faad2 lfsmake2 alac lfsmake2 ffmpeg - lfsmake2 w_scan lfsmake2 mpd lfsmake2 libmpdclient lfsmake2 mpc