diff options
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/kaffeine/ChangeLog | 10 | ||||
| -rw-r--r-- | media-video/kaffeine/files/digest-kaffeine-0.8.5-r1 | 3 | ||||
| -rw-r--r-- | media-video/kaffeine/files/kaffeine-0.8.5-respectcflags.patch | 52 | ||||
| -rw-r--r-- | media-video/kaffeine/files/kaffeine-with-xcb-r1.patch | 19 | ||||
| -rw-r--r-- | media-video/kaffeine/kaffeine-0.8.5-r1.ebuild | 69 |
5 files changed, 152 insertions, 1 deletions
diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog index 06f83f1592e0..9748d6f15d55 100644 --- a/media-video/kaffeine/ChangeLog +++ b/media-video/kaffeine/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-video/kaffeine # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.81 2007/10/08 17:23:08 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.82 2007/11/12 19:24:05 flameeyes Exp $ + +*kaffeine-0.8.5-r1 (12 Nov 2007) + + 12 Nov 2007; Diego Pettenò <flameeyes@gentoo.org> + +files/kaffeine-with-xcb-r1.patch, + +files/kaffeine-0.8.5-respectcflags.patch, +kaffeine-0.8.5-r1.ebuild: + Properly run autotools for a KDE package (avoid double configure run). + Properly respect user CFLAGS on DVB-related libraries. 08 Oct 2007; Markus Rothe <corsair@gentoo.org> kaffeine-0.8.5.ebuild: Stable on ppc64; bug #186896 diff --git a/media-video/kaffeine/files/digest-kaffeine-0.8.5-r1 b/media-video/kaffeine/files/digest-kaffeine-0.8.5-r1 new file mode 100644 index 000000000000..ac5adc3b3acc --- /dev/null +++ b/media-video/kaffeine/files/digest-kaffeine-0.8.5-r1 @@ -0,0 +1,3 @@ +MD5 71814e7612f1f7e1b6cd954d352e4201 kaffeine-0.8.5.tar.bz2 2887566 +RMD160 f32004e87b790bdd137c455234cbf3c2776fd3f3 kaffeine-0.8.5.tar.bz2 2887566 +SHA256 653090c84c11eaea20a4b7b9a863972d16fea7d8db148be12b26291c162b0f97 kaffeine-0.8.5.tar.bz2 2887566 diff --git a/media-video/kaffeine/files/kaffeine-0.8.5-respectcflags.patch b/media-video/kaffeine/files/kaffeine-0.8.5-respectcflags.patch new file mode 100644 index 000000000000..7ee3a07baa85 --- /dev/null +++ b/media-video/kaffeine/files/kaffeine-0.8.5-respectcflags.patch @@ -0,0 +1,52 @@ +Don't overwrite the user variable CFLAGS< use AM_CFLAGS or nothing. + +Index: kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am +=================================================================== +--- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am ++++ kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am +@@ -7,5 +7,3 @@ libdvbapi_la_SOURCES = diseqc.c \ + dvbdemux.c \ + dvbfe.c \ + dvbnet.c +- +-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC +Index: kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am +=================================================================== +--- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am ++++ kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am +@@ -18,4 +18,4 @@ libdvben50221_la_SOURCES = asn_1.c \ + en50221_session.c \ + en50221_transport.c + +-CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC ++AM_CFLAGS = -DLOG_LEVEL=1 +Index: kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am +=================================================================== +--- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am ++++ kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am +@@ -15,5 +15,3 @@ libdvbdvb_la_SOURCES = bat_section.c \ + tot_section.c \ + tva_container_section.c \ + types.c +- +-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC +Index: kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/Makefile.am +=================================================================== +--- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libucsi/Makefile.am ++++ kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/Makefile.am +@@ -13,5 +13,3 @@ libucsi_la_LDFLAGS = ./mpeg \ + + libucsi_la_LIBADD = ./mpeg/libdvbmpeg.la \ + ./dvb/libdvbdvb.la +- +-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC +Index: kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am +=================================================================== +--- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am ++++ kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am +@@ -8,5 +8,3 @@ libdvbmpeg_la_SOURCES = cat_section.c \ + pat_section.c \ + pmt_section.c \ + tsdt_section.c +- +-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC diff --git a/media-video/kaffeine/files/kaffeine-with-xcb-r1.patch b/media-video/kaffeine/files/kaffeine-with-xcb-r1.patch new file mode 100644 index 000000000000..b4f60f3d0aef --- /dev/null +++ b/media-video/kaffeine/files/kaffeine-with-xcb-r1.patch @@ -0,0 +1,19 @@ +--- kaffeine-0.8.4/kaffeine/configure.in.in.orig 2007-04-14 01:31:16.000000000 +0200 ++++ kaffeine-0.8.4/kaffeine/configure.in.in 2007-04-14 01:38:39.000000000 +0200 +@@ -227,12 +227,15 @@ + dnl check for xcb + dnl ------------- + ++AC_ARG_WITH([xcb], [AS_HELP_STRING([--without-xcb], [build without xcb support])],, ++ [with_xcb=yes]) ++ + AC_MSG_CHECKING([for xcb and xine-lib >= 1.1.5]) + + CFLAGS_XCB="" + LIB_XCB="" + +-if "$PKG_CONFIG" --exists "xcb >= 1.0 libxine >= 1.1.5" ; then ++if test "$with_xcb" != "no" && "$PKG_CONFIG" --exists "xcb >= 1.0 libxine >= 1.1.5" ; then + with_xcb=yes + CFLAGS_XCB=`"$PKG_CONFIG" --cflags xcb` + LIB_XCB=`"$PKG_CONFIG" --libs xcb` diff --git a/media-video/kaffeine/kaffeine-0.8.5-r1.ebuild b/media-video/kaffeine/kaffeine-0.8.5-r1.ebuild new file mode 100644 index 000000000000..ebcb5a739d50 --- /dev/null +++ b/media-video/kaffeine/kaffeine-0.8.5-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.5-r1.ebuild,v 1.1 2007/11/12 19:24:05 flameeyes Exp $ + +inherit eutils kde flag-o-matic + +DESCRIPTION="Media player for KDE using xine and gstreamer backends." +HOMEPAGE="http://kaffeine.sourceforge.net/" +SRC_URI="mirror://sourceforge/kaffeine/${P}.tar.bz2" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="dvb gstreamer xinerama vorbis encode kdehiddenvisibility xcb" + +RDEPEND=">=media-libs/xine-lib-1 + xcb? ( >=x11-libs/libxcb-1.0 + >=media-libs/xine-lib-1.1.5 ) + gstreamer? ( =media-libs/gstreamer-0.10* + =media-plugins/gst-plugins-xvideo-0.10* ) + media-sound/cdparanoia + encode? ( media-sound/lame ) + vorbis? ( media-libs/libvorbis ) + x11-libs/libXtst" + +DEPEND="${RDEPEND} + dvb? ( media-tv/linuxtv-dvb-headers )" + +need-kde 3.5.4 + +pkg_setup() { + if use xcb && ! built_with_use --missing false media-libs/xine-lib xcb; then + eerror "To enable the xcb useflag on this package you need" + eerror "the useflag xcb enabled on media-libs/xine-lib." + eerror "Please emerge media-libs/xine-lib again with the xcb useflag" + eerror "enabled." + die "Missing xcb useflag on media-libs/xine-lib." + fi +} + +src_unpack() { + kde_src_unpack + cd "${S}" + epatch "${FILESDIR}"/kaffeine-with-xcb-r1.patch + epatch "${FILESDIR}"/kaffeine-0.8.5-respectcflags.patch + rm -f "${S}"/configure +} + +src_compile() { + # see bug #143168 + replace-flags -O3 -O2 + + local myconf="${myconf} + $(use_with xinerama) + $(use_with dvb) + $(use_with gstreamer) + $(use_with vorbis oggvorbis) + $(use_with xcb) + $(use_with encode lame)" + + kde_src_compile +} + +src_install() { + kde_src_install + + # Remove this, as kdelibs 3.5.4 provides it + rm -f "${D}"/usr/share/mimelnk/application/x-mplayer2.desktop +} |