From 70f29072bf88bf28a36ab63093b8e2dcc45aa620 Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Sat, 17 Jul 2021 14:21:26 +0200 Subject: [PATCH] debian: Remove debian specific packaging hooks. We switched to appimage in an earlier commit. It makes more sense for us to maintain a distribution agnostic packaging method than something which is already forked by upstream anyways. --- .github/workflows/macos-workflow.yml | 2 - .github/workflows/windows-workflow.yml | 2 - debian-packager/README.Debian | 49 --------- debian-packager/changelog | 6 -- debian-packager/compat | 1 - debian-packager/control | 60 ----------- debian-packager/copyright | 116 -------------------- debian-packager/create_built_tarball.sh | 135 ------------------------ debian-packager/docs | 2 - debian-packager/install | 7 -- debian-packager/lintian-overrides | 6 -- debian-packager/manpages | 1 - debian-packager/menu | 6 -- debian-packager/patches/series | 0 debian-packager/postinst | 6 -- debian-packager/rules | 32 ------ debian-packager/source/format | 1 - debian-packager/source/options | 2 - debian-packager/watch | 5 - 19 files changed, 439 deletions(-) delete mode 100644 debian-packager/README.Debian delete mode 100644 debian-packager/changelog delete mode 100644 debian-packager/compat delete mode 100644 debian-packager/control delete mode 100644 debian-packager/copyright delete mode 100644 debian-packager/create_built_tarball.sh delete mode 100644 debian-packager/docs delete mode 100644 debian-packager/install delete mode 100644 debian-packager/lintian-overrides delete mode 100644 debian-packager/manpages delete mode 100644 debian-packager/menu delete mode 100644 debian-packager/patches/series delete mode 100755 debian-packager/postinst delete mode 100644 debian-packager/rules delete mode 100644 debian-packager/source/format delete mode 100644 debian-packager/source/options delete mode 100644 debian-packager/watch diff --git a/.github/workflows/macos-workflow.yml b/.github/workflows/macos-workflow.yml index b3f405ce51..3874c6189a 100644 --- a/.github/workflows/macos-workflow.yml +++ b/.github/workflows/macos-workflow.yml @@ -25,7 +25,6 @@ on: - 'bin/PCSX2_keys.ini.default' - 'build.sh' - 'buildbot.xml' - - 'debian-packager/**' - 'pcsx2/CDVD/Windows/**' - 'pcsx2/DEV9/Win32/**' - 'pcsx2/PAD/Windows/**' @@ -54,7 +53,6 @@ on: - 'bin/PCSX2_keys.ini.default' - 'build.sh' - 'buildbot.xml' - - 'debian-packager/**' - 'pcsx2/CDVD/Windows/**' - 'pcsx2/DEV9/Win32/**' - 'pcsx2/PAD/Windows/**' diff --git a/.github/workflows/windows-workflow.yml b/.github/workflows/windows-workflow.yml index 5562b573bb..d95ed8039f 100644 --- a/.github/workflows/windows-workflow.yml +++ b/.github/workflows/windows-workflow.yml @@ -20,7 +20,6 @@ on: - 'bin/PCSX2_keys.ini.default' - 'build.sh' - 'buildbot.xml' - - 'debian-packager/**' - 'linux_various/**' - 'mscompile.cmd' - 'pcsx2/CDVD/Linux/**' @@ -46,7 +45,6 @@ on: - 'bin/PCSX2_keys.ini.default' - 'build.sh' - 'buildbot.xml' - - 'debian-packager/**' - 'linux_various/**' - 'mscompile.cmd' - 'pcsx2/CDVD/Linux/**' diff --git a/debian-packager/README.Debian b/debian-packager/README.Debian deleted file mode 100644 index 3122d013ef..0000000000 --- a/debian-packager/README.Debian +++ /dev/null @@ -1,49 +0,0 @@ ------------------------------- -Package information for PCSX2 ------------------------------- - - * The reasons given by upstream as to why they remove -fPIC are the following: - - Code only supports the i386 architecture. - - Code uses the ebx register and this is not compliant with -fPIC. - - The use of -fPIC negatively impacts the performance of the program. - - The .so file are not shared libraries but plug-ins. No program should try - to link with them. - ------------------------------------------- -Information about the plug-ins for video ------------------------------------------- - - * GSdx plug-in currently require a video card that supports - at least OpenGL 3.3. A noninclusive list of cards that support OpenGL 3.0 is: - - Radeon HD series (except HD2300) - - GeForce 8, 9, 100-series, 200-series, 300-series, 400-series and 500-series - - Intel Sandy Bridge HD Graphics 2000 and up - - * Currently the proprietary drivers for AMD and Nvidia have support for - OpenGL 3.0 and above. GSdx plug-in use the following - extensions/commands that may or may not be completely implemented in the - open source video stack: - - OpenGL 3.x (supported on Mesa 10.x) - - OpenGL 4.0 - + GL_ARB_GPU_shader5 (improve FXAA, optional) - - OpenGL 4.1 - + GL_ARB_separate_shader_objects - - OpenGL 4.2 - + GL_ARB_map_buffer_alignment - + GL_ARB_shader_image_load_store - + GL_ARB_shading_language_420pack - + GL_ARB_texture_storage - - OpenGL 4.3 - + GL_ARB_explicit_uniform_location - + GL_ARB_framebuffer_no_attachments - + GL_ARB_copy_image (optional) - - OpenGL 4.4 - + GL_ARB_buffer_storage - - OpenGL 4.5 - + GL_ARB_clip_control - + GL_ARB_direct_state_access - + GL_ARB_texture_barrier - - The current status for the open source drivers can be found at: - - http://cgit.freedesktop.org/mesa/mesa/tree/docs/GL3.txt - diff --git a/debian-packager/changelog b/debian-packager/changelog deleted file mode 100644 index 2d791a8b06..0000000000 --- a/debian-packager/changelog +++ /dev/null @@ -1,6 +0,0 @@ -pcsx2.snapshot (3351-1) unstable; urgency=low - - * Initial release - - -- Gregory Hainaut Thu, 13 May 2010 14:27:56 +0200 - diff --git a/debian-packager/compat b/debian-packager/compat deleted file mode 100644 index 45a4fb75db..0000000000 --- a/debian-packager/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian-packager/control b/debian-packager/control deleted file mode 100644 index 8ce62cccaa..0000000000 --- a/debian-packager/control +++ /dev/null @@ -1,60 +0,0 @@ -Source: pcsx2.snapshot -Section: games -Priority: optional -Maintainer: Gregory Hainaut -Build-Depends: cmake (>= 2.8.5), - debhelper (>= 8.9), - dpkg-dev (>= 1.15.7), - libaio-dev, - libasound2-dev, - libgl1-mesa-dev, - libglu1-mesa-dev, - libgtk2.0-dev, - liblzma-dev, - libpcap0.8-dev, - libpng12-dev | libpng-dev, - libpulse-dev, - libsdl2-dev, - libsoundtouch-dev, - libwxbase3.0-dev, - libwxgtk3.0-dev, - libxml2-dev, - libx11-dev, - libx11-xcb-dev, - locales | locales-all, - portaudio19-dev, - zlib1g-dev -Standards-Version: 3.9.3 -Homepage: http://pcsx2.net/ - -Package: pcsx2-unstable -Architecture: i386 -# -i686 allow to use SSE into libc6 -Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-i686 -# libasound => alsa plugin for pulseaudio -# libusb => ps3 controller (and probably others) -Recommends: libasound2-plugins, - libusb-0.1-4 -Conflicts: pcsx2 -Description: PlayStation 2 emulator - PCSX2 is a PlayStation 2 emulator for Windows and Linux. - . - WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support - this instruction set, it does not have enough horse power to run this emulator - anyway. - -Package: pcsx2-unstable-dbg -Section: debug -Priority: extra -Architecture: i386 -Depends: ${misc:Depends}, pcsx2-unstable (= ${binary:Version}) -Conflicts: pcsx2-dbg -Description: Debug symbols for PCSX2 - PCSX2 is a PlayStation 2 emulator for Windows and Linux. - . - WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support - this instruction set, it does not have enough horse power to run this emulator - anyway. - . - This package contains the debug symbols for PCSX2. - diff --git a/debian-packager/copyright b/debian-packager/copyright deleted file mode 100644 index b537809e67..0000000000 --- a/debian-packager/copyright +++ /dev/null @@ -1,116 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: PCSX2 -Source: https://github.com/PCSX2/pcsx2 - -Files: debian/* -Copyright: - 2010-2012 Gregory Hainaut - 2010-2012 Miguel Colon -License: LGPL-3 - -Files: pcsx2/* common/* -Copyright: 2002-2012 PCSX2 Dev Team -License: LGPL-3+ - -Files: pcsx2/Mdec.cpp pcsx2/Mdec.h pcsx2/RDebug/deci2_drfp.cpp pcsx2/IPU/mpeg2lib/* pcsx2/cheatscpp.h common/include/api/* -Copyright: 2002-2012 PCSX2 Dev Team -License: GPL-2+ - -Files: common/src/Utilities/vssprintf.cpp -Copyright: 2002 Michael Ringgaard -License: BSD-3-Clause - -License: LGPL-3 or LGPL-3+ - This program 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 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 Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public License along - with this program. If not, see . -Comment: On Debian systems, the complete text of the GNU Lesser General Public - License version 3 can be found in "/usr/share/common-licenses/LGPL-3". - -License: GPL-2+ - 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., 51 Franklin - Street, Fifth Floor, Boston, MA 02110-1301, USA. -Comment: On Debian systems, the complete text of the GNU General Public License - version 2 can be found in "/usr/share/common-licenses/GPL-2". - -License: LGPL-2.1+ - This program 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.1 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 Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public License along - with this program; if not, write to the Free Software Foundation, Inc., 51 - Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -Comment: On Debian systems, the complete text of the GNU Lesser General Public - License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". - -License: SGI FREE SOFTWARE LICENSE B 2.0 - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - . - The above copyright notice including the dates of first publication and either - this permission notice or a reference to http://oss.sgi.com/projects/FreeB/ - shall be included in all copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON - GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - . - Except as contained in this notice, the name of Silicon Graphics, Inc. shall - not be used in advertising or otherwise to promote the sale, use or other - dealings in this Software without prior written authorization from Silicon - Graphics, Inc. - -License: BSD-3-Clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - . - 1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - 3. Neither the name of the project nor the names of its contributors may be - used to endorse or promote products derived from this software without specific - prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/debian-packager/create_built_tarball.sh b/debian-packager/create_built_tarball.sh deleted file mode 100644 index 89feae0c6a..0000000000 --- a/debian-packager/create_built_tarball.sh +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/sh -# copyright (c) 2011-2014 Gregory Hainaut -# This program 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 3 of the License, or -# (at your option) any later version. -# -# This package 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 program. If not, see . - - - -###################################################################### -# Global Parameters -###################################################################### -help() -{ - cat < : revision number - -branch : branch name, take trunk otherwise -EOF - - exit 0 -} - -# Default value -GIT_SHA1=0; -BRANCH="master" -while [ -n "$1" ]; do -case $1 in - -help|-h ) help;shift 1;; - -rev|-r ) GIT_SHA1=$2; shift 2;; - -branch|-b ) BRANCH=$2; shift 2;; - --) shift;break;; - -*) echo "ERROR: $1 option does not exists. Use -h for help";exit 1;; - *) break;; -esac -done - -# Directory -TMP_DIR=/tmp/pcsx2_git -mkdir -p $TMP_DIR - -REMOTE_REPO="https://github.com/PCSX2/pcsx2.git" -LOCAL_REPO="$TMP_DIR/pcsx2" - - -###################################################################### -# Basic functions -###################################################################### -date= -version= -release= -get_pcsx2_version() -{ - local major=`grep -o "VersionHi.*" $LOCAL_REPO/pcsx2/SysForwardDefs.h | grep -o "[0-9]*"` - local mid=`grep -o "VersionMid.*" $LOCAL_REPO/pcsx2/SysForwardDefs.h | grep -o "[0-9]*"` - local minor=`grep -o "VersionLo.*" $LOCAL_REPO/pcsx2/SysForwardDefs.h | grep -o "[0-9]*"` - release=`grep -o "isReleaseVersion.*" $LOCAL_REPO/pcsx2/SysForwardDefs.h | grep -o "[0-9]*"` - version="$major.$mid.$minor" -} - -get_git_version() -{ - date=`git -C $LOCAL_REPO show -s --format=%ci HEAD | sed -e 's/[\:\-]//g' -e 's/ /./' -e 's/ .*//'` -} - -download_orig() -{ - (cd $TMP_DIR && git clone --branch $1 $REMOTE_REPO pcsx2) - if [ "$SVN_CO_VERSION" = "1" ] ; then - (cd $TMP_DIR/pcsx2 && git checkout $GIT_SHA1) - fi -} - -remove_3rdparty() -{ - echo "Remove 3rdparty code" - rm -fr $LOCAL_REPO/3rdparty - rm -fr $LOCAL_REPO/tools -} - -remove_remaining_non_free_file() -{ - echo "Remove remaining non free file. TODO UPSTREAM" - rm -fr $LOCAL_REPO/plugins/GSdx/baseclasses - rm -f $LOCAL_REPO/common/src/Utilities/x86/MemcpyFast.cpp -} -remove_dot_git() -{ - # To save 66% of the package size - rm -fr $LOCAL_REPO/.git -} - -###################################################################### -# Main script -###################################################################### -download_orig $BRANCH -remove_3rdparty -remove_remaining_non_free_file - -get_git_version -get_pcsx2_version - -# must be done after getting the git version -remove_dot_git - -# Debian name of package and tarball -if [ $release -eq 1 ] -then - PKG_NAME="pcsx2-${version}" - TAR_NAME="pcsx2_${version}.orig.tar" -else - PKG_NAME="pcsx2.snapshot-${version}~git${date}" - TAR_NAME="pcsx2.snapshot_${version}~git${date}.orig.tar" -fi - - -NEW_DIR=${TMP_DIR}/$PKG_NAME -rm -fr $NEW_DIR -mv $LOCAL_REPO $NEW_DIR - -echo "Build the tar.gz file" -tar -C $TMP_DIR -cJf ${TAR_NAME}.xz $PKG_NAME - -## Clean -rm -fr $TMP_DIR - -exit 0 diff --git a/debian-packager/docs b/debian-packager/docs deleted file mode 100644 index 4a4fadbf80..0000000000 --- a/debian-packager/docs +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/share/doc/PCSX2 -bin/docs/*.pdf diff --git a/debian-packager/install b/debian-packager/install deleted file mode 100644 index 9fa836ebb5..0000000000 --- a/debian-packager/install +++ /dev/null @@ -1,7 +0,0 @@ -usr/bin/PCSX2 /usr/games/ -usr/bin/PCSX2-linux.sh /usr/games/ -usr/lib/games/PCSX2 -usr/share/applications/PCSX2.desktop -usr/share/pixmaps/PCSX2.xpm -usr/share/locale usr/share/ -usr/share/games/PCSX2 diff --git a/debian-packager/lintian-overrides b/debian-packager/lintian-overrides deleted file mode 100644 index 3fed012674..0000000000 --- a/debian-packager/lintian-overrides +++ /dev/null @@ -1,6 +0,0 @@ -#* -fPIC option was removed for multiple reason. -# - Code only support x86 architecture. -# - Upstream code uses the ebx register so it's not compliant with PIC. -# - Impacts the performance too much. -# - Only plugins. No package will link to them. -: shlib-with-non-pic-code diff --git a/debian-packager/manpages b/debian-packager/manpages deleted file mode 100644 index 14b08a833f..0000000000 --- a/debian-packager/manpages +++ /dev/null @@ -1 +0,0 @@ -bin/docs/PCSX2.1 diff --git a/debian-packager/menu b/debian-packager/menu deleted file mode 100644 index 6754dcdedc..0000000000 --- a/debian-packager/menu +++ /dev/null @@ -1,6 +0,0 @@ -?package(pcsx2-unstable): \ - needs="X11" \ - section="Applications/Emulators" \ - title="PCSX2" \ - longtitle="A PlayStation 2 emulator" \ - command="/usr/games/PCSX2-linux.sh" diff --git a/debian-packager/patches/series b/debian-packager/patches/series deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/debian-packager/postinst b/debian-packager/postinst deleted file mode 100755 index ede836e862..0000000000 --- a/debian-packager/postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -e -echo 'Enabling networking capability on Linux...' -set -x -[ -f /usr/games/PCSX2 ] && setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' /usr/games/PCSX2 -set +x diff --git a/debian-packager/rules b/debian-packager/rules deleted file mode 100644 index 5d89bf9a96..0000000000 --- a/debian-packager/rules +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -# export DH_VERBOSE=1 - -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CMAKE_BUILD_TYPE=Debug -else - CMAKE_BUILD_TYPE=Release -endif - -override_dh_auto_configure: - dh_auto_configure -- \ - -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \ - -DCMAKE_BUILD_STRIP=FALSE \ - -DXDG_STD=TRUE \ - -DDISABLE_ADVANCE_SIMD=TRUE \ - -DPACKAGE_MODE=TRUE - -override_dh_strip: - dh_strip --package=pcsx2-unstable --dbg-package=pcsx2-unstable-dbg - -override_dh_makeshlibs: - -override_dh_builddeb: - dh_builddeb -- -Zxz - -clean: - dh_auto_clean - dh_clean -%: - dh $@ diff --git a/debian-packager/source/format b/debian-packager/source/format deleted file mode 100644 index 163aaf8d82..0000000000 --- a/debian-packager/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian-packager/source/options b/debian-packager/source/options deleted file mode 100644 index d87bffc31a..0000000000 --- a/debian-packager/source/options +++ /dev/null @@ -1,2 +0,0 @@ -# Don't store changes on locales files -extend-diff-ignore = "(^|/)(pcsx2_(Devel|Iconized|Main|Tertiary)\.po|Makefile)$" diff --git a/debian-packager/watch b/debian-packager/watch deleted file mode 100644 index bdeab624f5..0000000000 --- a/debian-packager/watch +++ /dev/null @@ -1,5 +0,0 @@ -version=3 - -# Note: Upstream does not release prepackaged source files. -# It's adviced to get them from their subversion repository. -# Source: https://github.com/PCSX2/pcsx2