[mupen64plus-rsp-z64] 67/140: Build mupen64plus-video-z64-hlevideo

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus-rsp-z64.

commit d910fd7d223d0e8ecfbabb526d337c5829be79f6
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Sep 2 12:33:19 2011 +0200

    Build mupen64plus-video-z64-hlevideo
---
 debian/changelog                |  1 +
 debian/control                  |  6 +++++
 debian/patches/hle_compat.patch | 56 +++++++++++++++++++++++++++++++++++++++--
 debian/rules                    | 12 ++++++---
 4 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4a67f7..0676129 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mupen64plus-rsp-z64 (1.99.4-4) UNRELEASED; urgency=low
     - Add dma_transfer.patch, Fix DMA transfer parameter decoding
     - Add hle_compat.patch, Added a macro for using HLE RSP video/audio
       emulation
+  * Build hle video version of mupen64plus-video-z64 in debian/rules
 
  -- Sven Eckelmann <sven at narfation.org>  Sun, 21 Aug 2011 17:55:03 +0200
 
diff --git a/debian/control b/debian/control
index fba8642..431a816 100644
--- a/debian/control
+++ b/debian/control
@@ -23,11 +23,17 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
  mupen64plus-rsp-abi-1,
+Provides:
+ mupen64plus-rsp,
 Description: low-level rsp emulation for mupen64plus
  N64 Reality Signal Processor instruction level emulation for graphics plugins
  supporting preprocessed vertex information. It can emulate even unknown or
  uncommon microcodes, but cannot benefit from faster implementation for the
  host cpu.
+ .
+ This package also provides mupen64plus-video-z64-hlevideo which can be used
+ together with high level video emulation plugins like arachnoid, rice or
+ glide64.
 
 Package: mupen64plus-rsp-z64-dbg
 Section: debug
diff --git a/debian/patches/hle_compat.patch b/debian/patches/hle_compat.patch
index 67706a2..b815ca9 100644
--- a/debian/patches/hle_compat.patch
+++ b/debian/patches/hle_compat.patch
@@ -2,15 +2,67 @@ Description: Added a macro for using HLE RSP video/audio emulation
 Author: casualjames <casual.james at yahoo.es>
 
 ---
+diff --git a/projects/unix/Makefile b/projects/unix/Makefile
+index 5c38773f52bd22392760c8d2468a8375add26dd4..0b13c22d9d03730fb4c5283893162b0f9184c5a4 100644
+--- a/projects/unix/Makefile
++++ b/projects/unix/Makefile
+@@ -110,6 +110,12 @@ ifeq ($(PIC), 1)
+   LDFLAGS += -fPIC
+ endif
+ 
++HLE=
++ifeq ($(HLEVIDEO), 1)
++  CFLAGS += -DVIDEO_HLE_ALLOWED
++  HLE = -hlevideo
++endif
++
+ # tweak flags for 32-bit build on 64-bit system
+ ifeq ($(ARCH_DETECTED), 64BITS_32)
+   ifeq ($(OS), FREEBSD)
+@@ -203,7 +209,7 @@ ifeq ($(PLUGINDIR),)
+ endif
+ 
+ SRCDIR = ../../src
+-OBJDIR = _obj
++OBJDIR = _obj$(HLE)
+ 
+ # list of source files to compile
+ SOURCE = \
+@@ -220,7 +226,7 @@ OBJDIRS = $(dir $(OBJECTS))
+ $(shell $(MKDIR) $(OBJDIRS))
+ 
+ # build targets
+-TARGET = mupen64plus-rsp-z64.$(SO_EXTENSION)
++TARGET = mupen64plus-rsp-z64$(HLE).$(SO_EXTENSION)
+ 
+ targets:
+ 	@echo "Mupen64Plus-rsp-z64 makefile. "
+@@ -235,6 +241,7 @@ targets:
+ 	@echo "    APIDIR=path   == path to find Mupen64Plus Core headers"
+ 	@echo "    OPTFLAGS=flag == compiler optimization (default: -O3)"
+ 	@echo "    PIC=(1|0)     == Force enable/disable of position independent code"
++	@echo "    HLEVIDEO=(1|0) == Move task of gfx emulation to a HLE video plugins"
+ 	@echo "  Install Options:"
+ 	@echo "    PREFIX=path   == install/uninstall prefix (default: /usr/local)"
+ 	@echo "    LIBDIR=path   == library prefix (default: PREFIX/lib)"
+@@ -254,7 +261,7 @@ uninstall:
+ 	$(RM) "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
+ 
+ clean:
+-	$(RM) -r ./_obj $(TARGET)
++	$(RM) -r ./_obj$(HLE) $(TARGET)
+ 
+ rebuild: clean all
+ 
 diff --git a/src/main_rsp.cpp b/src/main_rsp.cpp
-index 4c5b8ad649c541f9497c8d7c17de9b962efc42cf..3b46d7a073f544fd6cba203add8f9a738980471f 100644
+index 4c5b8ad649c541f9497c8d7c17de9b962efc42cf..82bd64cc678a4281448414311885114726d3b704 100644
 --- a/src/main_rsp.cpp
 +++ b/src/main_rsp.cpp
 @@ -132,10 +132,14 @@ extern "C" {
  
      EXPORT unsigned int CALL DoRspCycles(unsigned int Cycles)
      {
-+        #define VIDEO_HLE_ALLOWED
++        //#define VIDEO_HLE_ALLOWED
          //#define AUDIO_HLE_ALLOWED
 -#ifdef AUDIO_HLE_ALLOWED
 -        DWORD TaskType = *(DWORD*)(z64_rspinfo.DMEM + 0xFC0);
diff --git a/debian/rules b/debian/rules
index cd966bf..e8956e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,13 +29,19 @@ get-orig-source:
 	uscan --verbose --force-download
 
 override_dh_auto_build:
-	dh_auto_build -- all $(MAKEOPTIONS)
+	dh_auto_build -- all $(MAKEOPTIONS) HLEVIDEO=0
+	dh_auto_build -- all $(MAKEOPTIONS) HLEVIDEO=1
 
 override_dh_auto_install:
-	dh_auto_install -- $(MAKEOPTIONS)
+	dh_auto_install -- $(MAKEOPTIONS) HLEVIDEO=0
+	dh_auto_install -- $(MAKEOPTIONS) HLEVIDEO=1
+
+override_dh_auto_clean:
+	dh_auto_clean -- $(MAKEOPTIONS) HLEVIDEO=0
+	dh_auto_clean -- $(MAKEOPTIONS) HLEVIDEO=1
 
 override_dh_strip:
 	dh_strip -a --dbg-package="$(DBG_PACKAGE)"
 
 .PHONY: binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep \
-	get-orig-source override_dh_auto_build override_dh_auto_install override_dh_strip
+	get-orig-source override_dh_auto_build override_dh_auto_install override_dh_strip override_dh_auto_clean

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