Accepting request 680556 from home:iznogood:branches:multimedia:libs

- Drop ffmpeg-libcdio_cdda-pkgconfig.patch: It only adds comments
  in it's current form, so serves no purpose at all anymore.
- Refresh patches with refresh_patches service.
- Rename rpmlintrc file to ffmpeg-4-rpmlintrc.
- Add missing conditional configure option: --enable-libbs2b,
  BuildRequires already in place.

OBS-URL: https://build.opensuse.org/request/show/680556
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=48

ffmpeg-4.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Mar  1 08:02:29 UTC 2019 - bjorn.lie@gmail.com
+
+- Drop ffmpeg-libcdio_cdda-pkgconfig.patch: It only adds comments
+  in it's current form, so serves no purpose at all anymore.
+- Refresh patches with refresh_patches service.
+- Rename rpmlintrc file to ffmpeg-4-rpmlintrc.
+
+-------------------------------------------------------------------
+Thu Feb 28 06:41:01 UTC 2019 - bjorn.lie@gmail.com
+
+- Add missing conditional configure option: --enable-libbs2b,
+  BuildRequires already in place.
+
 -------------------------------------------------------------------
 Sat Feb 16 13:21:11 UTC 2019 - bjorn.lie@gmail.com
 

ffmpeg-4.spec

@@ -110,11 +110,10 @@ Url:            https://ffmpeg.org/
 #Git-Clone:     git://source.ffmpeg.org/ffmpeg
 Source:         https://www.ffmpeg.org/releases/%_name-%version.tar.xz
 Source2:        https://www.ffmpeg.org/releases/%_name-%version.tar.xz.asc
-Source3:        ffmpeg-rpmlintrc
+Source3:        ffmpeg-4-rpmlintrc
 Source4:        enable_decoders
 Source5:        enable_encoders
 Source99:       baselibs.conf
-Patch1:         ffmpeg-libcdio_cdda-pkgconfig.patch
 Patch2:         ffmpeg-arm6l.diff
 Patch3:         ffmpeg-new-coder-errors.diff
 Patch4:         ffmpeg-codec-choice.diff
@@ -598,6 +597,9 @@ CFLAGS="%optflags" \
 %endif
 	--enable-libass \
 	--enable-libbluray \
+%if %{with bs2b}
+	--enable-libbs2b \
+%endif
 	--enable-libcelt \
 	--enable-libcdio \
 %if %{with codec2}

ffmpeg-libcdio_cdda-pkgconfig.patch

@@ -1,17 +0,0 @@
----
- configure |    2 ++
- 1 file changed, 2 insertions(+)
-
-Index: ffmpeg-4.1/configure
-===================================================================
---- ffmpeg-4.1.orig/configure
-+++ ffmpeg-4.1/configure
-@@ -6351,6 +6351,8 @@ enabled libjack &&
- enabled sndio && check_lib sndio sndio.h sio_open -lsndio
- 
- if enabled libcdio; then
-+    # cdio_cdda needs -lrt, get it from pkg-config from the external pkg
-+    #l=$(pkg-config --libs libcdio_paranoia libcdio_cdda libcdio)
-     check_pkg_config libcdio libcdio_paranoia "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open ||
-     check_pkg_config libcdio libcdio_paranoia "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open ||
-     check_lib libcdio "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio ||

ffmpeg-new-coder-errors.diff

@@ -10,11 +10,11 @@ Improve the error messages a bit to say what's really going on
  fftools/ffmpeg_opt.c    |    2 +-
  3 files changed, 4 insertions(+), 4 deletions(-)
 
-Index: ffmpeg-4.1/fftools/ffmpeg.c
+Index: ffmpeg-4.1.1/fftools/ffmpeg.c
 ===================================================================
---- ffmpeg-4.1.orig/fftools/ffmpeg.c
+--- ffmpeg-4.1.1.orig/fftools/ffmpeg.c	2019-02-09 21:56:07.000000000 +0100
-+++ ffmpeg-4.1/fftools/ffmpeg.c
++++ ffmpeg-4.1.1/fftools/ffmpeg.c	2019-03-01 09:04:20.287182857 +0100
-@@ -2902,7 +2902,7 @@ static int init_input_stream(int ist_ind
+@@ -2906,7 +2906,7 @@ static int init_input_stream(int ist_ind
      if (ist->decoding_needed) {
          AVCodec *codec = ist->dec;
          if (!codec) {
@@ -23,10 +23,10 @@ Index: ffmpeg-4.1/fftools/ffmpeg.c
                      avcodec_get_name(ist->dec_ctx->codec_id), ist->file_index, ist->st->index);
              return AVERROR(EINVAL);
          }
-Index: ffmpeg-4.1/fftools/ffmpeg_filter.c
+Index: ffmpeg-4.1.1/fftools/ffmpeg_filter.c
 ===================================================================
---- ffmpeg-4.1.orig/fftools/ffmpeg_filter.c
+--- ffmpeg-4.1.1.orig/fftools/ffmpeg_filter.c	2019-02-09 21:56:02.000000000 +0100
-+++ ffmpeg-4.1/fftools/ffmpeg_filter.c
++++ ffmpeg-4.1.1/fftools/ffmpeg_filter.c	2019-03-01 09:04:20.287182857 +0100
 @@ -973,7 +973,7 @@ static int configure_input_filter(Filter
  {
      if (!ifilter->ist->dec) {
@@ -45,10 +45,10 @@ Index: ffmpeg-4.1/fftools/ffmpeg_filter.c
                       avcodec_get_name(ost->st->codecpar->codec_id), ost->file_index, ost->index);
              ret = AVERROR(EINVAL);
              goto fail;
-Index: ffmpeg-4.1/fftools/ffmpeg_opt.c
+Index: ffmpeg-4.1.1/fftools/ffmpeg_opt.c
 ===================================================================
---- ffmpeg-4.1.orig/fftools/ffmpeg_opt.c
+--- ffmpeg-4.1.1.orig/fftools/ffmpeg_opt.c	2019-02-09 21:56:02.000000000 +0100
-+++ ffmpeg-4.1/fftools/ffmpeg_opt.c
++++ ffmpeg-4.1.1/fftools/ffmpeg_opt.c	2019-03-01 09:04:20.287182857 +0100
 @@ -1306,7 +1306,7 @@ static int choose_encoder(OptionsContext
              if (!ost->enc) {
                  av_log(NULL, AV_LOG_FATAL, "Automatic encoder selection failed for "