r7386 - in /vdr/vdr-plugin-bitstreamout/branches/lenny/debian: changelog patches/03_hppa-workaround.dpatch

Mon Aug 11 08:24:14 UTC 2008

Author: tiber-guest
Date: Mon Aug 11 08:24:13 2008
New Revision: 7386

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7386
Log:
Once again modified 03_hppa-workaround.dpatch - hppa-make
seems to have a problem with the way 'call' and 'shell'
are used. (Closes: #489491)

Modified:
    vdr/vdr-plugin-bitstreamout/branches/lenny/debian/changelog
    vdr/vdr-plugin-bitstreamout/branches/lenny/debian/patches/03_hppa-workaround.dpatch

Modified: vdr/vdr-plugin-bitstreamout/branches/lenny/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/branches/lenny/debian/changelog?rev=7386&op=diff
==============================================================================

--- vdr/vdr-plugin-bitstreamout/branches/lenny/debian/changelog (original)
+++ vdr/vdr-plugin-bitstreamout/branches/lenny/debian/changelog Mon Aug 11 08:24:13 2008
@@ -1,3 +1,11 @@
+vdr-plugin-bitstreamout (0.89b-6) unstable; urgency=medium
+
+  * Once again modified 03_hppa-workaround.dpatch - hppa-make
+    seems to have a problem with the way 'call' and 'shell'
+    are used. (Closes: #489491)
+
+ -- Tobias Grimm <tg at e-tobi.net>  Mon, 11 Aug 2008 10:18:36 +0200
+
 vdr-plugin-bitstreamout (0.89b-5) unstable; urgency=medium
 
   * Revisited 03_hppa-workaround.dpatch - this should now really fix

Modified: vdr/vdr-plugin-bitstreamout/branches/lenny/debian/patches/03_hppa-workaround.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/branches/lenny/debian/patches/03_hppa-workaround.dpatch?rev=7386&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/branches/lenny/debian/patches/03_hppa-workaround.dpatch (original)
+++ vdr/vdr-plugin-bitstreamout/branches/lenny/debian/patches/03_hppa-workaround.dpatch Mon Aug 11 08:24:13 2008
@@ -9,16 +9,41 @@
 
 @DPATCH@
 diff -urNad vdr-plugin-bitstreamout-0.89b~/Makefile vdr-plugin-bitstreamout-0.89b/Makefile
---- vdr-plugin-bitstreamout-0.89b~/Makefile	2008-08-09 14:25:13.000000000 +0200
-+++ vdr-plugin-bitstreamout-0.89b/Makefile	2008-08-09 14:26:10.000000000 +0200
-@@ -45,8 +45,8 @@
+--- vdr-plugin-bitstreamout-0.89b~/Makefile	2008-08-11 10:12:07.000000000 +0200
++++ vdr-plugin-bitstreamout-0.89b/Makefile	2008-08-11 10:14:01.000000000 +0200
+@@ -45,9 +45,6 @@
  
  ### Includes and Defines (add further entries here):
  
 -cc-include = $(shell $(CC) $(INCLUDES) -include $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1 && echo "-D$(2)")
 -cc-library = $(shell echo 'int main () { return 0; }' |$(CC) -l$(1:lib%=%) -o /dev/null -xc - > /dev/null 2>&1 && echo yes)
-+cc-include = $(shell echo "-D$(2)")
-+cc-library = $(shell echo yes)
- 
+-
  INCLUDES += $(EXTRA_INCLUDES)
  ifneq ($(wildcard $(VDRDIR)),)
+   INCLUDES += -I$(VDRDIR)
+@@ -65,20 +62,12 @@
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ DEFINES += -D_GNU_SOURCE
+ DEFINES += -DVERSION=\"$(VERSION)\"
+-DEFINES += $(call cc-include,alsa/asoundlib.h,HAS_ASOUNDLIB_H)
+-DEFINES += $(call cc-include,sys/cdefs.h,HAS_CDEFS_H)
+-DEFINES += $(call cc-include,mad.h,HAS_MAD_H)
++DEFINES += -DHAS_ASOUNDLIB_H
++DEFINES += -DHAS_CDEFS_H
++DEFINES += -DHAS_MAD_H
+ 
+-ifeq ($(call cc-library,libasound),yes)
+-  LIBS += -lasound -lrt
+-else
+-  $(error No libasound in linkage path please install alsa and alsa-devel packages)
+-endif
+-ifeq ($(call cc-library,libmad),yes)
+-  LIBS += -lmad
+-else
+-  $(error No libmad in linkage path please install mad and mad-devel packages)
+-endif
++LIBS += -lasound -lrt
++LIBS += -lmad
+ 
+ ### The object files (add further files here):
+ 


