diff options
Diffstat (limited to 'redhat/applications/multimedia')
8 files changed, 63 insertions, 47 deletions
diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec index e26f7d276..04fb0fc54 100644 --- a/redhat/applications/multimedia/amarok/amarok.spec +++ b/redhat/applications/multimedia/amarok/amarok.spec @@ -89,7 +89,7 @@ BuildRequires: brp-check-trinity %endif # ALSA supportl -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel @@ -173,13 +173,17 @@ BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 %if 0%{?pclinuxos} == 0 %if ( 0%{?fedora} && 0%{?fedora} <= 40 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_ifp 1 +%if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}ifp-devel +%else +BuildRequires: libifp-devel +%endif %endif %endif # KARMA support %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 24090000 +%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 5000000 %define with_karma 1 BuildRequires: libkarma-devel BuildRequires: karma-sharp @@ -268,7 +272,7 @@ BuildRequires: xine-lib-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define with_xine 1 -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel @@ -292,7 +296,7 @@ BuildRequires: trinity-akode-devel # MP4V2 support %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%if 0%{?mdkver} < 24090000 +%if 0%{?mdkver} < 5000000 %define with_mp4v2 1 BuildRequires: libmp4v2-devel %endif diff --git a/redhat/applications/multimedia/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec index 8dad74e8c..6cfb3e002 100644 --- a/redhat/applications/multimedia/codeine/codeine.spec +++ b/redhat/applications/multimedia/codeine/codeine.spec @@ -81,7 +81,7 @@ BuildRequires: brp-check-trinity %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel diff --git a/redhat/applications/multimedia/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec index ddbdf76df..3a4fe93d1 100644 --- a/redhat/applications/multimedia/k3b/k3b.spec +++ b/redhat/applications/multimedia/k3b/k3b.spec @@ -78,7 +78,7 @@ BuildRequires: brp-check-trinity %endif # ALSA supportl -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel @@ -91,7 +91,11 @@ BuildRequires: zlib-devel # VORBIS support %if 0%{?mdkver} || 0%{?mgaversion} +%if 0%{?pclinuxos} +%define libvorbis_devel %{_lib}vorbis0-devel +%else %define libvorbis_devel %{_lib}vorbis-devel +%endif %else %define libvorbis_devel libvorbis-devel %endif @@ -152,7 +156,11 @@ Requires: cdrdao # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif diff --git a/redhat/applications/multimedia/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec index 69ac53556..8aa140484 100644 --- a/redhat/applications/multimedia/k9copy/k9copy.spec +++ b/redhat/applications/multimedia/k9copy/k9copy.spec @@ -89,24 +89,20 @@ BuildRequires: libdvdread-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel %endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-Mesa-libGLU -%endif %description diff --git a/redhat/applications/multimedia/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec index e445da856..7e7ce9826 100644 --- a/redhat/applications/multimedia/kaffeine/kaffeine.spec +++ b/redhat/applications/multimedia/kaffeine/kaffeine.spec @@ -80,7 +80,11 @@ BuildRequires: brp-check-trinity # VORBIS support %if 0%{?mdkver} || 0%{?mgaversion} +%if 0%{?pclinuxos} +%define libvorbis_devel %{_lib}vorbis0-devel +%else %define libvorbis_devel %{_lib}vorbis-devel +%endif %else %define libvorbis_devel libvorbis-devel %endif @@ -143,7 +147,7 @@ BuildRequires: %{_lib}xcb-devel %if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_gstreamer 1 %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gstreamer-devel BuildRequires: %{_lib}gst-plugins-base1.0-devel %else @@ -169,7 +173,7 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec index 09a2fd48b..7aee31397 100644 --- a/redhat/applications/multimedia/kmplayer/kmplayer.spec +++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec @@ -84,7 +84,7 @@ BuildRequires: trinity-dbus-tqt-devel >= %{tde_version} # GSTREAMER support %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gstreamer-devel BuildRequires: %{_lib}gst-plugins-base1.0-devel %else @@ -109,7 +109,7 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel @@ -139,7 +139,7 @@ BuildRequires: xorg-x11-libXv-devel %endif # GTK2 stuff -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gtk+2.0-devel %else BuildRequires: gtk2-devel diff --git a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec index e1830719f..1eaf26d39 100644 --- a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec +++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec @@ -169,7 +169,7 @@ fi %{tde_datadir}/services/mplayer-thumbnailer.desktop %{tde_tdedocdir}/HTML/en/mplayer-thumbnailer/ %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/mplayer-thumbnailer.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/mplayer-thumbnailer.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/mplayer-thumbnailer.mo - %changelog diff --git a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec index 6b713c452..0b13bf8cf 100644 --- a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec +++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -133,40 +133,45 @@ See the 'trinity-soundkonverter' package for more information. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --program-prefix="" \ +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} + -DWITH_ALL_OPTIONS=ON \ + %{?!with_dvb:-DWITH_DVB=OFF} \ + %{?!with_lame:-DWITH_LAME=OFF} \ + %{?!with_xcb:-DWITH_XCB=OFF} \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -182,9 +187,8 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS ChangeLog COPYING README %{tde_bindir}/soundkonverter -%{tde_bindir}/userscript.sh %{tde_tdeappdir}/soundkonverter.desktop %{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop %{tde_datadir}/apps/soundkonverter |