diff options
Diffstat (limited to 'redhat/applications/kmplayer')
3 files changed, 110 insertions, 73 deletions
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch deleted file mode 100644 index f3a5d51da..000000000 --- a/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kmplayer/src/Makefile.am.ORI 2011-12-03 23:22:01.601981533 +0100 -+++ kmplayer/src/Makefile.am 2011-12-03 23:22:44.469655046 +0100 -@@ -58,6 +58,7 @@ - kgstplayer_SOURCES= gstplayer.cpp - - knpplayer_LDADD= $(LIBNSPR_LIBS) -+knpplayer_LDFLAGS= -lX11 -lgmodule-2.0 - knpplayer_SOURCES= npplayer.c - - xdg_apps_DATA = kmplayer.desktop diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch new file mode 100644 index 000000000..ba6c16cb9 --- /dev/null +++ b/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch @@ -0,0 +1,21 @@ +--- kmplayer/src/Makefile.am.ORI 2012-08-05 17:09:59.963896862 +0200 ++++ kmplayer/src/Makefile.am 2012-08-05 17:10:16.667563785 +0200 +@@ -6,7 +6,7 @@ + + libkmplayercommon_la_SOURCES = viewarea.cpp kmplayerview.cpp playlistview.cpp kmplayercontrolpanel.cpp kmplayerconfig.cpp pref.cpp kmplayerprocess.cpp kmplayer_callback.skel kmplayer_backend.stub kmplayerpartbase.cpp kmplayerplaylist.cpp kmplayer_asx.cpp kmplayer_smil.cpp kmplayer_rp.cpp kmplayer_rss.cpp kmplayer_atom.cpp kmplayer_xspf.cpp triestring.cpp kmplayerpartbase.skel + libkmplayercommon_la_LDFLAGS = -avoid-version $(all_libraries) +-libkmplayercommon_la_LIBADD = -lkmediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS) ++libkmplayercommon_la_LIBADD = -lkmediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS) $(LIB_QT) -lDCOP $(LIB_KDECORE) -lkdefx $(LIB_KDEUI) $(LIB_KIO) + + if include_koffice_support + kofficeplugin_lib= libkmplayerkofficepart.la +--- kmplayer/src/Makefile.am.ORI 2011-12-03 23:22:01.601981533 +0100 ++++ kmplayer/src/Makefile.am 2011-12-03 23:22:44.469655046 +0100 +@@ -58,6 +58,7 @@ + kgstplayer_SOURCES= gstplayer.cpp + + knpplayer_LDADD= $(LIBNSPR_LIBS) ++knpplayer_LDFLAGS= -lX11 -lgmodule-2.0 + knpplayer_SOURCES= npplayer.c + + xdg_apps_DATA = kmplayer.desktop diff --git a/redhat/applications/kmplayer/trinity-kmplayer.spec b/redhat/applications/kmplayer/trinity-kmplayer.spec index 933e47ee2..70589fe00 100644 --- a/redhat/applications/kmplayer/trinity-kmplayer.spec +++ b/redhat/applications/kmplayer/trinity-kmplayer.spec @@ -1,25 +1,32 @@ # Default version for this component %define kdecomp kmplayer -%define version 0.10.0c -%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: media player for Trinity -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 0.10.0c +Release: 2%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Multimedia @@ -28,24 +35,33 @@ Vendor: Trinity Project Packager: Francois Andriot <[email protected]> URL: http://kmplayer.kde.org -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz -Patch0: kmplayer-3.5.13-ftbfs.patch # [kmplayer] Fix compilation with GCC 4.7 [Commit #5106117b] Patch1: kmplayer-3.5.13-fix_gcc47_compilation.patch +# [kmplayer] Missing LDLFLAGS cause FTBFS +Patch2: kmplayer-3.5.13-missing_ldflags.patch + BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils -BuildRequires: libXv-devel BuildRequires: dbus-tqt-devel + +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}gstreamer0.10-devel +BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel +BuildRequires: libxv-devel +%else BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel +BuildRequires: libXv-devel +%endif Requires: %{name}-base @@ -96,16 +112,15 @@ Documention for KMPlayer, a basic audio/video viewer application for KDE. %prep -unset QTDIR; . /etc/profile.d/qt.sh %setup -q -n applications/%{kdecomp} -%patch0 -p1 %patch1 -p1 +%patch2 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -114,87 +129,98 @@ unset QTDIR; . /etc/profile.d/qt.sh %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt:%{_includedir}/dbus-1.0 \ - --enable-closure + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/dbus-1.0 \ + --enable-closure + %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} %find_lang %{kdecomp} +# Removes unwanted files +%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop + + %clean %__rm -rf %{buildroot} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : %post base -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : /sbin/ldconfig || : %postun base -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : /sbin/ldconfig || : -%post konq-plugins -p /sbin/ldconfig -%postun konq-plugins -p /sbin/ldconfig - %files -f %{kdecomp}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm -%{_bindir}/kmplayer -%{_bindir}/knpplayer -%{_bindir}/kxvplayer -%{_libdir}/libkdeinit_kmplayer.la -%{_libdir}/libkdeinit_kmplayer.so -%{tde_libdir}/kmplayer.la -%{tde_libdir}/kmplayer.so -%{_datadir}/applications/kde/kmplayer.desktop -%{_datadir}/apps/kmplayer -%exclude %{_datadir}/mimelnk/application/x-mplayer2.desktop -%{_datadir}/services/kmplayer_part.desktop +%{tde_bindir}/kmplayer +%{tde_bindir}/knpplayer +%{tde_bindir}/kxvplayer +%{tde_libdir}/libkdeinit_kmplayer.la +%{tde_libdir}/libkdeinit_kmplayer.so +%{tde_tdelibdir}/kmplayer.la +%{tde_tdelibdir}/kmplayer.so +%{tde_tdeappdir}/kmplayer.desktop +%{tde_datadir}/apps/kmplayer +%{tde_datadir}/services/kmplayer_part.desktop %files base %defattr(-,root,root,-) -%{_libdir}/libkmplayercommon.la -%{_libdir}/libkmplayercommon.so -%{_bindir}/kgstplayer -%{_bindir}/kxineplayer -%{_datadir}/config/kmplayerrc -%{_datadir}/apps/kmplayer/bookmarks.xml -%{_datadir}/apps/kmplayer/noise.gif -%{_datadir}/apps/kmplayer/pluginsinfo -%{_datadir}/icons/hicolor/*/apps/kmplayer.png -%{_datadir}/icons/hicolor/*/apps/kmplayer.svgz -%{_datadir}/mimelnk/application/x-kmplayer.desktop -%{_datadir}/mimelnk/video/x-ms-wmp.desktop +%{tde_libdir}/libkmplayercommon.la +%{tde_libdir}/libkmplayercommon.so +%{tde_bindir}/kgstplayer +%{tde_bindir}/kxineplayer +%{tde_datadir}/config/kmplayerrc +%{tde_datadir}/apps/kmplayer/bookmarks.xml +%{tde_datadir}/apps/kmplayer/noise.gif +%{tde_datadir}/apps/kmplayer/pluginsinfo +%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png +%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz +%{tde_datadir}/mimelnk/application/x-kmplayer.desktop +%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop %files doc %defattr(-,root,root,-) -%{tde_docdir}/HTML/*/kmplayer +%{tde_tdedocdir}/HTML/*/kmplayer %files konq-plugins %defattr(-,root,root,-) -%{tde_libdir}/libkmplayerpart.la -%{tde_libdir}/libkmplayerpart.so -%{_datadir}/apps/kmplayer/kmplayerpartui.rc -%{_datadir}/apps/kmplayer/pluginsinfo -%{_datadir}/services/kmplayer_part.desktop +%{tde_tdelibdir}/libkmplayerpart.la +%{tde_tdelibdir}/libkmplayerpart.so +%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc +%{tde_datadir}/apps/kmplayer/pluginsinfo +%{tde_datadir}/services/kmplayer_part.desktop %Changelog |