diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-11-12 19:24:06 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-11-12 19:24:06 +0000 |
commit | 7df1fb6bada14a8d73bf10373507318aa59de99a (patch) | |
tree | 2dfa0702c3e483bbca81c0f74cc1b25e45d056f8 /media-video/kaffeine/files | |
parent | amd64 stable wrt #198845 (diff) | |
download | gentoo-2-7df1fb6bada14a8d73bf10373507318aa59de99a.tar.gz gentoo-2-7df1fb6bada14a8d73bf10373507318aa59de99a.tar.bz2 gentoo-2-7df1fb6bada14a8d73bf10373507318aa59de99a.zip |
Properly run autotools for a KDE package (avoid double configure run). Properly respect user CFLAGS on DVB-related libraries.
(Portage version: 2.1.3.19)
Diffstat (limited to 'media-video/kaffeine/files')
3 files changed, 74 insertions, 0 deletions
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` |