mirror of
https://github.com/libretro/RetroArch
synced 2025-04-15 14:42:27 +00:00
Merge pull request #887 from sergiobenrocha2/master
Fix overlay examples in retroarch.cfg and debian packaging update
This commit is contained in:
commit
3c7caea557
9
debian/changelog
vendored
9
debian/changelog
vendored
@ -1,3 +1,12 @@
|
||||
retroarch (1.0.0.2-0ubuntu12) UNRELEASED; urgency=low
|
||||
|
||||
* Improve debian packaging
|
||||
* Added DSP and video filters to the package
|
||||
* Added some paths in retroarch.cfg
|
||||
+ No more quilt patch
|
||||
|
||||
-- Sérgio Benjamim <sergio_br2@yahoo.com.br> Sun, 17 Aug 2014 23:50:00 -0300
|
||||
|
||||
retroarch (1.0.0.2-0ubuntu11) UNRELEASED; urgency=low
|
||||
|
||||
* Debian folder from hunterk PPA to upstream
|
||||
|
16
debian/control
vendored
16
debian/control
vendored
@ -3,7 +3,20 @@ Section: otherosfs
|
||||
Priority: extra
|
||||
Maintainer: Hunter Kaller (hizzlekizzle) <hunter_kaller@yahoo.com>
|
||||
Build-Depends: debhelper (>= 9),
|
||||
pkg-config,
|
||||
libc6-dev (>= 2.13),
|
||||
libpulse-dev,
|
||||
libsdl1.2-dev,
|
||||
libxml2-dev,
|
||||
libavcodec-dev,
|
||||
libavformat-dev,
|
||||
libavutil-dev,
|
||||
libswscale-dev,
|
||||
libv4l-dev,
|
||||
x11proto-xext-dev,
|
||||
libxxf86vm-dev,
|
||||
libxinerama-dev,
|
||||
libudev-dev,
|
||||
libasound2-dev,
|
||||
libxv-dev,
|
||||
libopenal-dev,
|
||||
@ -27,7 +40,8 @@ Depends: ${shlibs:Depends},
|
||||
nvidia-cg-toolkit,
|
||||
python3
|
||||
Replaces: ssnes
|
||||
Description: Simple frontend for the libretro library.
|
||||
Suggests: retroarch-joypad-autoconfig, libretro-common-shaders
|
||||
Description: Simple frontend for the libretro library
|
||||
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
|
||||
|
63
debian/copyright
vendored
63
debian/copyright
vendored
@ -1,24 +1,71 @@
|
||||
This package was debianized by Hunter Kaller (hizzlekizzle) <hunter_kaller@yahoo.com> on
|
||||
Tue, 14 Apr 2010 11:03:43 -0500.
|
||||
Mon, 23 Apr 2012 13:24:59 -0500.
|
||||
|
||||
It was downloaded from <https://github.com/libretro/RetroArch>
|
||||
|
||||
Upstream Authors:
|
||||
|
||||
Hans-Kristian Arntzen (Themaister) <maister@archlinux.us>
|
||||
Daniel De Matteis (Squarepusher aka twinaphex) <libretro@gmail.com>
|
||||
The RetroArch Team
|
||||
Hans-Kristian Arntzen (Themaister) (main code) <maister@archlinux.us>
|
||||
Daniel De Matteis (Squarepusher aka twinaphex) (maintainer) <libretro@gmail.com>
|
||||
others, see `/usr/share/doc/retroarch/AUTHORS'
|
||||
|
||||
Copyright:
|
||||
Files: *
|
||||
Copyright: 2010-2014 The RetroArch Team
|
||||
License: GPLv3
|
||||
|
||||
Copyright (C) 2010-2014 The RetroArch Team
|
||||
Files: libretro.h
|
||||
Copyright: 2010-2014 The RetroArch Team
|
||||
License: The MIT License (MIT)
|
||||
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 and this permission notice 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 THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS 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.
|
||||
|
||||
Files: performance/performance_android.c
|
||||
performance/performance_android.h
|
||||
Copyright: 2010 The Android Open Source Project
|
||||
License:
|
||||
|
||||
Licensed under the terms of the GNU General Public License version 3
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
* 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.
|
||||
.
|
||||
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.
|
||||
|
||||
The Debian packaging is:
|
||||
|
||||
Copyright (C) 2009 Hunter Kaller (hizzlekizzle) <hunter_kaller@yahoo.com>
|
||||
Copyright (C) 2012-2014 Hunter Kaller (hizzlekizzle) <hunter_kaller@yahoo.com>
|
||||
Copyright (C) 2014 Sergio Benjamim (sergio-br2) <sergio_br2@yahoo.com.br>
|
||||
|
||||
and is licensed under the GPL version 3,
|
||||
see `/usr/share/common-licenses/GPL-3'.
|
||||
|
11
debian/dirs
vendored
11
debian/dirs
vendored
@ -1,5 +1,14 @@
|
||||
usr/bin
|
||||
etc/
|
||||
etc
|
||||
usr/lib/libretro
|
||||
usr/lib/retroarch/filters/video
|
||||
usr/lib/retroarch/filters/audio
|
||||
usr/share/doc/retroarch
|
||||
usr/share/man/man1
|
||||
usr/share/applications
|
||||
usr/share/libretro/assets
|
||||
usr/share/libretro/autoconfig
|
||||
usr/share/libretro/info
|
||||
usr/share/libretro/shaders
|
||||
usr/share/libretro/overlays
|
||||
usr/share/pixmaps
|
||||
|
31
debian/patches/rgui-config.patch
vendored
31
debian/patches/rgui-config.patch
vendored
@ -1,31 +0,0 @@
|
||||
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.
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -1 +0,0 @@
|
||||
rgui-config.patch
|
121
debian/rules
vendored
121
debian/rules
vendored
@ -1,14 +1,27 @@
|
||||
#!/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.
|
||||
|
||||
# Copyright (C) 2010 Hunter Kaller
|
||||
# Copyright (C) 2014 Sergio Benjamim
|
||||
|
||||
# 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, 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.
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
%:
|
||||
dh $@ --parallel
|
||||
|
||||
QUILT=QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
|
||||
PATCH := $(QUILT) push -a || [ "$$($(QUILT) applied)" = "$$(grep -v '^\#' debian/patches/series)" ]
|
||||
@ -20,86 +33,34 @@ patch:
|
||||
unpatch:
|
||||
$(UNPATCH)
|
||||
|
||||
configure: configure-stamp
|
||||
configure-stamp:
|
||||
dh_testdir
|
||||
# Add here commands to configure the package.
|
||||
override_dh_auto_configure:
|
||||
# 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
|
||||
override_dh_auto_build:
|
||||
$(MAKE)
|
||||
#docbook-to-man debian/retroarch.sgml > retroarch
|
||||
|
||||
touch $@
|
||||
|
||||
clean:
|
||||
dh_testdir
|
||||
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
|
||||
# SoftFilters
|
||||
$(MAKE) -C gfx/filters/
|
||||
# Audio DSP plugins
|
||||
$(MAKE) -C audio/filters/
|
||||
|
||||
override_dh_auto_install:
|
||||
# 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)/AUTHORS $(CURDIR)/debian/retroarch/usr/share/doc/retroarch/
|
||||
cp $(CURDIR)/debian/retroarch.desktop $(CURDIR)/debian/retroarch/usr/share/applications/
|
||||
# SoftFilters
|
||||
cd $(CURDIR)/gfx/filters/ && \
|
||||
cp *.so $(CURDIR)/debian/retroarch/usr/lib/retroarch/filters/video/ && \
|
||||
cp *.filt $(CURDIR)/debian/retroarch/usr/lib/retroarch/filters/video/
|
||||
# Audio DSP plugins
|
||||
cd $(CURDIR)/audio/filters/ && \
|
||||
cp *.so $(CURDIR)/debian/retroarch/usr/lib/retroarch/filters/audio/ && \
|
||||
cp *.dsp $(CURDIR)/debian/retroarch/usr/lib/retroarch/filters/audio/
|
||||
|
||||
# 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
|
||||
override_dh_auto_clean:
|
||||
touch config.mk
|
||||
$(MAKE) clean
|
||||
$(MAKE) -C gfx/filters/ clean
|
||||
$(MAKE) -C audio/filters/ clean
|
||||
|
@ -257,9 +257,12 @@
|
||||
|
||||
#### Overlay
|
||||
|
||||
# Path to input overlay
|
||||
# Defines a directory where overlays are kept for easy access.
|
||||
# overlay_directory =
|
||||
|
||||
# Path to input overlay
|
||||
# input_overlay =
|
||||
|
||||
# Overlay opacity
|
||||
# input_overlay_opacity = 1.0
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user