This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus.
commit 73b33770cd211d45c6011169f091ddb193f7780c Author: Sven Eckelmann <[email protected]> Date: Wed Jun 3 16:42:03 2009 +0200 Add 108-remove-gln64.patch, don't try to build glN64 removed from dfsg tar --- debian/changelog | 1 + debian/patches/108-remove-gln64.patch | 89 +++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 91 insertions(+) diff --git a/debian/changelog b/debian/changelog index d68f4a2..ffc4e3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,7 @@ mupen64plus (1.5-3) UNRELEASED; urgency=low - Add 105-system-libpng.patch, use libpng from debian instead of buildin - Add 106-system-zlib.patch, use zlib from debian instead of buildin - Add 107-system-libbz2.patch, use libbz2 from debian instead of buildin + - Add 108-remove-gln64.patch, don't try to build glN64 removed from dfsg tar * Convert debian/copyright to new dep5 version -- Félix Arreola Rodríguez <[email protected]> Mon, 01 Jun 2009 14:42:41 +0200 diff --git a/debian/patches/108-remove-gln64.patch b/debian/patches/108-remove-gln64.patch new file mode 100644 index 0000000..455154c --- /dev/null +++ b/debian/patches/108-remove-gln64.patch @@ -0,0 +1,89 @@ +From 2c67cfabe955f3e02c36f374396adcfdbcf7fe1a Mon Sep 17 00:00:00 2001 +From: Sven Eckelmann <[email protected]> +Date: Wed, 3 Jun 2009 16:29:19 +0200 +Subject: [PATCH] Remove non-dfsg clean glN64 from build + + +Signed-off-by: Sven Eckelmann <[email protected]> +--- + Makefile | 8 +------- + tools/regtests/daily-tests.cfg | 1 - + tools/regtests/regression-video.py | 4 ++-- + 3 files changed, 3 insertions(+), 10 deletions(-) + +diff --git a/Makefile b/Makefile +index 5f7abac..4926931 100644 +--- a/Makefile ++++ b/Makefile +@@ -226,7 +226,6 @@ OBJ_QT4_GUI = main/gui_qt4/libgui_qt4.a + PLUGINS = plugins/blight_input.$(SO_EXTENSION) \ + plugins/dummyaudio.$(SO_EXTENSION) \ + plugins/dummyvideo.$(SO_EXTENSION) \ +- plugins/glN64.$(SO_EXTENSION) \ + plugins/ricevideo.$(SO_EXTENSION) \ + plugins/glide64.$(SO_EXTENSION) \ + plugins/jttl_audio.$(SO_EXTENSION) \ +@@ -322,14 +321,13 @@ ifneq ($(OS), WINDOWS) + $(MAKE) -C blight_input clean + $(MAKE) -C dummy_audio clean + $(MAKE) -C dummy_video clean +- $(MAKE) -C glN64 clean + $(MAKE) -C rice_video clean + $(MAKE) -C glide64 clean + $(MAKE) -C jttl_audio clean + $(MAKE) -C rsp_hle clean + $(MAKE) -C mupen64_input clean + $(RM_F) plugins/mupen64_input.$(SO_EXTENSION) blight_input/arial.ttf.c blight_input/ttftoh plugins/blight_input.$(SO_EXTENSION) plugins/mupen64_hle_rsp_azimer.$(SO_EXTENSION) +- $(RM_F) plugins/dummyaudio.$(SO_EXTENSION) plugins/dummyvideo.$(SO_EXTENSION) plugins/jttl_audio.$(SO_EXTENSION) plugins/glN64.$(SO_EXTENSION) plugins/ricevideo.$(SO_EXTENSION) plugins/glide64.$(SO_EXTENSION) ++ $(RM_F) plugins/dummyaudio.$(SO_EXTENSION) plugins/dummyvideo.$(SO_EXTENSION) plugins/jttl_audio.$(SO_EXTENSION) plugins/ricevideo.$(SO_EXTENSION) plugins/glide64.$(SO_EXTENSION) + endif + + clean-core: +@@ -407,10 +405,6 @@ else + copy dummy_video\dummyvideo.dll plugins + endif + +-plugins/glN64.$(SO_EXTENSION): FORCE +- $(MAKE) -C glN64 all +- @$(CP) ./glN64/glN64.$(SO_EXTENSION) ./plugins/glN64.$(SO_EXTENSION) +- + plugins/ricevideo.$(SO_EXTENSION): FORCE + $(MAKE) -C rice_video all + @$(CP) ./rice_video/ricevideo.$(SO_EXTENSION) ./plugins/ricevideo.$(SO_EXTENSION) +diff --git a/tools/regtests/daily-tests.cfg b/tools/regtests/daily-tests.cfg +index fdee13b..001f961 100644 +--- a/tools/regtests/daily-tests.cfg ++++ b/tools/regtests/daily-tests.cfg +@@ -79,7 +79,6 @@ screenshots = 27, 527 + + [Gauntlet Legends.v64] + screenshots = 31, 503, 792, 929, 1038, 1228, 1284, 1412, 1589 +-skipvideo = glN64 + + [Iggy's Reckin' Balls.z64] + screenshots = 142, 493, 531, 726, 824 +diff --git a/tools/regtests/regression-video.py b/tools/regtests/regression-video.py +index 5b2fad0..34e9d6f 100755 +--- a/tools/regtests/regression-video.py ++++ b/tools/regtests/regression-video.py +@@ -137,7 +137,7 @@ def BuildSource(srcdir, buildname, buildmake, istest): + return False + # check for program files + binfiles = [ "mupen64plus" ] +- libfiles = [ "blight_input.so", "dummyaudio.so", "dummyvideo.so", "glN64.so", "glide64.so", "ricevideo.so", ++ libfiles = [ "blight_input.so", "dummyaudio.so", "dummyvideo.so", "glide64.so", "ricevideo.so", + "mupen64_hle_rsp_azimer.so", "jttl_audio.so" ] + filelist = [ os.path.join(srcdir, filename) for filename in binfiles ] + filelist += [ os.path.join(srcdir, "plugins", filename) for filename in libfiles ] +@@ -164,7 +164,7 @@ class RegTester: + self.libdir = os.path.join(bindir, "plugins") + self.generalParams = { } + self.gamesAndParams = { } +- self.videoplugins = [ "glN64.so", "glide64.so", "ricevideo.so" ] ++ self.videoplugins = [ "glide64.so", "ricevideo.so" ] + self.thisdate = str(date.today()) + + def LoadConfig(self, filename): +-- +1.6.3.1 + diff --git a/debian/patches/series b/debian/patches/series index 3cf0640..da0f6ed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 105-system-libpng.patch 106-system-zlib.patch 107-system-libbz2.patch +108-remove-gln64.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
