MGA2/MDV2011: fix Kaffeine compilation

pull/3/head
Francois Andriot 12 years ago
parent dc5cded128
commit 75c1b2f8bf

@ -0,0 +1,19 @@
commit 4e982fa326fb619ec61e86cb0088d4b3002b2281
Author: Slávek Banko <slavek.banko@axis.cz>
Date: 1343089272 +0200
Added automake initialization with proper program name and version
This resolves Bug 858
diff --git a/configure.in.in b/configure.in.in
index 144aef9..9751e7c 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,4 +1,7 @@
#MIN_CONFIG(3.3)
+
+AM_INIT_AUTOMAKE(kaffeine, 0.8.8)
+
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
if test "$build_arts" = "yes"; then

@ -0,0 +1,29 @@
commit 5086f3584a9548aa92dd880139107187b9fc8509
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1342026813 -0500
Fixed online hyperlink to win32 codecs download location.
Thanks to Kristopher Gamrat.
diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp
index 279d78b..21336c2 100644
--- a/kaffeine/src/instwizard.cpp
+++ b/kaffeine/src/instwizard.cpp
@@ -113,7 +113,7 @@ void InstWizard::internalWizard()
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
else
info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
- << " <a href=\"http://www1.mplayerhq.hu/homepage/design7/codecs.html\">http://www.mplayerhq.hu</a>.</font>";
+ << " <a href=\"http://www1.mplayerhq.hu/design7/dload.html#binary_codecs\">http://www1.mplayerhq.hu/design7/dload.html#binary_codecs</a>.</font>";
//LIBDVDCSS
info << "<br><hr><b>" << "libdvdcss" << "...</b><br>";
@@ -190,7 +190,7 @@ void InstWizard::internalWizard()
if (infoString.contains("DarkRed"))
{
- info << i18n("Found some problems, but nevertheless Kaffeine may work.");
+ info << i18n("Found some problems, but nevertheless Kaffeine might work.");
}
else
{

@ -0,0 +1,42 @@
--- kaffeine/kaffeine/src/player-parts/kaffeine-part/Makefile.am.ORI 2012-08-03 12:13:32.063876101 +0200
+++ kaffeine/kaffeine/src/player-parts/kaffeine-part/Makefile.am 2012-08-03 12:13:38.423736088 +0200
@@ -8,5 +8,5 @@
METASOURCES = AUTO
libkaffeinepart_la_SOURCES = kaffeinepart.cpp mrl.cpp playlistimport.cpp
-libkaffeinepart_la_LIBADD = $(LIB_KPARTS) $(all_libraries)
+libkaffeinepart_la_LIBADD = $(LIB_KPARTS) $(all_libraries) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO)
libkaffeinepart_la_LDFLAGS = -no-undefined -avoid-version
--- kaffeine/kaffeine/src/input/disc/plugins/Makefile.am.ORI 2012-08-03 12:17:08.799687224 +0200
+++ kaffeine/kaffeine/src/input/disc/plugins/Makefile.am 2012-08-03 12:17:35.613454250 +0200
@@ -18,7 +18,7 @@
kaffeineinclude_HEADERS = kaffeineaudioencoder.h
libkaffeineaudioencoder_la_SOURCES = kaffeineaudioencoder.cpp
-libkaffeineaudioencoder_la_LIBADD = $(LIB_KPARTS)
+libkaffeineaudioencoder_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEUI) $(LIB_QT) $(LIB_OGGVORBIS)
libkaffeineaudioencoder_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined
kde_servicetypes_DATA = kaffeineaudioencoder.desktop
--- kaffeine/kaffeine/src/input/dvb/plugins/epg/Makefile.am.ORI 2012-08-03 12:19:42.699882457 +0200
+++ kaffeine/kaffeine/src/input/dvb/plugins/epg/Makefile.am 2012-08-03 12:19:47.451553785 +0200
@@ -10,7 +10,7 @@
kaffeineinclude_HEADERS = kaffeinedvbevents.h kaffeinedvbsection.h
libkaffeineepgplugin_la_SOURCES = kaffeinedvbevents.cpp kaffeinedvbsection.cpp
-libkaffeineepgplugin_la_LIBADD = $(LIB_KPARTS)
+libkaffeineepgplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
libkaffeineepgplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined
kde_servicetypes_DATA = kaffeineepgplugin.desktop
--- kaffeine/kaffeine/src/input/dvb/plugins/stream/Makefile.am.ORI 2012-08-03 12:20:56.687973949 +0200
+++ kaffeine/kaffeine/src/input/dvb/plugins/stream/Makefile.am 2012-08-03 12:21:01.669658770 +0200
@@ -10,7 +10,7 @@
kaffeineinclude_HEADERS = kaffeinedvbplugin.h
libkaffeinedvbplugin_la_SOURCES = kaffeinedvbplugin.cpp
-libkaffeinedvbplugin_la_LIBADD = $(LIB_KPARTS)
+libkaffeinedvbplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEUI) $(LIB_QT)
libkaffeinedvbplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined
kde_servicetypes_DATA = kaffeinedvbplugin.desktop
Loading…
Cancel
Save