From 1c07039930d09565b171fc7672a437c547be742b Mon Sep 17 00:00:00 2001 From: sergiobenrocha2 Date: Thu, 10 Jul 2014 23:16:13 -0300 Subject: [PATCH 1/7] Added debian folder from hunterk PPA, updated Standards-Version, debhelper and compat, fixed lintian warnings and errors: added missing build-dependends and depends in debian/control, added simple man pages to cg2glsl and retrolaunch tools and fixed desktop entry. Added quilt patch (retroarch.cfg, friendly path to libretro cores and start directory), so you can change files only to debian system. Package has one lintian error yet: missing-dependency-on-libc. --- Makefile | 9 +++ debian/changelog | 7 ++ debian/compat | 1 + debian/control | 44 ++++++++++++ debian/copyright | 25 +++++++ debian/dirs | 5 ++ debian/patches/rgui-config.patch | 31 +++++++++ debian/patches/series | 1 + debian/retroarch.desktop | 12 ++++ debian/rules | 111 +++++++++++++++++++++++++++++++ debian/source/format | 1 + docs/retroarch-cg2glsl.1 | 33 +++++++++ docs/retrolaunch.1 | 16 +++++ 13 files changed, 296 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/dirs create mode 100644 debian/patches/rgui-config.patch create mode 100644 debian/patches/series create mode 100644 debian/retroarch.desktop create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 docs/retroarch-cg2glsl.1 create mode 100644 docs/retrolaunch.1 diff --git a/Makefile b/Makefile index 95a230794e..238ed12090 100644 --- a/Makefile +++ b/Makefile @@ -489,8 +489,11 @@ install: $(TARGET) install -m755 tools/cg2glsl.py $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR) + install -m644 docs/retroarch-cg2glsl.1 $(DESTDIR)$(MAN_DIR) install -m644 docs/retroarch-joyconfig.1 $(DESTDIR)$(MAN_DIR) + install -m644 docs/retrolaunch.1 $(DESTDIR)$(MAN_DIR) install -m644 media/retroarch.png $(DESTDIR)$(PREFIX)/share/pixmaps + install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps uninstall: rm -f $(DESTDIR)$(PREFIX)/bin/retroarch @@ -499,13 +502,19 @@ uninstall: rm -f $(DESTDIR)$(PREFIX)/bin/retrolaunch rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch.1 + rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-cg2glsl.1 rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-joyconfig.1 + rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retrolaunch.1 rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.png + rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.svg clean: rm -rf $(OBJDIR) rm -f $(TARGET) rm -f tools/retrolaunch/retrolaunch rm -f tools/retroarch-joyconfig + rm -f config.h + rm -f config.log + rm -f config.mk .PHONY: all install uninstall clean diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000000..d525cef045 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,7 @@ +retroarch (1.0.0.2-0ubuntu10) UNRELEASED; urgency=low + + * Update icon (finally) and use SVG instead of PNG. + * Updated to latest git. Includes recent shader changes. + * Includes KMS resolution updates. + + -- Hunter Kaller (hizzlekizzle) Thu, 03 Jul 2014 13:24:59 -0500 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000000..ec635144f6 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000000..da31abf3a6 --- /dev/null +++ b/debian/control @@ -0,0 +1,44 @@ +Source: retroarch +Section: otherosfs +Priority: extra +Maintainer: Hunter Kaller (hizzlekizzle) +Build-Depends: debhelper (>= 9), + libc6-dev (>= 2.13), + libsdl1.2-dev, + libasound2-dev, + libxv-dev, + libopenal-dev, + libsamplerate0-dev, + libxml2-dev, + libsdl-ttf2.0-dev, + libfreetype6-dev, + libsdl-image1.2-dev, + libgbm-dev, + libdrm-dev, + libegl1-mesa-dev, + python3-dev, + nvidia-cg-dev, + zlib1g-dev +Standards-Version: 3.9.5 +Homepage: http://www.libretro.com/ +Vcs-Git: git://github.com/libretro/RetroArch.git +Vcs-Browser: https://github.com/libretro/RetroArch + +Package: retroarch +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libsdl1.2debian, + libopenal1, + libqtgui4, + libsdl-image1.2, + libsdl-ttf2.0-0, + nvidia-cg-toolkit, + python3 +Replaces: ssnes +Description: Simple frontend for the libretro library. + RetroArch attempts to be very small and lean, while still having all of the + useful core features expected form an emulator. It is a command-line-only + interface, though RetroArch-Phoenix provides a minimal GUI. + . + RetroArch supports both Cg shaders and bsnes-style XML shaders. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000000..bbd2e2be95 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,25 @@ +This package was debianized by Hunter Kaller (hizzlekizzle) on +Tue, 14 Apr 2010 11:03:43 -0500. + +It was downloaded from http://themaister./ + +Upstream Author: + + Themaister + Squarepusher + + +Copyright: + + Copyright (C) 2012 Themaister + +License: + + licensed under the terms of the GNU General Public License version 2 + +The Debian packaging is: + + Copyright (C) 2009 Hunter Kaller (hizzlekizzle) + +and is licensed under the GPL version 3, +see `/usr/share/common-licenses/GPL-3'. diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000000..ef0c0d8e59 --- /dev/null +++ b/debian/dirs @@ -0,0 +1,5 @@ +usr/bin +etc/ +usr/share/man/man1 +usr/share/applications +usr/share/pixmaps diff --git a/debian/patches/rgui-config.patch b/debian/patches/rgui-config.patch new file mode 100644 index 0000000000..6923cecbe3 --- /dev/null +++ b/debian/patches/rgui-config.patch @@ -0,0 +1,31 @@ +Index: RetroArch/retroarch.cfg +=================================================================== +--- RetroArch.orig/retroarch.cfg 2014-07-10 01:27:27.793365000 -0300 ++++ RetroArch/retroarch.cfg 2014-07-10 21:20:14.212388475 -0300 +@@ -25,7 +25,7 @@ + # libretro_path = "/path/to/libretro.so" + + # A directory for where to search for libretro core implementations. +-# libretro_directory = ++libretro_directory = "/usr/lib/libretro/" + + # Sets log level for libretro cores (GET_LOG_INTERFACE). + # If a log level issued by a libretro core is below libretro_log_level, it is ignored. +@@ -58,7 +58,7 @@ + # system_directory = + + # Sets start directory for menu content browser. +-# rgui_browser_directory = ++rgui_browser_directory = "~/" + + # Content directory. Interacts with RETRO_ENVIRONMENT_GET_CONTENT_DIRECTORY. + # Usually set by developers who bundle libretro/RetroArch apps to point to assets. +@@ -69,7 +69,7 @@ + # assets_directory = + + # Sets start directory for menu config browser. +-# rgui_config_directory = ++rgui_config_directory = "~/.config/retroarch/" + + # Show startup screen in menu. + # Is automatically set to false when seen for the first time. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000000..215aaa1a2b --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +rgui-config.patch diff --git a/debian/retroarch.desktop b/debian/retroarch.desktop new file mode 100644 index 0000000000..29c921cb93 --- /dev/null +++ b/debian/retroarch.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=RetroArch +Type=Application +GenericName=RetroArch +Comment=RetroArch Multi-Engine Platform +Icon=/usr/share/pixmaps/retroarch.svg +Exec=retroarch +Terminal=false +StartupNotify=false +Categories=Game diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000000..45606e9aab --- /dev/null +++ b/debian/rules @@ -0,0 +1,111 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +QUILT=QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null +PATCH := $(QUILT) push -a || [ "$$($(QUILT) applied)" = "$$(grep -v '^\#' debian/patches/series)" ] +UNPATCH := $(QUILT) pop -a || [ "$$($(QUILT) applied 2>&1)" = "No patches applied" ] + +patch: + $(PATCH) + +unpatch: + $(UNPATCH) + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + # apply patch with quilt + #quilt push + # See ./configure --help for valid flags + # disable flags (i.e. --disable-ffmpeg for example) if there is no package relative to the feature in Build-Depends + ./configure --prefix=/usr --enable-rgui --enable-kms --enable-cg --disable-ffmpeg --enable-freetype --enable-python --enable-udev --enable-libxml2 --enable-zlib + touch configure-stamp + +build: build-arch build-indep + +build-arch: build-stamp + +build-indep: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + touch config.mk + $(MAKE) + #docbook-to-man debian/retroarch.sgml > retroarch + + touch $@ + +clean: + dh_testdir + # remove specific patches for debian: + #quilt pop + + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + touch config.mk + $(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + # Add here commands to install the package into debian/retroarch. + $(MAKE) DESTDIR=$(CURDIR)/debian/retroarch PREFIX=/usr install + cp $(CURDIR)/debian/retroarch.desktop $(CURDIR)/debian/retroarch/usr/share/applications + #cp $(CURDIR)/media/retroarch.svg $(CURDIR)/debian/retroarch/usr/share/pixmaps/ + +# Build architecture-independent files here. +binary-indep: install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_python +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_makeshlibs + dh_installdeb +# dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000000..163aaf8d82 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/docs/retroarch-cg2glsl.1 b/docs/retroarch-cg2glsl.1 new file mode 100644 index 0000000000..328f73fa87 --- /dev/null +++ b/docs/retroarch-cg2glsl.1 @@ -0,0 +1,33 @@ +.\" retroarch-cg2glsl.1 + +.TH "RETROARCH-CG2GLSL" "1" "July 10, 2014" "RETROARCH-CG2GLSL" "System Manager's Manual: retroarch-cg2glsl" + +.SH "NAME" + +retroarch-cg2glsl \- Shader converter. + +.SH "SYNOPSIS" + +\fBretroarch-cg2glsl\fR [Cg file] [GLSL file output] + +.LP + +\fBretroarch-cg2glsl\fR [Cg directory] [GLSL directory output] + +.SH "DESCRIPTION" + +\fBretroarch-cg2glsl\fR converts Cg shaders to GLSL shaders. It can convert single shaders as well as whole folder structures in batch. 100% compatibility is not guaranteed, but almost all shaders should work fine. Cg presets (.cgp) are not converted at the moment, but converting them is as simple as copying over the .cgp, rename it to .glslp and replace references to .cg files to .glsl. + +.LP + +Requires Python 3 and cgc (nvidia-cg-toolkit) 3.1. + +.SH "EXAMPLE COMMANDLINES" + +.TP +\fBConvert a Cg shader to GLSL shader\fR +retroarch-cg2glsl prog.cg(p) prog.glsl(p) + +.TP +\fBConvert a Cg directory to GLSL directory\fR +retroarch-cg2glsl cg-dir out-xml-shader-dir \ No newline at end of file diff --git a/docs/retrolaunch.1 b/docs/retrolaunch.1 new file mode 100644 index 0000000000..cd7a1447a1 --- /dev/null +++ b/docs/retrolaunch.1 @@ -0,0 +1,16 @@ +.\" retrolaunch.1: + +.TH "RETROLAUNCH" "1" "July 10, 2014" "RETROLAUNCH" "System Manager's Manual: retrolaunch" + +.SH "NAME" + +retrolauch \- Deprecated ROM Launcher. + +.SH "SYNOPSIS" + +\fBretrolaunch\fR + +.SH "DESCRIPTION" + +\fBretrolaunch\fR is a deprecated ROM launcher. + From 2b41d6f4aa5bf7e25ad3c7c983238dcea2de2e3b Mon Sep 17 00:00:00 2001 From: sergiobenrocha2 Date: Thu, 10 Jul 2014 23:55:24 -0300 Subject: [PATCH 2/7] Ignore quilt directory (.pc) --- .gitignore | 1 + debian/rules | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 47cca5e750..0f92dce1f4 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ apple/RetroArch_iOS.xcodeproj/project.xcworkspace/* /phoenix/ /python/ /rsound.h +.pc diff --git a/debian/rules b/debian/rules index 45606e9aab..b782070071 100755 --- a/debian/rules +++ b/debian/rules @@ -24,8 +24,6 @@ configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. - # apply patch with quilt - #quilt push # See ./configure --help for valid flags # disable flags (i.e. --disable-ffmpeg for example) if there is no package relative to the feature in Build-Depends ./configure --prefix=/usr --enable-rgui --enable-kms --enable-cg --disable-ffmpeg --enable-freetype --enable-python --enable-udev --enable-libxml2 --enable-zlib @@ -49,9 +47,6 @@ build-stamp: configure-stamp clean: dh_testdir - # remove specific patches for debian: - #quilt pop - dh_testroot rm -f build-stamp configure-stamp @@ -70,7 +65,6 @@ install: build # Add here commands to install the package into debian/retroarch. $(MAKE) DESTDIR=$(CURDIR)/debian/retroarch PREFIX=/usr install cp $(CURDIR)/debian/retroarch.desktop $(CURDIR)/debian/retroarch/usr/share/applications - #cp $(CURDIR)/media/retroarch.svg $(CURDIR)/debian/retroarch/usr/share/pixmaps/ # Build architecture-independent files here. binary-indep: install From f7fb7c6974e5b10910e3d36b3d9aae397001a66b Mon Sep 17 00:00:00 2001 From: sergiobenrocha2 Date: Fri, 11 Jul 2014 13:35:44 -0300 Subject: [PATCH 3/7] Updated debian changelog --- debian/changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index d525cef045..89150dd1c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +retroarch (1.0.0.2-0ubuntu11) UNRELEASED; urgency=low + + * Debian folder from hunterk PPA to upstream + * Updated /debian: + + control: deb-helper to >= 9 and Standards-Version to 3.9.5 + + compat from 7 to 9 + * Fixed lintian warnings and errors: + + Added missing build-dependends and depends in debian/control + + Added simple man pages to cg2glsl and retrolaunch tools + + Fixed desktop entry + * Added quilt patch (friendly path to libretro cores and start directory) + + -- Sérgio Benjamim Fri, 11 Jul 2014 13:33:00 -0300 + retroarch (1.0.0.2-0ubuntu10) UNRELEASED; urgency=low * Update icon (finally) and use SVG instead of PNG. From 5f99a4cae649027196f122acc2b82c1805073096 Mon Sep 17 00:00:00 2001 From: sergiobenrocha2 Date: Fri, 11 Jul 2014 15:10:30 -0300 Subject: [PATCH 4/7] config.h and others are in .gitignore, bad thing to put in Makefile clean --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 238ed12090..f31ff77c7b 100644 --- a/Makefile +++ b/Makefile @@ -513,8 +513,5 @@ clean: rm -f $(TARGET) rm -f tools/retrolaunch/retrolaunch rm -f tools/retroarch-joyconfig - rm -f config.h - rm -f config.log - rm -f config.mk .PHONY: all install uninstall clean From 59343eb1fb01f315d222844fe9bf61eb2d861dc7 Mon Sep 17 00:00:00 2001 From: sergiobenrocha2 Date: Fri, 11 Jul 2014 16:17:45 -0300 Subject: [PATCH 5/7] Fixed copyright and description in control --- debian/control | 8 +++----- debian/copyright | 11 +++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/debian/control b/debian/control index da31abf3a6..579b495af9 100644 --- a/debian/control +++ b/debian/control @@ -37,8 +37,6 @@ Depends: ${shlibs:Depends}, python3 Replaces: ssnes Description: Simple frontend for the libretro library. - RetroArch attempts to be very small and lean, while still having all of the - useful core features expected form an emulator. It is a command-line-only - interface, though RetroArch-Phoenix provides a minimal GUI. - . - RetroArch supports both Cg shaders and bsnes-style XML shaders. + RetroArch is a modular multi-system emulator that attempts to be very small + and lean, while still having all of the useful core features expected from + an emulator. It provides a simple built-in GUI, the RGUI. diff --git a/debian/copyright b/debian/copyright index bbd2e2be95..0109363ad8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,13 +1,12 @@ This package was debianized by Hunter Kaller (hizzlekizzle) on Tue, 14 Apr 2010 11:03:43 -0500. -It was downloaded from http://themaister./ +It was downloaded from -Upstream Author: - - Themaister - Squarepusher +Upstream Authors: + Hans-Kristian Arntzen (Themaister) + Daniel De Matteis (Squarepusher, aka twinaphex) libretro@gmail.com Copyright: @@ -15,7 +14,7 @@ Copyright: License: - licensed under the terms of the GNU General Public License version 2 + Licensed under the terms of the GNU General Public License version 3 The Debian packaging is: From 8a9f9b26239d215b76ab2b2f84c70e05f15a73bc Mon Sep 17 00:00:00 2001 From: sergiobenrocha2 Date: Fri, 11 Jul 2014 17:08:15 -0300 Subject: [PATCH 6/7] Fixed copyright --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 0109363ad8..94dc777b2b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ It was downloaded from Upstream Authors: Hans-Kristian Arntzen (Themaister) - Daniel De Matteis (Squarepusher, aka twinaphex) libretro@gmail.com + Daniel De Matteis (Squarepusher aka twinaphex) Copyright: From cfa64213d7e1252c4ed2e618b9d4ea0aa40d1635 Mon Sep 17 00:00:00 2001 From: sergiobenrocha2 Date: Mon, 14 Jul 2014 18:56:02 -0300 Subject: [PATCH 7/7] Changed description and fixed missing-dependency-on-libc lintian error --- debian/control | 9 ++++++--- debian/rules | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 579b495af9..ba531be0af 100644 --- a/debian/control +++ b/debian/control @@ -37,6 +37,9 @@ Depends: ${shlibs:Depends}, python3 Replaces: ssnes Description: Simple frontend for the libretro library. - RetroArch is a modular multi-system emulator that attempts to be very small - and lean, while still having all of the useful core features expected from - an emulator. It provides a simple built-in GUI, the RGUI. + RetroArch is an open source, multi-platform frontend for the libretro API. + It can be used as a modular multi emulator system, game engine, media player + and 3D technical demonstration. These features are available through + libretro cores. + . + It provides a simple built-in GUI, the RGUI. diff --git a/debian/rules b/debian/rules index b782070071..f4f4f1350f 100755 --- a/debian/rules +++ b/debian/rules @@ -96,7 +96,7 @@ binary-arch: install # dh_perl # dh_makeshlibs dh_installdeb -# dh_shlibdeps + dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb