Update Makefile.patch for the git version

(Portage version: 2.2.0_alpha101/svn/Linux x86_64, signed Manifest commit with key B427ABC8)

svn path=/vdr-devel/; revision=988

4 files changed, 120 insertions, 10 deletions

diff --git a/media-plugins/vdr-softhddevice/ChangeLog b/media-plugins/vdr-softhddevice/ChangeLog
index 4ca2890..265cefe 100644
--- a/media-plugins/vdr-softhddevice/ChangeLog
+++ b/media-plugins/vdr-softhddevice/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Apr 2012; Christian Ruppert <idl0r@gentoo.org>
+  vdr-softhddevice-9999.ebuild, +files/vdr-softhddevice-9999-Makefile.patch:
+  Update Makefile.patch for the git version
+
 *vdr-softhddevice-0.5.0 (25 Apr 2012)
 
   25 Apr 2012; Christian Ruppert <idl0r@gentoo.org>
diff --git a/media-plugins/vdr-softhddevice/Manifest b/media-plugins/vdr-softhddevice/Manifest
index 96a23d4..6c2eb42 100644
--- a/media-plugins/vdr-softhddevice/Manifest
+++ b/media-plugins/vdr-softhddevice/Manifest
@@ -2,21 +2,22 @@
 Hash: SHA256
 
 AUX Makefile.patch 3709 RMD160 3b120f0200e6af5970051a5650d60e17f824d43e SHA1 ad0525031d8e8116d81171d3e0faad49d2becf6d SHA256 1b7ba29101d9d55887d5a51b05ee6c9bd73debf673571b8bee61f4756320fae6
+AUX vdr-softhddevice-9999-Makefile.patch 3572 RMD160 37342c4b75eca490c1baa11267c9a5d3192a46be SHA1 2dfe1160c416e31f2dad71b8b7e8bd6b1e9cfb33 SHA256 305c81bcfea7c3b64225bdd3a8a57a9f0125379b6988526d807ccc5edd248de1
 DIST vdr-softhddevice-0.4.9.tgz 134914 RMD160 5212e62a5a8c35d944ee38c1274933cfbd92abe2 SHA1 28af8d7bb1ca4490626c3a559ac827fdfd82e033 SHA256 48d7319821543c66746509d33bcc36b5a5da4b0d16d57d1ba4ce93ea5fc0a840
 DIST vdr-softhddevice-0.5.0.tgz 142044 RMD160 cbe87d7ce06b82ccaeafd34fdd242a7b380177da SHA1 a110631cd3e98aa3bcb76f8e21070dc17d9d9c2e SHA256 e2fac582ac22a628f360f90657579367c88f2c4af78df9b6ce0739928cdb3f97
 EBUILD vdr-softhddevice-0.4.9.ebuild 1688 RMD160 5ba2e01517abb3bd615f430c84efdc8701f43657 SHA1 9a3c4118d9ef2a2b02cf3446c2847b6e31ad8644 SHA256 249f1fc58b84deae299bd9a073b22d6c9c6883b4997eb38441d2ac3501e386d9
 EBUILD vdr-softhddevice-0.5.0.ebuild 1737 RMD160 c595c4615499c4cd1f4525a280d4878099635752 SHA1 bcc1fd434267aea743e2840900a4001ae0afa713 SHA256 0bc4fc9d1e5d6853d6529690df12c0027dc050d1d61aa19c69cdc78f386bbe52
-EBUILD vdr-softhddevice-9999.ebuild 1737 RMD160 f404406b6832ec6a13ec71d44e9eae87d1462968 SHA1 91d03f7cf67a22e3a09b7a2be618d6ebce3bbc31 SHA256 9f2d3f3768258237b4098971094bed32a2c7284ceb0481383afc274cd701e762
-MISC ChangeLog 538 RMD160 fbdb2ea2c0f1ae3c10b8079d13f087e27c348223 SHA1 5b2846c1e5d3171899a1079305722e19ff56ab64 SHA256 2241d16c82228bbfda1372aa2fdd11eab65fcd1333ea632c66fd0d5641a8790a
+EBUILD vdr-softhddevice-9999.ebuild 1742 RMD160 8759a6d1de6dbc4803cffb4915ed486ca9ccf94f SHA1 425f7e64256e5c37e1cd22f7a74f61ca0a1fd354 SHA256 ef3190c4dbd75b1dc2f7b8c9c1071b4a1a578cfa41b674f9fff72194faa7770b
+MISC ChangeLog 712 RMD160 ec0867845aecd9cba86188d17450f1359600666a SHA1 36626a317c637c5f4db27b4e173817084cb466ee SHA256 4da071f82efe28bb1b2f5505cf9b79c5418c231ece64811d6682d0e163c13de2
 MISC metadata.xml 546 RMD160 7499447e2348556a08ed3e8784149b733ffcfaf3 SHA1 0233b0b3d18bc8070577403363f586093a5f6a6b SHA256 541a82561cbbd2bc3dfce47a824159917595f7645ed836ab03d3da8bee7a8271
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPl4s+AAoJEMOx0zmdw4Z1AdoH/3MqnG/NuVKKrLQTkjguyt/+
-1/eaprQ2gGJugcZru2TjpWGLIBsVQD3fV7qYWRMSB3QkOqui4pb9B2nkgdmsFdeI
-zkXhZI2TWZ7i33yo2UbyKj3PnIxgBI/O1nk5Dg7q7RxfNs0jrthMwYVOVC4s4EP6
-9/ormkkBHnHoLX0Z6MGgyH/IDbS3egZm0+qhtqtjT2rWRMkk3PPkvJqblMgb06Ql
-M5oVF0HWWMpIUpkAA+g/Zts9Ck2JaMlAg0rABQxf+JopFuN49m4HKu51KwwarDoA
-sewjG3ClCA1Vy1Rg7ZFYoxI9WwkikUGf3bTDEr1psaL3nlWshQlQJGa+UGLqQHQ=
-=hze3
+iQEcBAEBCAAGBQJPl42oAAoJEMOx0zmdw4Z1io0IALPoeNZ/68B9O4sUd4IAGti1
+2BA2E3cG7rzdyzL6KfYM/T7ibmpx4bpLvfpc85NLcsCBWihho3ErTczlZpOvVD+x
+nmAn6QAJb7/YwqSNPwfZ3jHDCXeq4u90AAuwcfrOT8nk7wHN1VDLIqPiuiic+pcj
+nzeC9/0RH3SAi2csrkE/BBzgwmsPxZVeuQWtFSmFzEljfODPXSlh7CL9zyOLz/IO
+qZlCJzRQNeFj4ksKH4afDUZ3jE3IdodxGVfuJqA5sVtWLaXWdAOTRceYd820hbCu
+icaLeeRPtI/9SJB0KuM8NQPjMdOrJO3M2FP4mNv+1qKRbgVt3lI3rQw2MJyIAyg=
+=w2wn
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softhddevice/files/vdr-softhddevice-9999-Makefile.patch b/media-plugins/vdr-softhddevice/files/vdr-softhddevice-9999-Makefile.patch
new file mode 100644
index 0000000..987a721
--- /dev/null
+++ b/media-plugins/vdr-softhddevice/files/vdr-softhddevice-9999-Makefile.patch
@@ -0,0 +1,105 @@
+diff --git a/Makefile b/Makefile
+index c95157f..9d84d0b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,15 +18,19 @@ GIT_REV = $(shell git describe --always 2>/dev/null)
+ 
+ ### Configuration (edit this for your needs)
+ 
++ALSA ?= $(shell pkg-config --exists alsa && echo 1)
++VDPAU ?= $(shell pkg-config --exists vdpau && echo 1)
++VAAPI ?= $(shell pkg-config --exists libva && echo 1)
++JPEG ?= 1
++OSS ?= 1
++YAEPG ?= 1
++GLX ?=  $(shell pkg-config --exists gl glu && echo 1)
++
+ CONFIG := #-DDEBUG
+ CONFIG += -DAV_INFO -DAV_INFO_TIME=3000	# debug a/v sync
+-#CONFIG += -DHAVE_PTHREAD_NAME		# supports new pthread_setname_np
++CONFIG += -DHAVE_PTHREAD_NAME		# supports new pthread_setname_np
+ #CONFIG += -DNO_TS_AUDIO		# disable ts audio parser
+ #CONFIG += -DUSE_TS_VIDEO		# build new ts video parser
+-CONFIG += $(shell pkg-config --exists vdpau && echo "-DUSE_VDPAU")
+-CONFIG += $(shell pkg-config --exists libva && echo "-DUSE_VAAPI")
+-CONFIG += $(shell pkg-config --exists alsa && echo "-DUSE_ALSA")
+-CONFIG += -DUSE_OSS
+ 
+ ### The C++ compiler and options:
+ 
+@@ -67,33 +71,53 @@ INCLUDES += -I$(VDRDIR)/include
+ DEFINES += $(CONFIG) -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' \
+ 	$(if $(GIT_REV), -DGIT_REV='"$(GIT_REV)"')
+ 
+-_CFLAGS = $(DEFINES) $(INCLUDES) \
+-	$(shell pkg-config --cflags libavcodec) \
+-	`pkg-config --cflags x11 x11-xcb xcb xcb-xv xcb-shm xcb-dpms xcb-atom\
+-		xcb-screensaver xcb-randr xcb-glx xcb-icccm xcb-keysyms`\
+-	`pkg-config --cflags gl glu` \
+-	$(if $(findstring USE_VDPAU,$(CONFIG)), \
+-		    `pkg-config --cflags vdpau`) \
+-	$(if $(findstring USE_VAAPI,$(CONFIG)), \
+-		    `pkg-config --cflags libva-x11 libva-glx libva`) \
+-	$(if $(findstring USE_ALSA,$(CONFIG)), \
+-		    `pkg-config --cflags alsa`)
++_CFLAGS += $(DEFINES) $(INCLUDES) \
++	$(shell pkg-config --cflags libavcodec x11 x11-xcb xcb xcb-atom xcb-icccm)
++
++ifeq ($(ALSA),1)
++CONFIG += -DUSE_ALSA
++_CFLAGS += $(shell pkg-config --cflags alsa)
++LIBS += $(shell pkg-config --libs alsa)
++endif
++ifeq ($(VDPAU),1)
++CONFIG += -DUSE_VDPAU
++_CFLAGS += $(shell pkg-config --cflags vdpau)
++LIBS += $(shell pkg-config --libs vdpau)
++endif
++ifeq ($(VAAPI),1)
++CONFIG += -DUSE_VAAPI
++_CFLAGS += $(shell pkg-config --cflags libva-x11 libva)
++LIBS += $(shell pkg-config --libs libva-x11 libva)
++endif
++ifeq ($(OSS),1)
++CONFIG += -DUSE_OSS
++endif
++ifeq ($(JPEG),1)
++CONFIG += -DUSE_JPEG
++endif
++ifeq ($(YAEPG),1)
++CONFIG += -DUSE_YAEPG
++endif
++ifeq ($(GLX),1)
++CONFIG += -DUSE_GLX
++_CFLAGS += $(shell pkg-config --cflags gl glu)
++LIBS += $(shell pkg-config --libs gl glu)
++ifeq ($(VAAPI),1)
++_CFLAGS += $(shell pkg-config --cflags libva-glx)
++LIBS += $(shell pkg-config --libs libva-glx)
++endif
++endif
++ifeq ($(SCREENSAVER),1)
++CONFIG += -DUSE_SCREENSAVER
++_CFLAGS += $(shell pkg-config --cflags xcb-screensaver xcb-dpms)
++LIBS += $(shell pkg-config --libs xcb-screensaver xcb-dpms)
++endif
+ 
+ #override _CFLAGS  += -Werror
+ override CXXFLAGS += $(_CFLAGS)
+ override CFLAGS	  += $(_CFLAGS)
+ 
+-LIBS += -lrt \
+-	$(shell pkg-config --libs libavcodec) \
+-	`pkg-config --libs x11 x11-xcb xcb xcb-xv xcb-shm xcb-dpms xcb-atom\
+-		xcb-screensaver xcb-randr xcb-glx xcb-icccm xcb-keysyms`\
+-	`pkg-config --libs gl glu` \
+-	$(if $(findstring USE_VDPAU,$(CONFIG)), \
+-		    `pkg-config --libs vdpau`) \
+-	$(if $(findstring USE_VAAPI,$(CONFIG)), \
+-		    `pkg-config --libs libva-x11 libva-glx libva`) \
+-	$(if $(findstring USE_ALSA,$(CONFIG)), \
+-		    `pkg-config --libs alsa`)
++LIBS += -lrt $(shell pkg-config --libs libavcodec x11 x11-xcb xcb xcb-icccm)
+ 
+ ### The object files (add further files here):
+ 
diff --git a/media-plugins/vdr-softhddevice/vdr-softhddevice-9999.ebuild b/media-plugins/vdr-softhddevice/vdr-softhddevice-9999.ebuild
index 992b924..bae7583 100644
--- a/media-plugins/vdr-softhddevice/vdr-softhddevice-9999.ebuild
+++ b/media-plugins/vdr-softhddevice/vdr-softhddevice-9999.ebuild
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	vdr-plugin_src_prepare
 
-	epatch "${FILESDIR}/Makefile.patch"
+	epatch "${FILESDIR}/${P}-Makefile.patch"
 }
 
 src_compile() {