diff --git a/debian/changelog b/debian/changelog index 504f22a42a..c391378096 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +retroarch (1.0.0.3-0ubuntu1) UNRELEASED; urgency=low + + * New version release (Beta) + + -- Sérgio Benjamim Mon, 27 Oct 2014 13:17:00 -0300 + retroarch (1.0.0.2-0ubuntu12) UNRELEASED; urgency=low * Improve debian packaging diff --git a/debian/control b/debian/control index 69d739fd71..96726869c7 100644 --- a/debian/control +++ b/debian/control @@ -3,30 +3,31 @@ Section: otherosfs Priority: extra Maintainer: Hunter Kaller (hizzlekizzle) 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, - libfreetype6-dev, - libgbm-dev, - libdrm-dev, - libegl1-mesa-dev, - python3-dev, - nvidia-cg-dev, - zlib1g-dev + pkg-config, + libc6-dev (>= 2.13), + libpulse-dev, + libsdl2-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, + libfreetype6-dev, + libgbm-dev, + libdrm-dev, + libegl1-mesa-dev, + libopenvg1-mesa-dev, + python3-dev, + zlib1g-dev, + nvidia-cg-dev [!armhf] Standards-Version: 3.9.5 Homepage: http://www.libretro.com/ Vcs-Git: git://github.com/libretro/RetroArch.git @@ -34,13 +35,13 @@ Vcs-Browser: https://github.com/libretro/RetroArch Package: retroarch Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libopenal1, - nvidia-cg-toolkit, - python3 +Depends: ${shlibs:Depends}, + ${misc:Depends}, + fonts-dejavu-core, + python3, + nvidia-cg-toolkit [!armhf] Replaces: ssnes -Suggests: retroarch-joypad-autoconfig, libretro-common-shaders +Suggests: retroarch-joypad-autoconfig, libretro-common-shaders, retroarch-assets, libretro-database 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 diff --git a/debian/dirs b/debian/dirs index d6b61c0ff0..befc412fc9 100644 --- a/debian/dirs +++ b/debian/dirs @@ -8,6 +8,7 @@ usr/share/man/man1 usr/share/applications usr/share/libretro/assets usr/share/libretro/autoconfig +usr/share/libretro/cheats usr/share/libretro/info usr/share/libretro/shaders usr/share/libretro/overlays diff --git a/debian/rules b/debian/rules index addf456b84..d6490aa7b4 100755 --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,8 @@ %: dh $@ --parallel +ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) + 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" ] @@ -36,31 +38,40 @@ unpatch: 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 +ifeq ($(ARCH), $(filter $(ARCH), amd64 i386)) + ./configure --prefix=/usr --disable-ffmpeg --enable-sse +else ifeq ($(ARCH),armhf) + ./configure --prefix=/usr --disable-ffmpeg --disable-vg --disable-cg --enable-gles --enable-neon --enable-floathard +endif override_dh_auto_build: $(MAKE) # SoftFilters - $(MAKE) -C gfx/filters/ + $(MAKE) -C gfx/video_filters/ # Audio DSP plugins - $(MAKE) -C audio/filters/ + $(MAKE) -C audio/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)/AUTHORS $(CURDIR)/debian/retroarch/usr/share/doc/retroarch/ cp $(CURDIR)/debian/retroarch.desktop $(CURDIR)/debian/retroarch/usr/share/applications/ + cp $(CURDIR)/debian/retroarch.cfg $(CURDIR)/debian/retroarch/etc/ +ifeq ($(ARCH),armhf) + rm -f $(CURDIR)/debian/retroarch/usr/bin/retroarch-cg2glsl +endif + # SoftFilters - cd $(CURDIR)/gfx/filters/ && \ + cd $(CURDIR)/gfx/video_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/ && \ + cd $(CURDIR)/audio/audio_filters/ && \ cp *.so $(CURDIR)/debian/retroarch/usr/lib/retroarch/filters/audio/ && \ cp *.dsp $(CURDIR)/debian/retroarch/usr/lib/retroarch/filters/audio/ override_dh_auto_clean: touch config.mk $(MAKE) clean - $(MAKE) -C gfx/filters/ clean - $(MAKE) -C audio/filters/ clean + $(MAKE) -C gfx/video_filters/ clean + $(MAKE) -C audio/audio_filters/ clean diff --git a/gfx/fonts/freetype.c b/gfx/fonts/freetype.c index f757af25b2..7696b1292f 100644 --- a/gfx/fonts/freetype.c +++ b/gfx/fonts/freetype.c @@ -197,6 +197,8 @@ static const char *font_paths[] = { "/usr/share/fonts/TTF/DejaVuSans.ttf", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", + "/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf", + "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", #endif "osd-font.ttf", /* Magic font to search for, useful for distribution. */ };