Changes - j0ke.net Open Build Service

Changes of Revision 16

[-] [+]	Deleted	vlc.changes
@@ -1,5 +0,0 @@ -------------------------------------------------------------------- -Sat Mar 26 17:05:22 UTC 2011 - cs@linux-administrator.com - -- re-import -
[-] [+]	Changed	vlc.spec ^
@@ -1,13 +1,12 @@ # norootforbuild -%bcond_with ggi - %define libvlc 5 %define libvlccore 4 Name: vlc Version: 1.1.10 Release: 20 + Summary: VLC - Video Lan Client URL: http://www.videolan.org/ License: GNU General Public License (GPL) @@ -15,14 +14,12 @@ Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.bz2 -Patch0: %{name}-fix_font_path.patch -Patch1: %{name}-no_return_in_non_void.patch -Patch2: %{name}-buildcompare.patch -Patch3: %{name}-opencv22.patch -Patch4: %{name}-errno_h.patch -Patch5: %{name}-asserts_h.patch -# pbleser adds X-KDE-Protocols=http,ftp,smb,sftp to vlc.desktop to enable proper streaming in KDE, thanks to martin.frueh@online.de -Patch7: %{name}-add_X-KDE-Protocols_to_desktop.patch +Patch0: vlc-fix_font_path.patch +Patch1: vlc-no_return_in_non_void.patch +Patch2: vlc-buildcompare.patch +Patch3: vlc-opencv22.patch +Patch4: vlc-errno_h.patch +Patch5: vlc-asserts_h.patch Requires: vlc-noX = %{version}-%{release} Requires: vlc-qt = %{version}-%{release} @@ -31,7 +28,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ### base ### -BuildRequires: fdupes fribidi-devel liba52-devel libffmpeg-devel +BuildRequires: fdupes fribidi-devel liba52-devel libffmpeg_oldabi-devel BuildRequires: libgcrypt-devel libmad-devel libqt4-devel lua-devel BuildRequires: update-desktop-files @@ -45,31 +42,33 @@ BuildRequires: librsvg-devel libshout-devel libsmbclient-devel BuildRequires: libtwolame-devel libudev-devel libupnp-devel libv4l-devel BuildRequires: libxml2-devel live-devel portaudio-devel -BuildRequires: sqlite3-devel taglib-devel valgrind-devel zvbi-devel +BuildRequires: sqlite3-devel libtag-devel valgrind-devel zvbi-devel BuildRequires: libprojectM-devel libfaad-devel -BuildRequires: SDL-devel +BuildRequires: schroedinger-devel +BuildRequires: SDL-devel SDL_image-devel %ifnarch ppc BuildRequires: fluidsynth-devel %endif -%if %suse_version >= 1120 +%if 0%{?suse_version} >= 1120 BuildRequires: libva-devel libvdpau-devel %endif -%if %suse_version <= 1120 +%if 0%{?suse_version} <= 1120 BuildRequires: goom2k4-devel %endif -%if %suse_version >= 1120 \|\| 0%{?sles_version} >= 11 +%if 0%{?suse_version} >= 1140 BuildRequires: libpulse-devel %endif -%if %suse_version > 1120 -BuildRequires: libnotify1 +%if 0%{?suse_version} > 1120 +BuildRequires: libSDL_image-devel +#libnotify1 %endif -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 BuildRequires: gtk2-devel %endif @@ -78,17 +77,18 @@ BuildRequires: aalib-devel BuildRequires: libdca-devel BuildRequires: DirectFB-devel libid3tag-devel -%if %{with ggi} -BuildRequires: libggi-devel -%endif -%if %suse_version >= 1120 \|\| 0%{?sles_version} >= 11 +%if 0%{?suse_version} <= 1130 +%if 0%{?suse_version} >= 1120 BuildRequires: mozilla-xulrunner192-devel %endif +%else +BuildRequires: mozilla-xulrunner20-devel +%endif BuildRequires: opencv-devel BuildRequires: pcre-devel vcdimager-devel xosd-devel -%if %suse_version >= 1120 +%if 0%{?suse_version} >= 1120 BuildRequires: lirc-devel %else BuildRequires: lirc @@ -163,7 +163,7 @@ for gnome-vfs2. -%if %suse_version >= 1120 \|\| 0%{?sles_version} >= 11 +%if 0%{?suse_version} >= 1120 %package mozillaplugin Summary: The mozilaplugin enables VLC inside Mozilla Browser Group: Productivity/Multimedia/Video/Players @@ -174,7 +174,7 @@ %endif -%if %suse_version >= 1120 \|\| 0%{?sles_version} >= 11 +%if 0%{?suse_version} >= 1140 %package aout-pulse Summary: VLC Audio Out for Pulse Audio Group: System/Libraries @@ -186,25 +186,16 @@ Extends VLC with Pulse Audio Support for Audio Out %endif - - - - %prep -%setup -q -n %{name}-%{version} +%setup -q %patch0 -p1 %patch1 -p1 %patch2 %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch7 - -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" modules/gui/qt4/dialogs/help.cpp src/libvlc.c -FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') -sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" modules/gui/qt4/dialogs/help.cpp src/libvlc.c +%__grep --exclude='*.orig' -r -E '__(DATE\|TIME)__' . && { echo "Found __DATE__ and/or __TIME__ !"; exit 1; } %build export SUSE_ASNEEDED=1 @@ -219,15 +210,12 @@ --enable-directfb \ --enable-faad \ --enable-fbosd \ -%if %{with ggi} - --enable-ggi \ -%endif %ifarch ppc --disable-fluidsynth \ %endif --enable-id3tag \ --enable-lirc \ -%if %suse_version >= 1120 \|\| 0%{?sles_version} >= 11 +%if 0%{?suse_version} >= 1120 --enable-mozilla \ %endif --enable-ncurses \ @@ -243,7 +231,7 @@ --enable-v4l \ --enable-vcdx \ --enable-wma-fixed \ -%if %suse_version >= 1120 +%if 0%{?suse_version} >= 1120 --enable-libva \ %endif --enable-xosd @@ -261,7 +249,7 @@ %suse_update_desktop_file %name AudioVideo Player Video -%if %suse_version >= 1120 \|\| 0%{?sles_version} >= 11 +%if 0%{?suse_version} >= 1120 %__install -d %{buildroot}/%{_libdir}/browser-plugins/ %__ln_s %{_libdir}/mozilla/plugins/libvlcplugin.so %{buildroot}/%{_libdir}/browser-plugins/libvlcplugin.so %endif @@ -285,10 +273,18 @@ %post -n libvlccore%{libvlccore} -p /sbin/ldconfig %postun -n libvlccore%{libvlccore} -p /sbin/ldconfig - - %files %defattr(-,root,root)
[-] [+]	Deleted	vlc-add_X-KDE-Protocols_to_desktop.patch ^
@@ -1,7 +0,0 @@ ---- share/vlc.desktop.orig 2011-03-12 13:26:16.000000000 +0100 -+++ share/vlc.desktop 2011-03-12 13:26:37.000000000 +0100 -@@ -54,3 +54,4 @@ - Type=Application - Categories=AudioVideo;Player; - MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;application/x-extension-mp4;audio/mp4;video/mp4;video/mp4v-es;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;video/x-flv; -+X-KDE-Protocols=http,ftp,smb,sftp
	Deleted	vlc-1.1.9.tar.bz2 ^