summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-02-26 16:26:26 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-02-26 16:26:26 +0000
commit6b5c327c877a6b22307e58fae3de1eaf67ff6827 (patch)
tree1fb270d2ca79b2731cf0dde7c4aa846d2246ea96 /media-libs/xine-lib
parentVersion bump. Include copy of gtk-2.0.m4 for eautoreconf (AM_PATH_GTK_2_0) wr... (diff)
downloadhistorical-6b5c327c877a6b22307e58fae3de1eaf67ff6827.tar.gz
historical-6b5c327c877a6b22307e58fae3de1eaf67ff6827.tar.bz2
historical-6b5c327c877a6b22307e58fae3de1eaf67ff6827.zip
Include upstream compat.c in src/dxr3/ for em8300 < 0.18.0 drivers compat wrt #306857, thanks to Juergen Rose for reporting.
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64
Diffstat (limited to 'media-libs/xine-lib')
-rw-r--r--media-libs/xine-lib/ChangeLog7
-rw-r--r--media-libs/xine-lib/Manifest5
-rw-r--r--media-libs/xine-lib/xine-lib-1.1.18.ebuild7
3 files changed, 14 insertions, 5 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 4b7ddeb0fed1..e5acfecfdae5 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/xine-lib
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.621 2010/02/24 21:09:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.622 2010/02/26 16:26:26 ssuominen Exp $
+
+ 26 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+ xine-lib-1.1.18.ebuild:
+ Include upstream compat.c in src/dxr3/ for em8300 < 0.18.0 drivers compat
+ wrt #306857, thanks to Juergen Rose for reporting.
24 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
xine-lib-1.1.18.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 34969001db41..7e4518387733 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,7 +1,8 @@
DIST xine-lib-1.1.15-textrel-fix.patch 29373 RMD160 4702a26f42251614f5f6c99b4770f82da36577ae SHA1 e04d04dbd736fd17be8cf0583d47630850a89bf9 SHA256 1d6aa047cb0a13f248aea2e06e16b9758b9c39d8b7e42b32d0b52b424d26b33e
DIST xine-lib-1.1.17.tar.bz2 7528937 RMD160 ecac0711431a94c74edaf8f00e696ade5ed0b6ee SHA1 2438e66bb571c8a4c981581188376687c42b72c4 SHA256 14e17e1665c0aa90f958204570060a3aebded2b93078c5fae14ca8a92c0e79cf
+DIST xine-lib-1.1.18-compat.c.tbz2 766 RMD160 1d6a0c48e6b95125a7b9ea23d408c3705283d728 SHA1 cb14ac854d0616fedaec040e40c66e135fcbfb39 SHA256 e4543f8e31fb1a0ccffdebc6d7f05c9fdf3ba1137083174cdc8d0de2aa9df0f0
DIST xine-lib-1.1.18.tar.xz 5785444 RMD160 9303a0b0cd0d18ca197df167adfaba9784e0c9d5 SHA1 8acb55a8fc85b1717e4e8f78508905007ff6f728 SHA256 41f04822bb5e0726b43bd3c38f991068c32fbec80cbc769e8c2e8704b9956226
EBUILD xine-lib-1.1.17.ebuild 5481 RMD160 663c95d3d0cbc72f5c38d4444d3929a83091917b SHA1 ac332b87f0cf85d398a1df7062d39ce8fdde814c SHA256 422a4d0b2c7f8a0d426ab6a9c0ef46ba8f5dfcbfe905632c7e86255a88dbb0c7
-EBUILD xine-lib-1.1.18.ebuild 5566 RMD160 fcfe0b9bceff35f729716c4c82ffa7f04939186f SHA1 63181305c1feb098e3863cd92f528d0f7c2e6ee6 SHA256 8fdb1d420f6a51778c8b445b0963d76d66fab1302a43d6977e51c707c0674c0f
-MISC ChangeLog 71861 RMD160 84f35d81e2f76520dfb53881286c82039b18f8d0 SHA1 c1dff6a078ebb11534f28ded26c53905e6ccceab SHA256 9775121c4ef07da849cf9a09d562a46437e995f091eb03e3ceb91eca017d9413
+EBUILD xine-lib-1.1.18.ebuild 5666 RMD160 6409dd9a159d7466df8940119b603fa9477eb962 SHA1 4cfea2c14de57ded27678a0ab7ebe0ada68778db SHA256 8742878685ae1447aa80ea8ff29929579f247f42fda5da9344ad0851afedb12d
+MISC ChangeLog 72071 RMD160 ff1c5c7fcc9bf83256c49a1f66108c4fe23699b6 SHA1 927ecae529afcb2f986cf67292a528a646f99f2a SHA256 dc75bacfbb5544d59a83ad439a2fe470985fc1dff0020ce995ead5b24e57c71f
MISC metadata.xml 2914 RMD160 bed4bab81a32b49e4923ddfcc02e8338a45ef7ef SHA1 fe3faf7dba7f929241acfe5eaa17b2f66bfb2722 SHA256 efe3b879c59c9971e1ffcd732c2bdbd8f60f2b173fde675a371202ceeb96b0fe
diff --git a/media-libs/xine-lib/xine-lib-1.1.18.ebuild b/media-libs/xine-lib/xine-lib-1.1.18.ebuild
index 3f9325bf1c27..c6d1bff22b46 100644
--- a/media-libs/xine-lib/xine-lib-1.1.18.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.18.ebuild,v 1.3 2010/02/24 21:09:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.18.ebuild,v 1.4 2010/02/26 16:26:26 ssuominen Exp $
EAPI=3
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -16,7 +16,9 @@ else
SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.xz"
fi
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.1.15-textrel-fix.patch"
+SRC_URI="${SRC_URI}
+ mirror://gentoo/${PN}-1.1.15-textrel-fix.patch
+ http://dev.gentoo.org/~ssuominen/${P}-compat.c.tbz2"
DESCRIPTION="Core libraries for Xine movie player"
HOMEPAGE="http://xine.sourceforge.net"
@@ -88,6 +90,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${DISTDIR}"/${PN}-1.1.15-textrel-fix.patch
+ cp -f "${WORKDIR}"/compat.c src/dxr3/ || die
}
src_configure() {