diff options
author | Christian Ruppert <idl0r@gentoo.org> | 2010-12-15 17:09:04 +0000 |
---|---|---|
committer | Christian Ruppert <idl0r@gentoo.org> | 2010-12-15 17:09:04 +0000 |
commit | 5eb828fc4749579142a6df450b8e8e0039bde046 (patch) | |
tree | 1536339c455b4a49eb5094e09ac3e489d4fa0a68 /media-plugins/vdr-xineliboutput | |
parent | Removed new privacy extension as it's broken. (bugs #348785 and #348799) (diff) | |
download | historical-5eb828fc4749579142a6df450b8e8e0039bde046.tar.gz historical-5eb828fc4749579142a6df450b8e8e0039bde046.tar.bz2 historical-5eb828fc4749579142a6df450b8e8e0039bde046.zip |
Merge live ebuild patch with upstream changes.
Package-Manager: portage-2.2.0_alpha8/cvs/Linux x86_64
Diffstat (limited to 'media-plugins/vdr-xineliboutput')
-rw-r--r-- | media-plugins/vdr-xineliboutput/ChangeLog | 6 | ||||
-rw-r--r-- | media-plugins/vdr-xineliboutput/Manifest | 18 | ||||
-rw-r--r-- | media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch | 72 |
3 files changed, 21 insertions, 75 deletions
diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog index 9f790fc53e69..906cac0989e4 100644 --- a/media-plugins/vdr-xineliboutput/ChangeLog +++ b/media-plugins/vdr-xineliboutput/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-xineliboutput # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.59 2010/12/07 19:54:10 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.60 2010/12/15 17:09:04 idl0r Exp $ + + 15 Dec 2010; Christian Ruppert <idl0r@gentoo.org> + files/vdr-xineliboutput-9999-build-system.patch: + Merge live ebuild patch with upstream changes. 07 Dec 2010; Christian Ruppert <idl0r@gentoo.org> vdr-xineliboutput-9999.ebuild: diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest index 499c0e8e49f6..b258421f9195 100644 --- a/media-plugins/vdr-xineliboutput/Manifest +++ b/media-plugins/vdr-xineliboutput/Manifest @@ -4,7 +4,7 @@ Hash: SHA256 AUX confd-1.0.0_pre6 856 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b SHA1 5d4591f1a2525cdebbda53636c1138cf3563e592 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac49d4af46096d6089b AUX vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff 3657 RMD160 7f7c9b16b3c00cabe826971cbd3d7a559b1f5577 SHA1 b0cb9b85ee75800045076616da182d5b9eda38a5 SHA256 e4062ec7b43136b2113173641a6b5b7a2d50cd892a0aec8cf778c97874f84743 AUX vdr-xineliboutput-1.0.5-ldflags.patch 1382 RMD160 92521e35a1e1f30c0f8da49c4e2673cadef03b62 SHA1 0b686aab9344dda5db7e66c77a6acab9437e0020 SHA256 e455aaf86c771e71848f01bd281ac4cbdc4c710a91b1896069bbf41da5c876ad -AUX vdr-xineliboutput-9999-build-system.patch 4965 RMD160 6546c9cb2e114b5e397dbfbfaf9796fa9a83ff52 SHA1 77625c146cb4b4987230f517b45685c4e2d5221d SHA256 786bd55172f29be1dadb23320d8c705bce1caffd562d233c4c9cda5d4fa4aada +AUX vdr-xineliboutput-9999-build-system.patch 2867 RMD160 66e24fd0def6120b74f3670592fecc28226d23ab SHA1 b10064043d951621e9005790729c3f83fbfcb141 SHA256 54a2974100b4d914ecbd6fd55b96feeb67fbf64f5ba0cc30bd5cb604ab06802c DIST vdr-xineliboutput-1.0.2.tgz 325042 RMD160 8564fd1c55c50e665168f4cd46a7bea33419257e SHA1 e7eadd3774429804b168928a840253d827fb5dcf SHA256 de8e4dbb60b73e91f7e13859b3bb246545c201edceb97431ae2bb08933b015b6 DIST vdr-xineliboutput-1.0.3.tgz 329144 RMD160 b78c8f53d6406c9f499a090d97f082a6d08ec5a1 SHA1 0a97ccb92bbef13421371294dbde8884d7d1d496 SHA256 a194fbdfc79791f0980715dcb98b1f9393562052e125aedb8401f4691be1ae92 DIST vdr-xineliboutput-1.0.4.tgz 327859 RMD160 2faef32accf4f985bf1a7e748a7d18ccfa519337 SHA1 389d51ea3b56fd312b5273cd3f9ba19fe9e46732 SHA256 c1cb82e02b193356864c0f6e12fb9ef59406fc2ce94244925d7523b3ec58e8ef @@ -21,16 +21,16 @@ EBUILD vdr-xineliboutput-1.0.4_p20091118.ebuild 3599 RMD160 018f6f522d695eb41e40 EBUILD vdr-xineliboutput-1.0.5-r1.ebuild 3603 RMD160 b639fe120ee0f4b414c28099801034efbbde34b9 SHA1 474d879901c527dbb640c02be3fbda20d3468a3a SHA256 43acac7740bfca1e0abe75a6608ddbcbccf03f89eb4b90303c089cefbda337eb EBUILD vdr-xineliboutput-1.0.5.ebuild 3536 RMD160 4eeb1bdec5e3bb4fd8e200dd9d4441434ba40b10 SHA1 a89f6c96a8080458f8bcb36b1ee936227858d135 SHA256 06a9b61f7e7616ae73a79affe464285173f7465d7f6199fb56c56aaa5aa2a866 EBUILD vdr-xineliboutput-9999.ebuild 3453 RMD160 868c1f8a1ea6f4ef4c29bc640a96c6d9e88f4b4f SHA1 ff8596adcb4761eba40282eab0596e40953a7c2a SHA256 b8f702d53bc9fbe51fd0776b8a489b4a2f71bbcd61b2d7a8058262f6f39e4f1b -MISC ChangeLog 12201 RMD160 5c77e6151ef18ea1297a91936324c31587a9a721 SHA1 2c469fbbe26e5dc55387473a0db613586b2a7d9e SHA256 627667a9e7b1356b15170d414ab3cfef278d16d3566bf6a91f8bc9080c5d3340 +MISC ChangeLog 12354 RMD160 1fa6b7021401fa25bc24fc497efc15c282565ee4 SHA1 33abeb218fe01d3e616645c8c0120c88ebb7ef29 SHA256 c85c5cfb901e4a8f679bb4eb586fd70f5a938289b5e9adeae7794400af55c0d8 MISC metadata.xml 901 RMD160 b57c7638aea62eb9259a62287a90e418f1615af5 SHA1 94c1c0c068bf8b4ba19ef876d2f53a16740194fa SHA256 91ce76b6909fe4327c6e68f500764e365bea14af50a6053cdaba6da0fb88e75b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iQEcBAEBCAAGBQJM/pDnAAoJEMOx0zmdw4Z1LUUH/jkhsiIbdLrDscP0V0OzKf3r -Nr7dpQpVrIbdrTQozQag3K4jVOCZWAQOk7nnCsxaUeaIkZrB3XcEwNNxl8t7Uejs -6lPnh1JkzJMdBnQ9PhCAjk6clOcnJmWnuwGiDn6692wm8jKmuu1cON5XAOlj0u2e -ewmq9EPIXc6Rjshol12ZOih0BDXGe1HBCGmYYIyr4rM0CJMY+fyMj+AM8U/P2lzh -OsFR6JhcCh2NFZUxz1jA15/fqKvJCmSUUAFXHslEdL3TmQ4vCDz5BbxqwhwOUWyP -b2O++7d6VUuQEqWIysL9AMzbu8OCydaXX9kTo1C6Fb8Av6C2n9OKSV11A2FH1Hw= -=0KNF +iQEcBAEBCAAGBQJNCPY1AAoJEMOx0zmdw4Z1j9kIALeaEH/Dvxlcz+78bDfI3lL2 +5GOkfpa4wtW7oZRJY/iPaCSotuW4psbTy9VK6atGioIClnLl7oEVv9hQ+kUAD9bm +HxCu9Ka9EwUCCWGxKUwRJaZbBBKV/bJd+IiwlJALXYNtoYmaHsORxh4N3B+a2/Ja +HwuaV6m1QXW4yKHJUu54qpW74frp5Mg36T4Yic7aj1ZSNh/FjjFILqb/a5QwEtru +f176Rg/NgiYFSmOFKZfqun90fH8IdX1ZN0vSzsT70GpCVjx0L0rlbxy3jLJ9l8Oq +J2iv0iaMp0c+I5AbPwv4KKDrLAqlg+Ii1DJ8xHRXSPDrf61NbgFrBwq0p6muoxY= +=W7uR -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch index 9caf58043bb0..9787219c30f8 100644 --- a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch +++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch @@ -1,11 +1,11 @@ Index: Makefile =================================================================== RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/Makefile,v -retrieving revision 1.101 -diff -u -b -B -r1.101 Makefile ---- Makefile 25 Nov 2010 14:28:49 -0000 1.101 -+++ Makefile 26 Nov 2010 19:42:55 -0000 -@@ -312,7 +312,7 @@ +retrieving revision 1.105 +diff -u -b -B -r1.105 Makefile +--- Makefile 15 Dec 2010 14:43:36 -0000 1.105 ++++ Makefile 15 Dec 2010 17:05:50 -0000 +@@ -323,7 +323,7 @@ install : XINELIBOUTPUT_INSTALL_MSG = .PHONY: all @@ -14,34 +14,7 @@ diff -u -b -B -r1.101 Makefile frontends: config $(TARGETS_FE) $(TARGETS_XINE) $(XINELIBOUTPUT_INSTALL_MSG) -@@ -329,8 +329,6 @@ - - $(VDRPLUGIN): $(OBJS) $(OBJS_MPG) - $(CXX) $(CXXFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS) $(OBJS_MPG) $(LIBS) $(LIBS_VDR) -o $@ -- @-rm -rf $(LIBDIR)/$@ -- @cp $@ $(LIBDIR)/$@ - - # - # vdr-sxfe -@@ -338,8 +336,6 @@ - - $(VDRPLUGIN_SXFE): $(OBJS_SXFE_SO) - $(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS_SXFE_SO) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) -o $@ -- @-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE) -- @cp $@ $(LIBDIR)/$(VDRPLUGIN_SXFE) - $(VDRSXFE): $(OBJS_SXFE) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_SXFE) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@ - -@@ -349,8 +345,6 @@ - - $(VDRPLUGIN_FBFE): $(OBJS_FBFE_SO) - $(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS_FBFE_SO) $(LIBS_XINE) $(LIBS_JPEG) -o $@ -- @-rm -rf $(LIBDIR)/$(VDRPLUGIN_FBFE) -- @cp $@ $(LIBDIR)/$(VDRPLUGIN_FBFE) - $(VDRFBFE): $(OBJS_FBFE) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_FBFE) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@ - -@@ -371,7 +365,7 @@ +@@ -389,7 +389,7 @@ # install # @@ -50,44 +23,13 @@ diff -u -b -B -r1.101 Makefile ifeq ($(XINELIBOUTPUT_XINEPLUGIN), yes) @mkdir -p $(DESTDIR)/$(XINEPLUGINDIR)/post @echo Installing $(DESTDIR)/$(XINEPLUGINDIR)/$(XINEINPUTVDR) -@@ -392,12 +386,30 @@ - @mkdir -p $(DESTDIR)/$(BINDIR) - @-rm -rf $(DESTDIR)/$(BINDIR)/vdr-fbfe - @$(INSTALL) -m 0755 vdr-fbfe $(DESTDIR)/$(BINDIR)/vdr-fbfe -+ifeq ($(XINELIBOUTPUT_VDRPLUGIN), yes) -+ @echo Installing $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_FBFE) -+ @mkdir -p $(DESTDIR)$(LIBDIR) -+ @-rm -rf $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_FBFE) -+ @$(INSTALL) -m 0755 $(VDRPLUGIN_FBFE) $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_FBFE) -+endif - endif - ifeq ($(XINELIBOUTPUT_X11), yes) - @echo Installing $(DESTDIR)/$(BINDIR)/vdr-sxfe - @mkdir -p $(DESTDIR)/$(BINDIR) - @-rm -rf $(DESTDIR)/$(BINDIR)/vdr-sxfe - @$(INSTALL) -m 0755 vdr-sxfe $(DESTDIR)/$(BINDIR)/vdr-sxfe -+ifeq ($(XINELIBOUTPUT_VDRPLUGIN), yes) -+ @echo Installing $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_SXFE) -+ @mkdir -p $(DESTDIR)$(LIBDIR) -+ @-rm -rf $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_SXFE) -+ @$(INSTALL) -m 0755 $(VDRPLUGIN_SXFE) $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_SXFE) -+endif -+endif -+ifeq ($(XINELIBOUTPUT_VDRPLUGIN), yes) -+ @echo Installing $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN) -+ @mkdir -p $(DESTDIR)$(LIBDIR) -+ @-rm -rf $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN) -+ @$(INSTALL) -D -m 0755 $(VDRPLUGIN) $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN) - endif - - dist: clean Index: configure =================================================================== RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/configure,v retrieving revision 1.29 diff -u -b -B -r1.29 configure --- configure 23 Nov 2010 13:21:06 -0000 1.29 -+++ configure 26 Nov 2010 19:42:55 -0000 ++++ configure 15 Dec 2010 17:05:50 -0000 @@ -231,7 +231,6 @@ xshm xdpms |