diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-12-06 20:40:26 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-12-06 20:40:26 +0000 |
| commit | f290a14e78a0774a72141bc03a4aa3575ba7cd5f (patch) | |
| tree | 2ce2945f569ad014bedf2f688bd67f6c14313b65 /media-video/bombono-dvd | |
| parent | Stable for HPPA (bug #393265). (diff) | |
| download | gentoo-2-f290a14e78a0774a72141bc03a4aa3575ba7cd5f.tar.gz gentoo-2-f290a14e78a0774a72141bc03a4aa3575ba7cd5f.tar.bz2 gentoo-2-f290a14e78a0774a72141bc03a4aa3575ba7cd5f.zip | |
With patch from Ilya, allow using both cdrtools and cdrkit
(Portage version: 2.1.10.39/cvs/Linux x86_64)
Diffstat (limited to 'media-video/bombono-dvd')
| -rw-r--r-- | media-video/bombono-dvd/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/bombono-dvd/bombono-dvd-1.2.0-r1.ebuild (renamed from media-video/bombono-dvd/bombono-dvd-1.2.0.ebuild) | 9 | ||||
| -rw-r--r-- | media-video/bombono-dvd/files/bombono-dvd-1.2.0-cdrtools.patch | 21 |
3 files changed, 35 insertions, 4 deletions
diff --git a/media-video/bombono-dvd/ChangeLog b/media-video/bombono-dvd/ChangeLog index d43e3e0d0fce..8a50a46a2a8b 100644 --- a/media-video/bombono-dvd/ChangeLog +++ b/media-video/bombono-dvd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/bombono-dvd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.19 2011/12/02 19:36:13 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.20 2011/12/06 20:40:26 dilfridge Exp $ + +*bombono-dvd-1.2.0-r1 (06 Dec 2011) + + 06 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> + -bombono-dvd-1.2.0.ebuild, +bombono-dvd-1.2.0-r1.ebuild, + +files/bombono-dvd-1.2.0-cdrtools.patch: + With patch from Ilya, allow using both cdrtools and cdrkit 02 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> bombono-dvd-1.2.0.ebuild, metadata.xml: diff --git a/media-video/bombono-dvd/bombono-dvd-1.2.0.ebuild b/media-video/bombono-dvd/bombono-dvd-1.2.0-r1.ebuild index 861e28b9c89a..1eeae731a0d8 100644 --- a/media-video/bombono-dvd/bombono-dvd-1.2.0.ebuild +++ b/media-video/bombono-dvd/bombono-dvd-1.2.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-1.2.0.ebuild,v 1.2 2011/12/02 19:36:13 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-1.2.0-r1.ebuild,v 1.1 2011/12/06 20:40:26 dilfridge Exp $ EAPI=4 @@ -18,7 +18,6 @@ KEYWORDS="~amd64 ~x86" IUSE="gnome" COMMONDEPEND=" - app-cdr/cdrkit app-i18n/enca app-cdr/dvd+rw-tools dev-cpp/gtkmm:2.4 @@ -27,6 +26,7 @@ COMMONDEPEND=" media-libs/libdvdread media-sound/twolame media-video/dvdauthor + virtual/cdrtools virtual/ffmpeg >=media-video/mjpegtools-1.8.0 x11-libs/gtk+:2 @@ -38,7 +38,10 @@ DEPEND="${COMMONDEPEND} >=dev-util/scons-0.96.1 " -PATCHES=( "${FILESDIR}/${PN}-1.0.1-cflags.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-1.0.1-cflags.patch" + "${FILESDIR}/${PN}-1.2.0-cdrtools.patch" +) src_compile() { append-flags -DBOOST_FILESYSTEM_VERSION=2 diff --git a/media-video/bombono-dvd/files/bombono-dvd-1.2.0-cdrtools.patch b/media-video/bombono-dvd/files/bombono-dvd-1.2.0-cdrtools.patch new file mode 100644 index 000000000000..10ab179ffe85 --- /dev/null +++ b/media-video/bombono-dvd/files/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__ |