* [gentoo-commits] proj/kde-sunset:master commit in: media-video/kaffeine/files/, media-video/kaffeine/
@ 2012-02-27 15:34 Roman v. Gemmeren
0 siblings, 0 replies; 2+ messages in thread
From: Roman v. Gemmeren @ 2012-02-27 15:34 UTC (permalink / raw
To: gentoo-commits
commit: 91372e2c2b41138222b0c32f9c381a58bdf7b41e
Author: Roman v. Gemmeren <strowi <AT> hasnoname <DOT> de>
AuthorDate: Mon Feb 27 15:31:52 2012 +0000
Commit: Roman v. Gemmeren <strowi <AT> hasnoname <DOT> de>
CommitDate: Mon Feb 27 15:31:52 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=commit;h=91372e2c
make kaffeine compile with >=xine-lib-1.2
modified: Manifest
new file: files/kaffeine-0.8.8-kxinewidget.patch
new file: kaffeine-0.8.8-r1.ebuild
---
.../files/kaffeine-0.8.8-kxinewidget.patch | 11 +++
media-video/kaffeine/kaffeine-0.8.8-r1.ebuild | 81 ++++++++++++++++++++
2 files changed, 92 insertions(+), 0 deletions(-)
diff --git a/media-video/kaffeine/files/kaffeine-0.8.8-kxinewidget.patch b/media-video/kaffeine/files/kaffeine-0.8.8-kxinewidget.patch
new file mode 100644
index 0000000..c160bb9
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-0.8.8-kxinewidget.patch
@@ -0,0 +1,11 @@
+--- kaffeine/src/player-parts/xine-part/kxinewidget.cpp~ 2009-05-15 16:16:26.000000000 +0100
++++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp 2012-02-25 23:45:45.000000000 +0000
+@@ -2638,7 +2638,7 @@
+ int num;
+ int i = 0;
+
+- urls = xine_get_autoplay_mrls(m_xineEngine, plugin.ascii(), &num);
++ urls = (char**)xine_get_autoplay_mrls(m_xineEngine, plugin.ascii(), &num);
+
+ if (urls)
+ {
diff --git a/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild b/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
new file mode 100644
index 0000000..80358de
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.8.ebuild,v 1.4 2009/06/09 14:16:40 tampakrap Exp $
+
+EAPI="2"
+
+ARTS_REQUIRED="never"
+
+USE_KEG_PACKAGING="1"
+
+LANGS="ar bg bn br ca cs da de el es et fi fr ga gl he hu it ja ka \
+ km lt mk nb nl nn pa pl pt_BR pt ru se sk sr@Latn sr sv tg tr \
+ uk uz zh_CN zh_TW"
+
+LANGS_DOC=""
+
+inherit eutils kde flag-o-matic
+
+DESCRIPTION="Media player for KDE using xine and gstreamer backends."
+HOMEPAGE="http://kaffeine.sourceforge.net/"
+SRC_URI="http://hftom.free.fr/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="3.5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dvb gstreamer xinerama vorbis encode xcb"
+# kdehiddenvisibility removed due to bug 207002.
+
+RDEPEND=">=media-libs/xine-lib-1.1.9[xcb?]
+ xcb? ( >=x11-libs/libxcb-1.0 )
+ gstreamer? ( =media-libs/gstreamer-0.10*
+ =media-plugins/gst-plugins-xvideo-0.10* )
+ dev-libs/libcdio
+ encode? ( media-sound/lame )
+ vorbis? ( media-libs/libvorbis )
+ x11-libs/libXtst"
+
+DEPEND="${RDEPEND}
+ dvb? ( media-tv/linuxtv-dvb-headers
+ >=sys-kernel/linux-headers-2.6.28 )
+ x11-proto/inputproto"
+
+need-kde 3.5.4
+
+PATCHES=(
+ "${FILESDIR}/kaffeine-0.8.7-respectcflags.patch"
+ "${FILESDIR}/kaffeine-0.8.8-kxinewidget.patch"
+ )
+
+src_configure() {
+ # see bug #143168
+ replace-flags -O3 -O2
+
+ # workaround bug #198973
+ local save_CXXFLAGS="${CXXFLAGS}"
+ append-flags -std=gnu89
+ export CXXFLAGS="${save_CXXFLAGS}"
+
+ 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_configure
+}
+
+src_install() {
+ kde_src_install
+
+ # fix localization, bug #199909
+ for mofile in "${D}/${KDEDIR}"/share/locale/*/LC_MESSAGES/${P}.mo ; do
+ mv -f ${mofile} ${mofile/${P}.mo/${PN}.mo} \
+ || die "fixing mo files failed"
+ done
+
+ # remove this, as kdelibs 3.5.4 provides it
+ rm -f "${D}/${KDEDIR}"/share/mimelnk/application/x-mplayer2.desktop
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde-sunset:master commit in: media-video/kaffeine/files/, media-video/kaffeine/
@ 2013-03-21 17:20 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2013-03-21 17:20 UTC (permalink / raw
To: gentoo-commits
commit: da15f6a4251151c5c94273cb0f2ef2d69726cade
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 17:19:57 2013 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 17:19:57 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=commit;h=da15f6a4
Fixed compilation with dev-libs/libcdio-paranoia
---
media-video/kaffeine/ChangeLog | 9 +-
.../kaffeine-0.8.8-paranoia_include_fix.patch | 136 ++++++++++++++++++++
media-video/kaffeine/kaffeine-0.8.8-r1.ebuild | 4 +-
...ne-0.8.8-r1.ebuild => kaffeine-0.8.8-r2.ebuild} | 5 +-
media-video/kaffeine/kaffeine-0.8.8.ebuild | 4 +-
5 files changed, 151 insertions(+), 7 deletions(-)
diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index e1c4913..e4aaab7 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,7 +1,14 @@
# ChangeLog for media-video/kaffeine
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.104 2009/11/09 14:01:12 maekke Exp $
+*kaffeine-0.8.8-r2 (21 Mar 2013)
+
+ 21 Mar 2013; Lars Wendler <polynomial-c@gentoo.org> kaffeine-0.8.8.ebuild,
+ kaffeine-0.8.8-r1.ebuild, +kaffeine-0.8.8-r2.ebuild,
+ +files/kaffeine-0.8.8-paranoia_include_fix.patch:
+ Fixed compilation with dev-libs/libcdio-paranoia.
+
09 Nov 2009; Markus Meier <maekke@gentoo.org> kaffeine-1.0_pre2.ebuild:
x86 stable, bug #291876
diff --git a/media-video/kaffeine/files/kaffeine-0.8.8-paranoia_include_fix.patch b/media-video/kaffeine/files/kaffeine-0.8.8-paranoia_include_fix.patch
new file mode 100644
index 0000000..4d6901a
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-0.8.8-paranoia_include_fix.patch
@@ -0,0 +1,136 @@
+--- kaffeine-0.8.8/configure
++++ kaffeine-0.8.8/configure
+@@ -34206,8 +34206,8 @@
+
+
+ if test "${ac_cv_header_cdio_cdda_h+set}" = set; then
+- { $as_echo "$as_me:$LINENO: checking for cdio/cdda.h" >&5
+-$as_echo_n "checking for cdio/cdda.h... " >&6; }
++ { $as_echo "$as_me:$LINENO: checking for cdio/paranoia/cdda.h" >&5
++$as_echo_n "checking for cdio/paranoia/cdda.h... " >&6; }
+ if test "${ac_cv_header_cdio_cdda_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ fi
+@@ -34215,8 +34215,8 @@
+ $as_echo "$ac_cv_header_cdio_cdda_h" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking cdio/cdda.h usability" >&5
+-$as_echo_n "checking cdio/cdda.h usability... " >&6; }
++{ $as_echo "$as_me:$LINENO: checking cdio/paranoia/cdda.h usability" >&5
++$as_echo_n "checking cdio/paranoia/cdda.h usability... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -34224,7 +34224,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -34257,15 +34257,15 @@
+ $as_echo "$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking cdio/cdda.h presence" >&5
+-$as_echo_n "checking cdio/cdda.h presence... " >&6; }
++{ $as_echo "$as_me:$LINENO: checking cdio/paranoia/cdda.h presence" >&5
++$as_echo_n "checking cdio/paranoia/cdda.h presence... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+@@ -34299,30 +34299,30 @@
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: cdio/cdda.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: cdio/cdda.h: proceeding with the compiler's result" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: cdio/cdda.h: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: cdio/cdda.h: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: cdio/cdda.h: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: cdio/cdda.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: cdio/cdda.h: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: cdio/cdda.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: cdio/cdda.h: in the future, the compiler will take precedence" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: present but cannot be compiled" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: check for missing prerequisite headers?" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: see the Autoconf documentation" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: section \"Present But Cannot Be Compiled\"" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: proceeding with the preprocessor's result" >&5
++$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: proceeding with the preprocessor's result" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: cdio/paranoia/cdda.h: in the future, the compiler will take precedence" >&5
++$as_echo "$as_me: WARNING: cdio/paranoia/cdda.h: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for cdio/cdda.h" >&5
+-$as_echo_n "checking for cdio/cdda.h... " >&6; }
++{ $as_echo "$as_me:$LINENO: checking for cdio/paranoia/cdda.h" >&5
++$as_echo_n "checking for cdio/paranoia/cdda.h... " >&6; }
+ if test "${ac_cv_header_cdio_cdda_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+--- kaffeine-0.8.8/configure.in
++++ kaffeine-0.8.8/configure.in
+@@ -300,7 +300,7 @@
+ dnl check for cdparanoia
+ dnl --------------------
+
+-KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
++KDE_CHECK_HEADER([cdio/paranoia/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
+
+ if test "$with_cdparanoia" != "yes" ; then
+ echo ""
+--- kaffeine-0.8.8/kaffeine/configure.in.in
++++ kaffeine-0.8.8/kaffeine/configure.in.in
+@@ -220,7 +220,7 @@
+ dnl check for cdparanoia
+ dnl --------------------
+
+-KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
++KDE_CHECK_HEADER([cdio/paranoia/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
+
+ if test "$with_cdparanoia" != "yes" ; then
+ echo ""
+--- kaffeine-0.8.8/kaffeine/src/input/disc/paranoia.h
++++ kaffeine-0.8.8/kaffeine/src/input/disc/paranoia.h
+@@ -32,8 +32,8 @@
+
+ extern "C"
+ {
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ }
+
+ class KiloConfig : public ParanoiaSettings
diff --git a/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild b/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
index b8ade78..37c9bdd 100644
--- a/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
+++ b/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.8.ebuild,v 1.4 2009/06/09 14:16:40 tampakrap Exp $
@@ -30,7 +30,7 @@ RDEPEND=">=media-libs/xine-lib-1.1.9[xcb?]
xcb? ( >=x11-libs/libxcb-1.0 )
gstreamer? ( =media-libs/gstreamer-0.10*
=media-plugins/gst-plugins-xvideo-0.10* )
- dev-libs/libcdio
+ <dev-libs/libcdio-0.90
encode? ( media-sound/lame )
vorbis? ( media-libs/libvorbis )
x11-libs/libXtst"
diff --git a/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild b/media-video/kaffeine/kaffeine-0.8.8-r2.ebuild
similarity index 93%
copy from media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
copy to media-video/kaffeine/kaffeine-0.8.8-r2.ebuild
index b8ade78..64349e2 100644
--- a/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
+++ b/media-video/kaffeine/kaffeine-0.8.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.8.ebuild,v 1.4 2009/06/09 14:16:40 tampakrap Exp $
@@ -30,7 +30,7 @@ RDEPEND=">=media-libs/xine-lib-1.1.9[xcb?]
xcb? ( >=x11-libs/libxcb-1.0 )
gstreamer? ( =media-libs/gstreamer-0.10*
=media-plugins/gst-plugins-xvideo-0.10* )
- dev-libs/libcdio
+ >=dev-libs/libcdio-paranoia-0.90
encode? ( media-sound/lame )
vorbis? ( media-libs/libvorbis )
x11-libs/libXtst"
@@ -45,6 +45,7 @@ need-kde 3.5.4
PATCHES=(
"${FILESDIR}/kaffeine-0.8.7-respectcflags.patch"
"${FILESDIR}/kaffeine-0.8.8-kxinewidget.patch"
+ "${FILESDIR}/kaffeine-0.8.8-paranoia_include_fix.patch"
)
src_configure() {
diff --git a/media-video/kaffeine/kaffeine-0.8.8.ebuild b/media-video/kaffeine/kaffeine-0.8.8.ebuild
index 31c39d7..8fa12d6 100644
--- a/media-video/kaffeine/kaffeine-0.8.8.ebuild
+++ b/media-video/kaffeine/kaffeine-0.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.8.ebuild,v 1.4 2009/06/09 14:16:40 tampakrap Exp $
@@ -30,7 +30,7 @@ RDEPEND=">=media-libs/xine-lib-1.1.9[xcb?]
xcb? ( >=x11-libs/libxcb-1.0 )
gstreamer? ( =media-libs/gstreamer-0.10*
=media-plugins/gst-plugins-xvideo-0.10* )
- dev-libs/libcdio
+ <dev-libs/libcdio-0.90
encode? ( media-sound/lame )
vorbis? ( media-libs/libvorbis )
x11-libs/libXtst"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-21 17:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-27 15:34 [gentoo-commits] proj/kde-sunset:master commit in: media-video/kaffeine/files/, media-video/kaffeine/ Roman v. Gemmeren
-- strict thread matches above, loose matches on Subject: below --
2013-03-21 17:20 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox