SHA256
1
0
forked from pool/vlc

- Rename vlc-noX-lang to vlc-lang: this helps the AppStream builder

in confirming that 'vlc' (the application) does have a full
  translation set. Obsolete vlc-noX-lang by vlc-noX directly.

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=188
This commit is contained in:
Dominique Leuenberger 2016-09-16 14:24:47 +00:00 committed by Git OBS Bridge
parent 9896f5825f
commit baf03ade9f
3 changed files with 45 additions and 1257 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,34 @@
-------------------------------------------------------------------
Fri Sep 16 14:24:01 UTC 2016 - dimstar@opensuse.org
- Rename vlc-noX-lang to vlc-lang: this helps the AppStream builder
in confirming that 'vlc' (the application) does have a full
translation set. Obsolete vlc-noX-lang by vlc-noX directly.
-------------------------------------------------------------------
Mon Sep 5 07:56:44 UTC 2016 - dimstar@opensuse.org
- Drop vlc-2.2.4-unambig-shortcuts.patch: it does not solve the
problem it attempted to solve to start with. A better solution
is to be found with upstream.
-------------------------------------------------------------------
Sun Sep 4 09:23:25 UTC 2016 - dimstar@opensuse.org
- Update vlc-2.2.4-unambig-shortcuts.patch: Also make ALT-P
unambiguous.
-------------------------------------------------------------------
Wed Aug 31 10:54:00 UTC 2016 - dimstar@opensuse.org
- Also use ffmpeg2-devel BuildRequires on Leap 42.2 (sle_version
120200).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 22 09:12:46 UTC 2016 - dimstar@opensuse.org Mon Aug 22 09:12:46 UTC 2016 - dimstar@opensuse.org
- Add ffmpeg2-BuildRequires for Tumbleweed: older openSUSE versions - Add ffmpeg2-devel BuildRequires for Tumbleweed: older openSUSE
had ffmpeg 2.x in the distribution. versions had ffmpeg 2.x in the distribution.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 10 16:30:31 UTC 2016 - dimstar@opensuse.org Wed Aug 10 16:30:31 UTC 2016 - dimstar@opensuse.org

View File

@ -56,8 +56,6 @@ Patch4: vlc-2.2.0-fix_deinterlace_mmx.patch
Patch5: vlc-support-qt5.5.patch Patch5: vlc-support-qt5.5.patch
# PATCH-FIX-UPSTREAM vlc-gcc6-buildfixes.patch dimstar@opensuse.org -- A collection of upstream commits to fix build with gcc6 # PATCH-FIX-UPSTREAM vlc-gcc6-buildfixes.patch dimstar@opensuse.org -- A collection of upstream commits to fix build with gcc6
Patch6: vlc-gcc6-buildfixes.patch Patch6: vlc-gcc6-buildfixes.patch
# PATCH-FIX-UPSTREAM vlc-2.2.4-unambig-shortcuts.patch dimstar@opensuse.org -- Make keyboard shortcuts on 'open dialog' unambiguous
Patch8: vlc-2.2.4-unambig-shortcuts.patch
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
BuildRequires: SDL-devel >= 1.2.10 BuildRequires: SDL-devel >= 1.2.10
BuildRequires: aalib-devel BuildRequires: aalib-devel
@ -199,7 +197,7 @@ BuildRequires: pkgconfig(ncursesw)
BuildRequires: pkgconfig(libavcodec) >= 55.26.0 BuildRequires: pkgconfig(libavcodec) >= 55.26.0
BuildRequires: pkgconfig(libavformat) >= 53.21.0 BuildRequires: pkgconfig(libavformat) >= 53.21.0
BuildRequires: pkgconfig(libavutil) >= 52.4.0 BuildRequires: pkgconfig(libavutil) >= 52.4.0
%if 0%{?suse_version} == 1330 %if (0%{?suse_version} == 1330) || (0%{suse_version} == 1315 && 0%{?sle_version} >= 120200)
# for TW, we favor ffmpeg2-devel. Older distros have ffmpeg 2.x intree # for TW, we favor ffmpeg2-devel. Older distros have ffmpeg 2.x intree
BuildRequires: ffmpeg2-devel BuildRequires: ffmpeg2-devel
%endif %endif
@ -260,9 +258,11 @@ Group: Productivity/Multimedia/Video/Players
Requires: libvlc%{libvlc} = %{version}-%{release} Requires: libvlc%{libvlc} = %{version}-%{release}
Requires: libvlccore%{libvlccore} = %{version}-%{release} Requires: libvlccore%{libvlccore} = %{version}-%{release}
# lang subpackage # lang subpackage
Recommends: %{name}-noX-lang Recommends: %{name}-lang
Recommends: %{name}-codecs Recommends: %{name}-codecs
Recommends: libdvdcss Recommends: libdvdcss
# Tha lang-package was renamed to vlc-lang to assist AppStream building
Obsoletes: %{name}-noX-lang
# This is a hack only due to libbluray not having versioned symbols as well as # This is a hack only due to libbluray not having versioned symbols as well as
# having a strange ABI/API break between 0.3 and 0.7 # having a strange ABI/API break between 0.3 and 0.7
%requires_ge libbluray1 %requires_ge libbluray1
@ -276,7 +276,18 @@ suitable for server installations (Streaming Server for example)
Should you decide to install the GUI modules, %{name}-noX will stay Should you decide to install the GUI modules, %{name}-noX will stay
installed as a dependency. installed as a dependency.
%lang_package -n %{name}-noX %lang_package
%package codec-gstreamer
Summary: VLC: VideoLAN Client - Decode using GStreamer
Group: Productivity/Multimedia/Video/Players
Requires: %{name}-noX = %{version}
Supplements: packageand(%{name}-noX:%(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libgstapp-1.0.so)))
%description codec-gstreamer
This package enhances the functionality of the VLC VideoLAN Client by
using GStreamer as backend to decode videos (incl. GStreamers available
modules).
%package codec-gstreamer %package codec-gstreamer
Summary: VLC: VideoLAN Client - Decode using GStreamer Summary: VLC: VideoLAN Client - Decode using GStreamer
@ -336,7 +347,6 @@ date
if [ $(gcc -dumpversion) -ge 6 ]; then if [ $(gcc -dumpversion) -ge 6 ]; then
%patch6 -p1 %patch6 -p1
fi fi
%patch8 -p1
### Fix up sources for LUA 5.3 ### Fix up sources for LUA 5.3
if pkg-config --atleast-version 5.3 lua; then if pkg-config --atleast-version 5.3 lua; then
@ -596,7 +606,7 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%endif %endif
%endif %endif
%files noX-lang -f vlc.lang %files lang -f vlc.lang
%defattr(-,root,root) %defattr(-,root,root)
%files noX %files noX