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 ^ |
|
x 1 2 # norootforbuild3 4 -%bcond_with ggi5 -6 %define libvlc 57 %define libvlccore 48 9 Name: vlc10 Version: 1.1.1011 Release: 2012 +13 Summary: VLC - Video Lan Client14 URL: http://www.videolan.org/15 License: GNU General Public License (GPL)16 17 18 Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.bz219 20 -Patch0: %{name}-fix_font_path.patch21 -Patch1: %{name}-no_return_in_non_void.patch22 -Patch2: %{name}-buildcompare.patch23 -Patch3: %{name}-opencv22.patch24 -Patch4: %{name}-errno_h.patch25 -Patch5: %{name}-asserts_h.patch26 -# pbleser adds X-KDE-Protocols=http,ftp,smb,sftp to vlc.desktop to enable proper streaming in KDE, thanks to martin.frueh@online.de27 -Patch7: %{name}-add_X-KDE-Protocols_to_desktop.patch28 +Patch0: vlc-fix_font_path.patch29 +Patch1: vlc-no_return_in_non_void.patch30 +Patch2: vlc-buildcompare.patch31 +Patch3: vlc-opencv22.patch32 +Patch4: vlc-errno_h.patch33 +Patch5: vlc-asserts_h.patch34 35 Requires: vlc-noX = %{version}-%{release}36 Requires: vlc-qt = %{version}-%{release}37 38 BuildRoot: %{_tmppath}/%{name}-%{version}-build39 40 ### base ###41 -BuildRequires: fdupes fribidi-devel liba52-devel libffmpeg-devel42 +BuildRequires: fdupes fribidi-devel liba52-devel libffmpeg_oldabi-devel43 BuildRequires: libgcrypt-devel libmad-devel libqt4-devel lua-devel44 BuildRequires: update-desktop-files45 46 47 BuildRequires: librsvg-devel libshout-devel libsmbclient-devel 48 BuildRequires: libtwolame-devel libudev-devel libupnp-devel libv4l-devel49 BuildRequires: libxml2-devel live-devel portaudio-devel 50 -BuildRequires: sqlite3-devel taglib-devel valgrind-devel zvbi-devel51 +BuildRequires: sqlite3-devel libtag-devel valgrind-devel zvbi-devel52 BuildRequires: libprojectM-devel libfaad-devel53 -BuildRequires: SDL-devel54 +BuildRequires: schroedinger-devel55 +BuildRequires: SDL-devel SDL_image-devel56 57 %ifnarch ppc58 BuildRequires: fluidsynth-devel59 %endif60 61 -%if %suse_version >= 112062 +%if 0%{?suse_version} >= 112063 BuildRequires: libva-devel libvdpau-devel64 %endif65 66 -%if %suse_version <= 112067 +%if 0%{?suse_version} <= 112068 BuildRequires: goom2k4-devel69 %endif70 71 -%if %suse_version >= 1120 || 0%{?sles_version} >= 1172 +%if 0%{?suse_version} >= 114073 BuildRequires: libpulse-devel74 %endif75 76 -%if %suse_version > 112077 -BuildRequires: libnotify178 +%if 0%{?suse_version} > 112079 +BuildRequires: libSDL_image-devel80 +#libnotify181 %endif82 83 -%if %suse_version > 113084 +%if 0%{?suse_version} > 113085 BuildRequires: gtk2-devel86 %endif87 88 89 BuildRequires: aalib-devel90 BuildRequires: libdca-devel91 BuildRequires: DirectFB-devel libid3tag-devel92 -%if %{with ggi}93 -BuildRequires: libggi-devel94 -%endif95 -%if %suse_version >= 1120 || 0%{?sles_version} >= 1196 +%if 0%{?suse_version} <= 113097 +%if 0%{?suse_version} >= 112098 BuildRequires: mozilla-xulrunner192-devel99 %endif100 +%else101 +BuildRequires: mozilla-xulrunner20-devel102 +%endif103 BuildRequires: opencv-devel104 BuildRequires: pcre-devel vcdimager-devel xosd-devel105 106 107 -%if %suse_version >= 1120108 +%if 0%{?suse_version} >= 1120109 BuildRequires: lirc-devel110 %else111 BuildRequires: lirc112 113 for gnome-vfs2.114 115 116 -%if %suse_version >= 1120 || 0%{?sles_version} >= 11117 +%if 0%{?suse_version} >= 1120118 %package mozillaplugin119 Summary: The mozilaplugin enables VLC inside Mozilla Browser120 Group: Productivity/Multimedia/Video/Players121 122 %endif123 124 125 -%if %suse_version >= 1120 || 0%{?sles_version} >= 11126 +%if 0%{?suse_version} >= 1140127 %package aout-pulse128 Summary: VLC Audio Out for Pulse Audio129 Group: System/Libraries130 131 Extends VLC with Pulse Audio Support for Audio Out132 %endif133 134 -135 -136 -137 -138 %prep139 -%setup -q -n %{name}-%{version}140 +%setup -q141 %patch0 -p1142 %patch1 -p1143 %patch2144 %patch3 -p1145 %patch4 -p1146 %patch5 -p1147 -%patch7148 -149 -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')150 -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" modules/gui/qt4/dialogs/help.cpp src/libvlc.c151 -FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')152 -sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" modules/gui/qt4/dialogs/help.cpp src/libvlc.c153 154 +%__grep --exclude='*.orig' -r -E '__(DATE|TIME)__' . && { echo "Found __DATE__ and/or __TIME__ !"; exit 1; }155 156 %build157 export SUSE_ASNEEDED=1158 159 --enable-directfb \160 --enable-faad \161 --enable-fbosd \162 -%if %{with ggi}163 - --enable-ggi \164 -%endif165 %ifarch ppc166 --disable-fluidsynth \167 %endif168 --enable-id3tag \169 --enable-lirc \170 -%if %suse_version >= 1120 || 0%{?sles_version} >= 11171 +%if 0%{?suse_version} >= 1120172 --enable-mozilla \173 %endif174 --enable-ncurses \175 176 --enable-v4l \177 --enable-vcdx \178 --enable-wma-fixed \179 -%if %suse_version >= 1120180 +%if 0%{?suse_version} >= 1120181 --enable-libva \182 %endif183 --enable-xosd184 185 %suse_update_desktop_file %name AudioVideo Player Video186 187 188 -%if %suse_version >= 1120 || 0%{?sles_version} >= 11189 +%if 0%{?suse_version} >= 1120190 %__install -d %{buildroot}/%{_libdir}/browser-plugins/191 %__ln_s %{_libdir}/mozilla/plugins/libvlcplugin.so %{buildroot}/%{_libdir}/browser-plugins/libvlcplugin.so192 %endif193 194 %post -n libvlccore%{libvlccore} -p /sbin/ldconfig195 %postun -n libvlccore%{libvlccore} -p /sbin/ldconfig196 197 -198 -199 %files200 %defattr(-,root,root)201 |
||
| [+] | 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 ^ | |