Accepting request 424698 from multimedia:libs

- Update vlc-2.2.4-unambig-shortcuts.patch: Also make ALT-P
  unambiguous.

- Also use ffmpeg2-devel BuildRequires on Leap 42.2 (sle_version
  120200).

- Add ffmpeg2-devel BuildRequires for Tumbleweed: older openSUSE
  versions had ffmpeg 2.x in the distribution.

OBS-URL: https://build.opensuse.org/request/show/424698
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vlc?expand=0&rev=61
This commit is contained in:
Dominique Leuenberger 2016-09-05 19:19:04 +00:00 committed by Git OBS Bridge
parent e73a65902f
commit 1ffb812fc3
3 changed files with 50 additions and 1242 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,20 @@
-------------------------------------------------------------------
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

@ -199,7 +199,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