Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

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')

_link Changed