diff options
| author |   Matteo Bernardini | 2013-11-19 11:39:35 +0100 |
|---|---|---|
| committer |   Robby Workman | 2013-11-19 22:20:47 +0100 |
| commit | 8cb4a4ed7125bb5b9a3ddcc540171e1e5195f21b (patch) | |
| tree | be872eb03414a29635498db3ca3ac103228f0cbc /multimedia/bombono-dvd/patches | |
| parent | f5046113c48a6adabac7419d346b7b9110dfc876 (diff) | |
| download | slackbuilds-8cb4a4ed7125bb5b9a3ddcc540171e1e5195f21b.tar.gz | |
multimedia/bombono-dvd: Updated for version 1.2.2.
Added a patch for the newer ffmpeg
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'multimedia/bombono-dvd/patches')
| -rw-r--r-- | multimedia/bombono-dvd/patches/bombono-dvd-1.2.0-cdrtools.patch | 21 | ||||
| -rw-r--r-- | multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch | 47 |
2 files changed, 68 insertions, 0 deletions
diff --git a/multimedia/bombono-dvd/patches/bombono-dvd-1.2.0-cdrtools.patch b/multimedia/bombono-dvd/patches/bombono-dvd-1.2.0-cdrtools.patch new file mode 100644 index 0000000000..10ab179ffe --- /dev/null +++ b/multimedia/bombono-dvd/patches/bombono-dvd-1.2.0-cdrtools.patch @@ -0,0 +1,21 @@ +diff --git a/src/mgui/author/script.h b/src/mgui/author/script.h +index fe80307..a96fb54 100644 +--- a/src/mgui/author/script.h ++++ b/src/mgui/author/script.h +@@ -115,9 +115,14 @@ ExitData AsyncOFCall(const std::string& cmd, const std::string& out_dir, OutputF + // POSIX-народ бесповоротно ушел на cdrkit (genisoimage), но с Win32 + // у cdrkit хреново (только cygwin, нет собранного с growisofs с cdrkit под Win32) => потому - "вилка" + #ifdef _WIN32 +-#define MK_ISO_CMD "mkisofs" ++ #define MK_ISO_CMD "mkisofs" + #else +-#define MK_ISO_CMD "genisoimage" ++ #define USE_CDRTOOLS ++ #ifdef USE_CDRTOOLS ++ #define MK_ISO_CMD "mkisofs" ++ #else // !USE_CDRTOOLS ++ #define MK_ISO_CMD "genisoimage" ++ #endif // !USE_CDRTOOLS + #endif + + #endif // #ifndef __MGUI_AUTHOR_SCRIPT_H__ 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); + } |