4 files changed, 55 insertions, 6 deletions
diff --git a/multimedia/bombono-dvd/bombono-dvd.SlackBuild b/multimedia/bombono-dvd/bombono-dvd.SlackBuild
index f9dbc161bb..b57792aefe 100644
--- a/multimedia/bombono-dvd/bombono-dvd.SlackBuild
+++ b/multimedia/bombono-dvd/bombono-dvd.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bombono-dvd
-VERSION=${VERSION:-20120711_06454fe}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,13 +74,15 @@ find . \
 # Let us specify our CFLAGS
 sed -i "s|-O2||" SConstruct
 # Allow use of cdrtools as an alternative to cdrkit, thanks gentoo
-patch -p1 < $CWD/bombono-dvd-1.2.0-cdrtools.patch
+patch -p1 < $CWD/patches/bombono-dvd-1.2.0-cdrtools.patch
+# Fix for the newer ffmpeg - thanks ArchLinux
+patch -p1 < $CWD/patches/fix_ffmpeg_codecid.patch
 
 # Build package
 
 scons \
   CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS -Wno-unused-local-typedefs" \
   PREFIX=/usr \
   LIBDIR=/usr/lib${LIBDIRSUFFIX} \
   DIST_TARGET="$TARGET" \
diff --git a/multimedia/bombono-dvd/bombono-dvd.info b/multimedia/bombono-dvd/bombono-dvd.info
index feb579c109..9b5682097e 100644
--- a/multimedia/bombono-dvd/bombono-dvd.info
+++ b/multimedia/bombono-dvd/bombono-dvd.info
@@ -1,8 +1,8 @@
 PRGNAM="bombono-dvd"
-VERSION="20120711_06454fe"
+VERSION="1.2.2"
 HOMEPAGE="http://www.bombono.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/bombono-dvd-20120711_06454fe.tar.xz"
-MD5SUM="070a1caeaaf9aa4e31dea2e35cda0622"
+DOWNLOAD="http://downloads.sourceforge.net/bombono/bombono-dvd-1.2.2.tar.bz2"
+MD5SUM="b4fd43025cab3bbf76275f7b87952a93"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dvdauthor ffmpeg gtkmm libxml++ mjpegtools scons twolame"
diff --git a/multimedia/bombono-dvd/bombono-dvd-1.2.0-cdrtools.patch b/multimedia/bombono-dvd/patches/bombono-dvd-1.2.0-cdrtools.patch
index 10ab179ffe..10ab179ffe 100644
--- a/multimedia/bombono-dvd/bombono-dvd-1.2.0-cdrtools.patch
+++ b/multimedia/bombono-dvd/patches/bombono-dvd-1.2.0-cdrtools.patch
diff --git a/multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch b/multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch
new file mode 100644
index 0000000000..08abbd0beb
--- /dev/null
+++ b/multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch
@@ -0,0 +1,47 @@
+diff -u -r -N old/src/mgui/ffviewer.cpp new/src/mgui/ffviewer.cpp
+--- old/src/mgui/ffviewer.cpp   2013-03-07 22:20:45.000000000 +0100
++++ new/src/mgui/ffviewer.cpp   2013-08-14 08:56:12.917285000 +0200
+@@ -62,7 +62,7 @@
+ 
+ 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 @@
+ } 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 @@
+     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 @@
+ 
+ #else // CALC_FF_TAG
+ 
+-static std::string CodecID2Str(CodecID codec_id)
++static std::string CodecID2Str(AVCodecID codec_id)
+ {
+     return Int2Str(codec_id);
+ }