[mupen64plus-audio-sdl] 117/163: Remove upstream merged disable_oss.patch

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-audio-sdl.

commit 1b68dbc0055da22af706af3c69060d45d0dcf58d
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Dec 2 22:24:30 2012 +0100

    Remove upstream merged disable_oss.patch
---
 debian/changelog                 |  2 ++
 debian/patches/disable_oss.patch | 20 --------------------
 debian/patches/series            |  1 -
 debian/rules                     |  2 +-
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13edca8..9f7c2a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mupen64plus-audio-sdl (1.99.5+10+c75faf4d38c4-1) UNRELEASED; urgency=low
 
   * New Upstream Snapshot from c75faf4d38c4e010a149649c191e4ec2face50f8
   * Remove obsolete DM-Upload-Allowed in debian/control
+  * debian/patches:
+    - Remove upstream merged disable_oss.patch
 
  -- Sven Eckelmann <sven at narfation.org>  Sun, 02 Dec 2012 21:08:07 +0100
 
diff --git a/debian/patches/disable_oss.patch b/debian/patches/disable_oss.patch
deleted file mode 100644
index 2903991..0000000
--- a/debian/patches/disable_oss.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Disable OSS support and use SDL instead
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 05645ca5f9ef48f085fabd720f41d408b2bc0180..77b2b9a45755181e3baec0ca8650a6486687d008 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -190,11 +190,6 @@ else
-   $(warning No libsamplerate development libraries found.  Mupen64plus-sdl-audio will be built without src-* resampler.)
- endif
- 
--# test for the presence of OSS
--ifneq ($(wildcard /dev/mixer),)
--  CFLAGS += -DHAS_OSS_SUPPORT
--endif
--
- # set mupen64plus core API header path
- ifneq ("$(APIDIR)","")
-   CFLAGS += "-I$(APIDIR)"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index adc6372..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-disable_oss.patch
diff --git a/debian/rules b/debian/rules
index 0d87052..f46c40d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ LIBDIR="/usr/lib/$(DEB_HOST_MULTIARCH)" PIC=1 OPTFLAGS="" LTO=1
+MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ LIBDIR="/usr/lib/$(DEB_HOST_MULTIARCH)" PIC=1 OPTFLAGS="" LTO=1 NO_OSS=1
 
 DBG_PACKAGE=$(shell dpkg-parsechangelog|grep '^Source: '|sed 's/^Source:\s*//')-dbg
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-audio-sdl.git