Packman Build Service PMBS

Changes of Revision 3

project.diff Deleted

@@ -1,392 +0,0 @@
---- vlc.changes.orig
-+++ vlc.changes
-@@ -1,4 +1,19 @@
- -------------------------------------------------------------------
-+Sat Oct 12 09:42:57 UTC 2013 - scarabeus@opensuse.org
-+
-+- Drop support for < 12.2 as it does not build anyway
-+  * Removal of pulseaudio subpackage and incorporating it to the
-+    noX package.
-+  * Cleanup of the dependencies and configure switches we don't
-+    need to use anymore.
-+- Add lang subpackage as it was most of what was noX package
-+  containing. This way we can reduce the size and use noarch there.
-+- Touch the ghosted file in %post to make rpmlint happy
-+- Fix __DATE__ and __TIME__ usage so we do not rebuild so often.
-+- Drop obsolete configure options which are no longer around
-+- Disable xcb switch as we no longer build for such old distros.
-+
-+-------------------------------------------------------------------
- Wed Oct  2 9:11:58 UTC 2013 - wbauer@tmo.at
- 
- - Re-add and adapt 0001-no-return-in-non-void.patch: fixes build on
---- vlc.spec.orig
-+++ vlc.spec
-@@ -17,8 +17,6 @@
- #
- 
- 
--%define pulseplugin 0%{suse_version} > 1130
--%define withxcb 0%{suse_version} > 1131
- %define libvlc 5
- %define libvlccore 7
- %define conflicts vlc-beta
-@@ -32,17 +30,19 @@
- %bcond_with opengles
- %endif
- 
--Summary:        VLC - Video Lan Client
-+Summary:        Video Lan Client multimedia player
- License:        GPL-2.0+ and LGPL-2.1+
- Group:          Productivity/Multimedia/Video/Players	
- Name:           vlc
- Version:        2.1.0
- Release:        0
- %define _version 2.1.0
-+Url:            http://www.videolan.org/
- Source:         http://download.videolan.org/vlc/%{_version}/vlc-%{_version}.tar.xz
- Patch1:         fix_font_path.patch
- Patch3:         0001-no-return-in-non-void.patch
- BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-+BuildRequires:  Mesa-devel
- BuildRequires:  aalib-devel
- BuildRequires:  alsa-devel
- BuildRequires:  avahi-devel
-@@ -51,23 +51,19 @@ BuildRequires:  flac-devel
- BuildRequires:  freetype2-devel
- BuildRequires:  fribidi-devel
- BuildRequires:  gcc-c++
--%if 0%{?suse_version} >= 1140
- BuildRequires:  gdk-pixbuf-devel
--%endif
- BuildRequires:  gettext-devel
- BuildRequires:  git
- BuildRequires:  gnome-vfs2-devel
- BuildRequires:  gnutls-devel
- BuildRequires:  gtk2-devel
-+BuildRequires:  libSDL-devel
- BuildRequires:  libass-devel
- BuildRequires:  libavc1394-devel
- BuildRequires:  libbluray-devel
- BuildRequires:  libcaca-devel
- BuildRequires:  libcddb-devel
- BuildRequires:  libcdio-devel
--%if 0%suse_version < 1140
--BuildRequires:  libdc1394_control12-devel
--%endif
- BuildRequires:  libdc1394-devel
- BuildRequires:  libdvbpsi-devel < 1.0
- BuildRequires:  libdvdnav-devel
-@@ -81,13 +77,7 @@ BuildRequires:  libmtp-devel
- BuildRequires:  libnotify-devel
- BuildRequires:  libogg-devel
- BuildRequires:  libopus-devel
--BuildRequires:  pkgconfig(dirac) >= 0.10.0
--%if 0%{?suse_version} >= 1200
--BuildRequires:  pkgconfig(libgme)
--%endif
--%if 0%{suse_version} >= 1120
- BuildRequires:  libproxy-devel
--%endif
- BuildRequires:  libqt4-devel
- BuildRequires:  libraw1394-devel
- BuildRequires:  librsvg-devel
-@@ -96,43 +86,26 @@ BuildRequires:  libshout-devel
- BuildRequires:  libsmbclient-devel
- BuildRequires:  libtheora-devel
- BuildRequires:  libtool
--%if 0%{suse_version} > 1100 
- BuildRequires:  libudev-devel
--%endif
- BuildRequires:  libupnp-devel
--%if 0%{?suse_version} > 1130
- BuildRequires:  libv4l-devel
--%endif
--%if 0%{?suse_version} > 1130
- BuildRequires:  libva-devel
--%endif
- BuildRequires:  libvorbis-devel
- BuildRequires:  libxml2-devel
- BuildRequires:  lirc-devel
- BuildRequires:  live555-devel
--%if 0%{?suse_version} >= 1220
- BuildRequires:  lua51-devel
--%else
--BuildRequires:  lua-devel
--%endif
--BuildRequires:  Mesa-devel
--%if %{?with_ncurses}
--BuildRequires:  ncurses-devel
--%endif
- BuildRequires:  pcre-devel
- BuildRequires:  pulseaudio-devel
- BuildRequires:  schroedinger-devel
--%if 0%{suse_version} < 1120
--BuildRequires:  SDL-devel
--%else
--BuildRequires:  libSDL-devel
--%endif
- BuildRequires:  slang-devel
- BuildRequires:  speex-devel
- BuildRequires:  taglib-devel
- BuildRequires:  vcdimager-devel
- BuildRequires:  xosd-devel
- BuildRequires:  zvbi-devel
-+BuildRequires:  pkgconfig(dirac) >= 0.10.0
-+BuildRequires:  pkgconfig(libgme)
- # This is intentionally done the pkgconfig way: 3rd party repos might have alternative implementations
- # and can favor one over the other.
- BuildRequires:  pkgconfig(libswscale)
-@@ -141,6 +114,10 @@ BuildRequires:  pkgconfig(libswscale)
- BuildRequires:  findutils
- BuildRequires:  update-desktop-files
- BuildRequires:  xz
-+# ncurses are not ready so far
-+%if %{?with_ncurses}
-+BuildRequires:  ncurses-devel
-+%endif
- # Those are dependencies which are NOT provided in openSUSE, mostly for legal reasons.
- %if 0%{?BUILD_ORIG}
- BuildRequires:  faad2-devel
-@@ -200,6 +177,12 @@ Requires:       libvlc%{libvlc} = %{vers
- Requires:       libvlccore%{libvlccore} = %{version}-%{release}
- Conflicts:      %{conflicts}-noX
- Recommends:     libdvdcss
-+# pulseaudio subpackage merge
-+Supplements:    packageand(%{name}-noX:pulseaudio)
-+Provides:       vlc-aout-pulse = %{version}
-+Obsoletes:      vlc-aout-pulse < %{version}
-+# lang subpackage
-+Recommends:     vlc-noX-lang
- 
- %description noX
- This Package of VLC contains the bare requirements you need to install.
-@@ -209,6 +192,8 @@ suitable for server installations (Strea
- Should you decide to install the GUI modules, %{name}-noX will stay
- installed as a dependency.
- 
-+%lang_package -n vlc-noX
-+
- %if 0%{?BUILD_ORIG}
- %package codecs
- Summary:        VLC: VideoLAN Client - Codec extension
-@@ -245,26 +230,19 @@ Conflicts:      %{conflicts}-gnome
- In order to integrate flawless into GNOME, there are some access modules
- for gnome-vfs2.
- 
--%if 0%{pulseplugin}
--%package aout-pulse
--Summary:        VLC Audio Out for Pulse Audio
--License:        GPL-2.0+ and LGPL-2.1+
--Group:          System/Libraries
--Requires:       %{name} = %{version}-%{release}
--Supplements:    packageand(%{name}-noX:pulseaudio)
--Requires:       %{name}-noX = %{version}-%{release}
--Conflicts:      %{conflicts}-aout-pulse
--
--%description aout-pulse
--Extends VLC with Pulse Audio Support for Audio Out
--%endif
--
- %prep
- %setup -q -n %{name}-%{_version}
- %patch1 -p1
- %patch3 -p1
- rm -rf contrib
- 
-+# fix builddate info
-+# Remove build time references so build-compare can do its work
-+FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
-+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
-+sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c
-+sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c
-+
- %build 
- pkg-config --exists smbclient && 
-   smbclient=$(pkg-config --cflags smbclient)
-@@ -281,9 +259,7 @@ export CXXFLAGS="%{optflags} -L%{_libdir
-    --disable-dependency-tracking        \
-    --enable-aa                          \
-    --enable-alsa                        \
--%if 0%{?suse_version} > 1120
-    --enable-dvbpsi                      \
--%endif
-    --enable-dvdnav                      \
-    --enable-dvdread                     \
-    --enable-fast-install                \
-@@ -291,9 +267,7 @@ export CXXFLAGS="%{optflags} -L%{_libdir
-    --enable-freetype                    \
-    --enable-fribidi                     \
-    --enable-glx                         \
--%if 0%{?suse_version} >= 1200
-    --enable-gme                         \
--%endif
-    --enable-gnomevfs                    \
-    --enable-gnutls                      \
-    --enable-httpd                       \
-@@ -301,9 +275,6 @@ export CXXFLAGS="%{optflags} -L%{_libdir
-    --enable-kate                        \
-    --enable-libass                      \
-    --enable-libcddb                     \
--%if 0%{suse_version} >= 1120
--   --enable-libproxy                    \
--%endif
-    --enable-lirc                        \
-    --enable-swscale                     \
-    --enable-live555                     \
-@@ -337,43 +308,28 @@ export CXXFLAGS="%{optflags} -L%{_libdir
-    --enable-opus                        \
-    --disable-oss                        \
-    --enable-png                         \
--%if 0%{pulseplugin}
-    --enable-pulse                       \
--%endif
--   --enable-pvr                         \
--   --enable-real                        \
-    --enable-realrtsp                    \
--   --enable-smb                         \
-+   --enable-smbclient                   \
-    --enable-sout                        \
-    --enable-speex                       \
-    --enable-taglib                      \
-    --enable-theora                      \
--%if 0%{?suse_version} > 1130
-    --enable-v4l2                        \
--%else
--   --disable-libv4l2                    \
--%endif
-    --enable-vcd                         \
-    --enable-vcdx                        \
--   --enable-visual                      \
-    --enable-vorbis                      \
-    --enable-waveout                     \
--%if 0%{?withxcb}
-    --enable-xcb                         \
--%else
--   --disable-xcb                        \
--%endif
- %if %{with opengles}
-   --enable-gles2                        \
-   --enable-egl                        	\
- %endif
-    --enable-xvideo                     
--make %{?_smp_mflags}
-+make %{?_smp_mflags} V=1
- 
- %install
--echo '********* ENTERED INSTALL PHASE *********'
--date
--%makeinstall
-+make DESTDIR=%{buildroot} install %{?_smp_mflags}
- mkdir -p %{buildroot}/%{_datadir}/pixmaps
- ln -s %{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png
- find %{buildroot} -name *.la -delete
-@@ -387,38 +343,34 @@ for lang in ach cgg ff kmr; do
- done
- %find_lang vlc
- 
--%clean
--rm -rf "$RPM_BUILD_ROOT"
--
- %files 
- %defattr(-,root,root)
- %{_bindir}/svlc
--%{_datadir}/applications/vlc.desktop
--%{_datadir}/pixmaps/vlc.png
- %{_datadir}/icons/hicolor/*/apps/vlc*
- %dir %{_datadir}/kde4
- %dir %{_datadir}/kde4/apps
- %{_datadir}/kde4/apps/solid
--%if 0%{?suse_version} > 1130
- %{_libdir}/vlc/plugins/codec/liblibass_plugin.so
--%endif
- %{_libdir}/vlc/plugins//notify/libnotify_plugin.so
- %{_libdir}/vlc/plugins//video_filter/libremoteosd_plugin.so
- %{_libdir}/vlc/plugins/text_renderer/libfreetype_plugin.so
--%if 0%{withxcb}
- %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
- %{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
--%endif
- %if %{with opengles}
- %{_libdir}/vlc/plugins/video_output/libegl_plugin.so
- %{_libdir}/vlc/plugins/video_output/libgles2_plugin.so
- %endif
- %{_libdir}/vlc/plugins/video_output/libaa_plugin.so
- 
--%files noX -f vlc.lang
-+%files noX-lang -f vlc.lang
-+%defattr(-,root,root)
-+
-+%files noX
- %defattr(-,root,root)
- %doc %{_datadir}/doc/vlc/
- %doc NEWS AUTHORS COPYING THANKS README 
-+%{_datadir}/applications/vlc.desktop
-+%{_datadir}/pixmaps/vlc.png
- %{_bindir}/cvlc
- %if %{?with_ncurses}
- %{_bindir}/nvlc
-@@ -427,14 +379,6 @@ rm -rf "$RPM_BUILD_ROOT"
- %{_bindir}/vlc
- %{_bindir}/vlc-wrapper
- %{_datadir}/vlc/
--%if 0%{?suse_version} <= 1130
--%dir %{_datadir}/locale/co
--%dir %{_datadir}/locale/co/LC_MESSAGES
--%endif
--%if 0%{?suse_version} <= 1140
-- %dir %{_datadir}/locale/tet
-- %dir %{_datadir}/locale/tet/LC_MESSAGES
--%endif
- %{_mandir}/*/vlc*
- # Own the file.. but it's an auto-generated file, so ghost it.
- %ghost %{_libdir}/vlc/plugins/plugins.dat
-@@ -615,6 +559,7 @@ rm -rf "$RPM_BUILD_ROOT"
- %{_libdir}/vlc/plugins/audio_output/libamem_plugin.so
- %{_libdir}/vlc/plugins/audio_output/libafile_plugin.so
- %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
-+%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
- %{_libdir}/vlc/plugins/codec/liba52_plugin.so
- %{_libdir}/vlc/plugins/codec/libadpcm_plugin.so
- %{_libdir}/vlc/plugins/codec/libaes3_plugin.so
-@@ -653,9 +598,6 @@ rm -rf "$RPM_BUILD_ROOT"
- %{_libdir}/vlc/plugins/control/libdbus_plugin.so
- %{_libdir}/vlc/plugins/control/libdummy_plugin.so
- %{_libdir}/vlc/plugins/control/libgestures_plugin.so
--%if 0%{?suse_version} < 1220
--%{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
--%endif
- %{_libdir}/vlc/plugins/control/libhotkeys_plugin.so
- %{_libdir}/vlc/plugins/control/liblirc_plugin.so
- %{_libdir}/vlc/plugins/control/libmotion_plugin.so
-@@ -671,9 +613,7 @@ rm -rf "$RPM_BUILD_ROOT"
- %{_libdir}/vlc/plugins/demux/libdirac_plugin.so
- %{_libdir}/vlc/plugins/demux/libes_plugin.so
- %{_libdir}/vlc/plugins/demux/libflacsys_plugin.so
--%if 0%{?suse_version} >= 1200
- %{_libdir}/vlc/plugins/demux/libgme_plugin.so
--%endif
- %{_libdir}/vlc/plugins/demux/libh264_plugin.so
- %{_libdir}/vlc/plugins/demux/libimage_plugin.so
- %{_libdir}/vlc/plugins/demux/libmjpeg_plugin.so
-@@ -890,16 +830,11 @@ rm -rf "$RPM_BUILD_ROOT"
- %{_libdir}/libvlc.so
- %{_libdir}/pkgconfig/libvlc.pc
- %{_libdir}/pkgconfig/vlc-plugin.pc
--#%{_bindir}/vlc-config
--
--%if 0%{pulseplugin}
--%files aout-pulse
--%defattr(-,root,root)
--%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
--%endif
- 
--%post -n %{name}-noX -p /sbin/ldconfig
--%postun -n %{name}-noX -p /sbin/ldconfig
-+%post noX
-+/sbin/ldconfig
-+touch %{_libdir}/vlc/plugins/plugins.dat
-+%postun noX -p /sbin/ldconfig
- 
- %post -n libvlc%{libvlc} -p /sbin/ldconfig
- %postun -n libvlc%{libvlc} -p /sbin/ldconfig

_link Changed