rpms/bombono-dvd/devel 0001-ffmpeg-has-renamed-CodecID-AVCodecID.patch, NONE, 1.1 bombono-dvd.spec, 1.16, 1.17

[Alec Leamas]

Author: leamas

Update of /cvs/free/rpms/bombono-dvd/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10866

Modified Files:
	bombono-dvd.spec 
Added Files:
	0001-ffmpeg-has-renamed-CodecID-AVCodecID.patch 
Log Message:
* Thu Oct 31 2013 Alec Leamas <leamas at nowhere.net> - 1.2.2-3
- Build problems for f20, adding patch 0001-*.


0001-ffmpeg-has-renamed-CodecID-AVCodecID.patch:
 ffviewer.cpp |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE 0001-ffmpeg-has-renamed-CodecID-AVCodecID.patch ---
>From 392e3b3b1e08599c461746baaee33f0246a75afe Mon Sep 17 00:00:00 2001
From: Alec Leamas <alec at tests.notat.diaspora.com>
Date: Thu, 31 Oct 2013 14:19:17 +0100
Subject: [PATCH] ffmpeg has renamed CodecID -> AVCodecID

---
 src/mgui/ffviewer.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mgui/ffviewer.cpp b/src/mgui/ffviewer.cpp
index 92d76a4..82ee8b7 100644
--- a/src/mgui/ffviewer.cpp
+++ b/src/mgui/ffviewer.cpp
@@ -62,7 +62,7 @@ C_LINKAGE_BEGIN
 
 typedef struct AVCodecTag {
 #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,39,00)
-    enum CodecID id;
+    enum AVCodecID id;
 #else
     int id;
 #endif
@@ -70,14 +70,14 @@ typedef struct AVCodecTag {
 } AVCodecTag;
 
 #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,34,00)
-static uint FFCodecID2Tag(CodecID codec_id) 
+static uint FFCodecID2Tag(AVCodecID codec_id)
 {
     unsigned int ff_codec_get_tag(const AVCodecTag *tags, int id);
     extern const AVCodecTag ff_codec_bmp_tags[];
     return ff_codec_get_tag(ff_codec_bmp_tags, codec_id);
 }
 #else
-static uint FFCodecID2Tag(CodecID codec_id) 
+static uint FFCodecID2Tag(AVCodecID codec_id)
 {
     unsigned int codec_get_tag(const AVCodecTag *tags, int id);
     extern const AVCodecTag codec_bmp_tags[];
@@ -388,7 +388,7 @@ static unsigned char GetChar(uint tag, int bit_begin)
     return (tag>>bit_begin) & 0xFF;
 }
 
-static std::string CodecID2Str(CodecID codec_id)
+static std::string CodecID2Str(AVCodecID codec_id)
 {
 #ifdef _MSC_VER
     std::string tag_str = boost::format("%1%") % codec_id % bf::stop;
@@ -406,7 +406,7 @@ static std::string CodecID2Str(CodecID codec_id)
 
 #else // CALC_FF_TAG
 
-static std::string CodecID2Str(CodecID codec_id)
+static std::string CodecID2Str(AVCodecID codec_id)
 {
     return Int2Str(codec_id);
 }
-- 
1.8.3.1



Index: bombono-dvd.spec
===================================================================
RCS file: /cvs/free/rpms/bombono-dvd/devel/bombono-dvd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bombono-dvd.spec	2 Oct 2013 08:13:41 -0000	1.16
+++ bombono-dvd.spec	31 Oct 2013 14:02:24 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           bombono-dvd
 Version:        1.2.2
-Release:        4%{?rel_tag}%{?dist}
+Release:        3%{?rel_tag}%{?dist}
 Summary:        DVD authoring program with nice and clean GUI
                 # License breakdown in README.
 License:        GPLv2 and GPLv2+ and Boost and Python and LGPLv2+
@@ -15,6 +15,8 @@
 #Source:         bombono-dvd-%%{version}%%{?rel_tag}.tar.gz
 Source:         http://sourceforge.net/projects/bombono/files/bombono-dvd/1.2/bombono-dvd-1.2.2.tar.bz2
 Patch0:         filesys-include-path.patch
+                # https://sourceforge.net/apps/trac/bombono/ticket/98
+Patch1:         0001-ffmpeg-has-renamed-CodecID-AVCodecID.patch
 
 # needs to match TBB - from adobe-source-libraries
 ExclusiveArch:  i686 x86_64 ia64
@@ -53,7 +55,7 @@
     CC="%__cc"                                             \\\
     CXX="%__cxx"                                           \\\
     CFLAGS=""                                              \\\
-    CXXFLAGS="%{optflags} %{warn_flags} %{boost_flags}"    \\\
+    CPPFLAGS="%{optflags} %{warn_flags} %{boost_flags}"    \\\
     PREFIX=%{_prefix}                                      \\\
     TEST=false                                             \\\
     TEST_BUILD=false                                       \\\
@@ -68,9 +70,10 @@
 re-authoring by importing video from DVD discs is also supported.
 
 %prep
-%setup -q 
+%setup -q
 %if %{fedora} > 17
 %patch0 -p1
+%patch1 -p1
 %endif
 sed -i '\;#![ ]*/usr/bin/env;d'  $(find . -name SCons\*)
 rm -r debian libs/boost-lib src/mlib/tests libs/mpeg2dec ./libs/asl/adobe
@@ -111,11 +114,8 @@
 %{_mandir}/man1/*
 
 %changelog
-* Wed Oct 02 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.2.2-4
-- Rebuilt
-
-* Thu Aug 15 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.2.2-3
-- Rebuilt for FFmpeg 2.0.x
+* Thu Oct 31 2013 Alec Leamas <leamas at nowhere.net> - 1.2.2-3
+- Build problems for f20, adding patch 0001-*.
 
 * Sun May 26 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.2.2-2
 - Rebuilt for x264/FFmpeg