Author: thl Update of /cvs/free/rpms/audacious-plugins-freeworld/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv18783 Modified Files: .cvsignore sources Added Files: audacious-aac.desktop audacious-alac.desktop audacious-mp3.desktop audacious-plugins-1.3.4-sse-disable.patch audacious-plugins-freeworld.spec audacious-wma.desktop Log Message: sync with devel (after importing from livna there) --- NEW FILE audacious-aac.desktop --- [Desktop Entry] Name=Audacious Comment=Play music Comment[hu]=Zene lejátszása Exec=audacious Icon=audacious.png MimeType=audio/aac; Categories=GTK;AudioVideo;Player; Terminal=false Type=Application Encoding=UTF-8 X-Desktop-File-Install-Version=0.10 NoDisplay=true --- NEW FILE audacious-alac.desktop --- [Desktop Entry] Name=Audacious Comment=Play music Comment[hu]=Zene lejátszása Exec=audacious Icon=audacious.png MimeType=audio/alac; Categories=GTK;AudioVideo;Player; Terminal=false Type=Application Encoding=UTF-8 X-Desktop-File-Install-Version=0.10 NoDisplay=true --- NEW FILE audacious-mp3.desktop --- [Desktop Entry] Name=Audacious Comment=Play music Comment[hu]=Zene lejátszása Exec=audacious Icon=audacious.png MimeType=audio/mpeg; Categories=GTK;AudioVideo;Player; Terminal=false Type=Application Encoding=UTF-8 X-Desktop-File-Install-Version=0.10 NoDisplay=true audacious-plugins-1.3.4-sse-disable.patch: --- NEW FILE audacious-plugins-1.3.4-sse-disable.patch --- diff -uNr audacious-plugins-1.3.4-orig/configure audacious-plugins-1.3.4/configure --- audacious-plugins-1.3.4-orig/configure 2007-05-04 12:50:56.000000000 +0200 +++ audacious-plugins-1.3.4/configure 2007-06-01 11:57:01.000000000 +0200 @@ -1431,6 +1431,8 @@ --disable-esd disable esound output plugin default=enabled --disable-pulse disable PulseAudio output plugin default=enabled --disable-coreaudio disable CoreAudio output plugin (default=enabled) + --disable-altivec disable AltiVec support. (default=enabled) + --disable-sse2 disable SSE2 support. (default=enabled) --disable-mp3 disable mp3 plugin. (default=enabled) --disable-rocklight disable Rocklight vis plugin (default=enabled) --disable-lirc disable LIRC plugin (default=enabled) @@ -7574,6 +7576,15 @@ fi +# Check whether --enable-altivec was given. +if test "${enable_altivec+set}" = set; then + enableval=$enable_altivec; enable_altivec=$enableval +else + enable_altivec=yes + +fi + +if test "x$enable_altivec" = "xyes"; then for ac_header in altivec.h do @@ -7729,8 +7740,8 @@ #define ARCH_POWERPC 1 _ACEOF - DCT64=dct64_altivec.c - SIMD_CFLAGS=-maltivec + DCT64=dct64_altivec.c + SIMD_CFLAGS=-maltivec else DCT64=dct64.c @@ -7739,14 +7750,24 @@ done +fi + +# Check whether --enable-sse2 was given. +if test "${enable_sse2+set}" = set; then + enableval=$enable_sse2; enable_sse2=$enableval +else + enable_sse2=yes + +fi -{ echo "$as_me:$LINENO: checking SSE2" >&5 +if test "x$enable_sse2" = "xyes"; then + { echo "$as_me:$LINENO: checking SSE2" >&5 echo $ECHO_N "checking SSE2... $ECHO_C" >&6; } -ac_save_CFLAGS="$CFLAGS" -CFLAGS="-msse2" -if test "$cross_compiling" = yes; then + ac_save_CFLAGS="$CFLAGS" + CFLAGS="-msse2" + if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling @@ -7760,12 +7781,12 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <emmintrin.h> -int main() -{ - _mm_setzero_pd(); - return 0; -} + #include <emmintrin.h> + int main() + { + _mm_setzero_pd(); + return 0; + } _ACEOF rm -f conftest$ac_exeext @@ -7795,7 +7816,7 @@ #define HAVE_SSE2 1 _ACEOF -SIMD_CFLAGS=-msse2 + SIMD_CFLAGS=-msse2 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 @@ -7809,6 +7830,7 @@ fi +fi CFLAGS="$ac_save_CFLAGS" diff -uNr audacious-plugins-1.3.4-orig/configure.ac audacious-plugins-1.3.4/configure.ac --- audacious-plugins-1.3.4-orig/configure.ac 2007-05-04 12:49:58.000000000 +0200 +++ audacious-plugins-1.3.4/configure.ac 2007-06-01 11:56:44.000000000 +0200 @@ -246,35 +246,49 @@ dnl *** AltiVec -AC_CHECK_HEADERS(altivec.h, - [AC_DEFINE(HAVE_ALTIVEC, 1, [Define to 1 if your system has AltiVec.]) - AC_DEFINE(HAVE_ALTIVEC_H, 1, [Define to 1 if your system has an altivec.h file.]) - AC_DEFINE(ARCH_POWERPC, 1, [Define to 1 if your system is a PowerPC.]) - DCT64=dct64_altivec.c - SIMD_CFLAGS=-maltivec - AC_SUBST(SIMD_CFLAGS)], - [DCT64=dct64.c] -) +AC_ARG_ENABLE(altivec, + [ --disable-altivec disable AltiVec support. (default=enabled) ], + [enable_altivec=$enableval], + [enable_altivec=yes] +) +if test "x$enable_altivec" = "xyes"; then + AC_CHECK_HEADERS(altivec.h, + [AC_DEFINE(HAVE_ALTIVEC, 1, [Define to 1 if your system has AltiVec.]) + AC_DEFINE(HAVE_ALTIVEC_H, 1, [Define to 1 if your system has an altivec.h file.]) + AC_DEFINE(ARCH_POWERPC, 1, [Define to 1 if your system is a PowerPC.]) + DCT64=dct64_altivec.c + SIMD_CFLAGS=-maltivec + AC_SUBST(SIMD_CFLAGS)], + [DCT64=dct64.c] + ) +fi AC_SUBST(DCT64) dnl *** SSE2 -AC_MSG_CHECKING(SSE2) -ac_save_CFLAGS="$CFLAGS" -CFLAGS="-msse2" -AC_TRY_RUN([ -#include <emmintrin.h> -int main() -{ - _mm_setzero_pd(); - return 0; -} -], -[AC_MSG_RESULT(SSE2 yes) -AC_DEFINE(HAVE_SSE2, 1, [Define to 1 if your system has SSE2]) -SIMD_CFLAGS=-msse2], -[AC_MSG_RESULT(SSE2 no)], -) +AC_ARG_ENABLE(sse2, + [ --disable-sse2 disable SSE2 support. (default=enabled) ], + [enable_sse2=$enableval], + [enable_sse2=yes] +) +if test "x$enable_sse2" = "xyes"; then + AC_MSG_CHECKING(SSE2) + ac_save_CFLAGS="$CFLAGS" + CFLAGS="-msse2" + AC_TRY_RUN([ + #include <emmintrin.h> + int main() + { + _mm_setzero_pd(); + return 0; + } + ], + [AC_MSG_RESULT(SSE2 yes) + AC_DEFINE(HAVE_SSE2, 1, [Define to 1 if your system has SSE2]) + SIMD_CFLAGS=-msse2], + [AC_MSG_RESULT(SSE2 no)], + ) +fi AC_SUBST(SIMD_CFLAGS) CFLAGS="$ac_save_CFLAGS" --- NEW FILE audacious-plugins-freeworld.spec --- %define aud_ver 1.4.0 Name: audacious-plugins-freeworld Version: 1.4.5 Release: 2%{?dist} Summary: Additional plugins for the Audacious media player Group: Applications/Multimedia License: GPLv2 URL: http://audacious-media-player.org/ Source0: http://static.audacious-media-player.org/release/audacious-plugins-%{vers... Source1: audacious-mp3.desktop Source2: audacious-aac.desktop Source3: audacious-wma.desktop Source4: audacious-alac.desktop Patch0: audacious-plugins-1.3.4-sse-disable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: audacious-devel >= %{aud_ver} BuildRequires: zlib-devel, desktop-file-utils >= 0.9 BuildRequires: taglib-devel >= 1.4 BuildRequires: lame-devel, libmms-devel, libmad-devel BuildRequires: gettext, libbinio-devel BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60 # require all the plugins Requires: %{name}-mp3 = %{version}-%{release} Requires: %{name}-aac = %{version}-%{release} Requires: %{name}-wma = %{version}-%{release} Requires: %{name}-alac = %{version}-%{release} Requires: %{name}-tta = %{version}-%{release} Requires: %{name}-mms = %{version}-%{release} # obsolete old freshrpms package Provides: audacious-plugins-extras = %{version}-%{release} Obsoletes: audacious-plugins-extras < %{version}-%{release} %description Audacious is a media player that currently uses a skinned user interface based on Winamp 2.x skins. It is based on ("forked off") BMP. %package mp3 Summary: MP3 playback plugin for Audacious Group: Applications/Multimedia Requires: audacious-plugins >= %{aud_ver} Requires(post): desktop-file-utils >= 0.9 Requires(postun): desktop-file-utils >= 0.9 Provides: bmp-mp3 = 0.9.7.1 Obsoletes: bmp-mp3 <= 0.9.7.1 # obsolete old livna package Provides: audacious-plugins-nonfree-mp3 = %{version}-%{release} Obsoletes: audacious-plugins-nonfree-mp3 < %{version}-%{release} %description mp3 Audacious is a media player that currently uses a skinned user interface based on Winamp 2.x skins. It is based on ("forked off") BMP. This is the plugin needed to play MP3 audio files. %package aac Summary: AAC playback plugin for Audacious Group: Applications/Multimedia Requires: audacious-plugins >= %{aud_ver} Requires(post): desktop-file-utils >= 0.9 Requires(postun): desktop-file-utils >= 0.9 # obsolete old livna package Provides: audacious-plugins-nonfree-aac = %{version}-%{release} Obsoletes: audacious-plugins-nonfree-aac < %{version}-%{release} %description aac Audacious is a media player that currently uses a skinned user interface based on Winamp 2.x skins. It is based on ("forked off") BMP. This is the plugin needed to play AAC audio files. %package wma Summary: WMA playback plugin for Audacious Group: Applications/Multimedia Requires: audacious-plugins >= %{aud_ver} Requires(post): desktop-file-utils >= 0.9 Requires(postun): desktop-file-utils >= 0.9 # obsolete old livna package Provides: audacious-plugins-nonfree-wma = %{version}-%{release} Obsoletes: audacious-plugins-nonfree-wma < %{version}-%{release} %description wma Audacious is a media player that currently uses a skinned user interface based on Winamp 2.x skins. It is based on ("forked off") BMP. This is the plugin needed to play WMA audio files. %package alac Summary: ALAC playback plugin for Audacious Group: Applications/Multimedia Requires: audacious-plugins >= %{aud_ver} Requires(post): desktop-file-utils >= 0.9 Requires(postun): desktop-file-utils >= 0.9 # obsolete old livna package Provides: audacious-plugins-nonfree-alac = %{version}-%{release} Obsoletes: audacious-plugins-nonfree-alac < %{version}-%{release} %description alac Audacious is a media player that currently uses a skinned user interface based on Winamp 2.x skins. It is based on ("forked off") This is the plugin needed to play ALAC (Apple Lossless Audio Codec) audio files. %package tta Summary: TTA playback plugin for Audacious Group: Applications/Multimedia Requires: audacious-plugins >= %{aud_ver} # obsolete old livna package Provides: audacious-plugins-nonfree-tta = %{version}-%{release} Obsoletes: audacious-plugins-nonfree-tta < %{version}-%{release} %description tta Audacious is a media player that currently uses a skinned user interface based on Winamp 2.x skins. It is based on ("forked off") This is the plugin needed to play TTA audio files. %package mms Summary: MMS stream plugin for Audacious Group: Applications/Multimedia Requires: audacious-plugins >= %{aud_ver} # obsolete old livna package Provides: audacious-plugins-nonfree-mms = %{version}-%{release} Obsoletes: audacious-plugins-nonfree-mms < %{version}-%{release} %description mms Audacious is a media player that currently uses a skinned user interface based on Winamp 2.x skins. It is based on ("forked off") BMP. This is the plugin needed to access MMS streams. %prep %setup -q -n audacious-plugins-%{version} # Disable SSE2/AltiVec # %patch0 -p1 -b .sse-disable %build %configure \ --disable-rpath \ --enable-gconf \ --disable-gnome-vfs \ --enable-chardet \ --disable-amidiplug \ --disable-adplug \ --disable-esd \ --disable-lirc \ --disable-sndfile \ --disable-modplug \ --disable-flac \ --disable-jack \ --disable-arts \ --disable-sid \ --disable-alsa \ --disable-musepack \ --disable-timidity \ --disable-vorbis \ --disable-xspf \ --disable-paranormal \ --disable-sse2 \ --disable-altivec \ --disable-dependency-tracking make V=1 %{?_smp_mflags} -C src/madplug make V=1 %{?_smp_mflags} -C src/aac make V=1 %{?_smp_mflags} -C src/wma make V=1 %{?_smp_mflags} -C src/alac make V=1 %{?_smp_mflags} -C src/tta make V=1 %{?_smp_mflags} -C src/mms %install rm -rf $RPM_BUILD_ROOT make -C src/madplug install DESTDIR=$RPM_BUILD_ROOT make -C src/aac install DESTDIR=$RPM_BUILD_ROOT make -C src/wma install DESTDIR=$RPM_BUILD_ROOT make -C src/alac install DESTDIR=$RPM_BUILD_ROOT make -C src/tta install DESTDIR=$RPM_BUILD_ROOT make -C src/mms install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor livna \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} desktop-file-install --vendor livna \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} desktop-file-install --vendor livna \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE3} desktop-file-install --vendor livna \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE4} find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post mp3 update-desktop-database %{_datadir}/applications %postun mp3 update-desktop-database %{_datadir}/applications %post aac update-desktop-database %{_datadir}/applications %postun aac update-desktop-database %{_datadir}/applications %post wma update-desktop-database %{_datadir}/applications %postun wma update-desktop-database %{_datadir}/applications %post alac update-desktop-database %{_datadir}/applications %postun alac update-desktop-database %{_datadir}/applications %files %defattr(-,root,root,-) %doc COPYING %files mp3 %defattr(-,root,root,-) %{_libdir}/audacious/Input/madplug.so %{_datadir}/applications/livna-audacious-mp3.desktop %files aac %defattr(-,root,root,-) %{_libdir}/audacious/Input/aac.so %{_datadir}/applications/livna-audacious-aac.desktop %files wma %defattr(-,root,root,-) %{_libdir}/audacious/Input/wma.so %{_datadir}/applications/livna-audacious-wma.desktop %files alac %defattr(-,root,root,-) %{_libdir}/audacious/Input/alac.so %{_datadir}/applications/livna-audacious-alac.desktop %files tta %defattr(-,root,root,-) %{_libdir}/audacious/Input/tta.so %files mms %defattr(-,root,root,-) %{_libdir}/audacious/Transport/mms.so %changelog * Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.4.5-2 - obsolete nonfree -plugins from livna - add metapackage that requires all the plugins and obsoletes the -extras package from freshrpms * Tue Feb 12 2008 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.4.5-1 - Update to 1.4.5 * Wed Jan 02 2008 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.4.4-1 - Update to 1.4.4 * Wed Dec 12 2007 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.4.2-1 - Update to 1.4.2 * Thu Nov 22 2007 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.4.1-2 - Update to 1.4.1 * Sat Jun 09 2007 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.3.5-1.fc8 - Update to 1.3.5 - Disable SSE2 patch (now upsteam) * Fri Jun 01 2007 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.3.4-2.fc8 - Disable SSE2/AltiVec * Sat May 26 2007 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.3.4-1.fc8 - Update to 1.3.4 * Sun Apr 22 2007 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.3.3-1.fc7 - Update to 1.3.3 - Introduce aud_ver variable into specfile * Thu Apr 12 2007 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.3.2-1.fc7 - Update to 1.3.2 * Wed Apr 04 2007 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.3.1-3.fc7 - Update to 1.3.1 * Thu Nov 30 2006 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.2.5-1.fc7 - Update to 1.2.5 * Fri Nov 10 2006 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.2.2-1.fc7 - Update to 1.2.2 * Tue Nov 7 2006 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.1.2-7.fc7 - Rebuild without gnome-vfs and Require: the correct audacious version - Drop "X-Livna" and "Application" category from .desktop file * Sat Oct 21 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info 1.1.2-5 - require audacious, not audacious-plugins-nonfree * Wed Oct 18 2006 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.1.2-4.fc6 - Add obsoletes/provides against bmp-mp3 * Mon Oct 16 2006 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.1.2-2.fc6 - Fix directory name on %%setup * Wed Sep 06 2006 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.1.2-1.fc6 - Update to 1.1.2 * Tue Aug 15 2006 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.1.1-4.fc6 - Properly add Requires(post/postun) - Carry over changes from main audacious-1.1.1-4 package * Sun Aug 01 2006 Ralf Ertzinger <ralf(a)skytale.net&gt; 1.1.1-3.fc6 - Initial RPM for livna --- NEW FILE audacious-wma.desktop --- [Desktop Entry] Name=Audacious Comment=Play music Comment[hu]=Zene lejátszása Exec=audacious Icon=audacious.png MimeType=audio/x-ms-wma; Categories=GTK;AudioVideo;Player; Terminal=false Type=Application Encoding=UTF-8 X-Desktop-File-Install-Version=0.10 NoDisplay=true Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:47:58 -0000 1.1 +++ .cvsignore 19 Oct 2008 11:51:28 -0000 1.2 @@ -0,0 +1 @@ +audacious-plugins-1.4.5.tgz Index: sources =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:47:58 -0000 1.1 +++ sources 19 Oct 2008 11:51:28 -0000 1.2 @@ -0,0 +1 @@ +ecb7802c1800ed2b10b44e7e9fea46aa audacious-plugins-1.4.5.tgz