[mame] 03/10: Temporarily build against bundled libraries

[Cesare Falco]

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

cesarefalco-guest pushed a commit to branch master
in repository mame.

commit 178eea44fe14e9e4be3a0bb9c81e163615d74db2
Author: Cesare Falco <c.falco at ubuntu.com>
Date:   Thu May 28 05:55:57 2015 +0200

    Temporarily build against bundled libraries
---
 debian/control |  8 +-------
 debian/rules   | 14 --------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/debian/control b/debian/control
index c87a3e1..b9e8c7c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,19 +6,13 @@ Uploaders: Cesare Falco <c.falco at ubuntu.com>,
  Emmanuel Kasper <emmanuel at libera.cc>,
  Jordi Mallach <jordi at debian.org>
 Build-Depends: debhelper (>= 9),
- libexpat1-dev,
- libflac-dev,
  libfontconfig1-dev,
- libjpeg-dev,
- libportmidi-dev [!hurd-any !kfreebsd-any],
  libqt4-dev (>= 4.7),
  libsdl2-ttf-dev,
  libsdl2-dev,
- libsqlite3-dev,
  libxinerama-dev,
  subversion,
- python-dev,
- zlib1g-dev
+ python-dev
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-games/mame.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/mame.git
diff --git a/debian/rules b/debian/rules
index ea0bc1c..9683bd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,12 +33,6 @@ DEB_OPTS = \
     FORCE_DRC_C_BACKEND=1 \
     NOWERROR=1 \
     MACOSX_USE_LIBSDL= \
-    BUILD_EXPAT= \
-    BUILD_ZLIB= \
-    BUILD_JPEGLIB= \
-    BUILD_SQLITE3= \
-    BUILD_MIDILIB= \
-    BUILD_FLAC= \
     SDL_LIBVER=sdl2 \
     SYMBOLS= \
     SYMLEVEL= \
@@ -118,7 +112,6 @@ endif
 ifeq ($(DEB_HOST_ARCH),kfreebsd-amd64)
 DEB_OPTS += \
     TARGETOS=freebsd \
-    BUILD_MIDILIB=1 \
     FORCE_DRC_C_BACKEND= \
     PTR64=1 \
     NOASM=
@@ -127,18 +120,11 @@ endif
 ifeq ($(DEB_HOST_ARCH),kfreebsd-i386)
 DEB_OPTS += \
     TARGETOS=freebsd \
-    BUILD_MIDILIB=1 \
     FORCE_DRC_C_BACKEND= \
     PTR64= \
     NOASM=
 endif
 
-# kFreeBSD architecture
-ifeq ($(DEB_HOST_ARCH),hurd-i386)
-DEB_OPTS += \
-    BUILD_MIDILIB=1
-endif
-
 DEB_MAME_OPTS = \
     OPT_FLAGS="-D'INI_PATH=\"/etc/mame\"'" \
     FULLNAME=mame \

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