Added patch to link against lzo2 (bug #112372). Also dropped gtk2 useflag as wxGTK 2.6 defaults to building only gtk2 version.

(Portage version: 2.0.53)

5 files changed, 138 insertions, 30 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 8bebe4354628..e2248d4b918f 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.44 2005/11/19 23:37:12 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.45 2005/12/15 21:59:03 flameeyes Exp $
+
+  15 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mkvtoolnix-1.6.0-lzo2.patch, mkvtoolnix-1.5.5.ebuild,
+  mkvtoolnix-1.6.0.ebuild:
+  Added patch to link against lzo2 (bug #112372). Also dropped gtk2 useflag as
+  wxGTK 2.6 defaults to building only gtk2 version.
 
   19 Nov 2005; Joseph Jezak <josejx@gentoo.org> mkvtoolnix-1.5.5.ebuild:
   Marked ppc stable for bug #111049.
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 26702d6fe3d8..ce2ef1bf6744 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 02a436708c965bd6bbb88c1e8896f7b9 ChangeLog 7223
 MD5 dc82e2c687345769c53a013331f2abb3 files/digest-mkvtoolnix-1.5.5 69
 MD5 91ac5c9285fd2276b87d33e01746488a files/digest-mkvtoolnix-1.6.0 69
+MD5 10475628f738cb79f2cd3def68ab1091 files/mkvtoolnix-1.6.0-lzo2.patch 3662
 MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
 MD5 b6108f77ecc6287e1e86786261f0d40f mkvtoolnix-1.5.5.ebuild 1475
-MD5 63619e91f73daaecfcdf1412cff70352 mkvtoolnix-1.6.0.ebuild 1481
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDf7c2csIHjyDViGQRAovTAJ9ejisiek1RNP033nThdy9vJm0kywCfb5nR
-FAY5cXOmiSKAV9wPr3RRW7c=
-=gxvc
------END PGP SIGNATURE-----
+MD5 c35f49bad45d07ff2b6f440b1b41130d mkvtoolnix-1.6.0.ebuild 1341
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-1.6.0-lzo2.patch b/media-video/mkvtoolnix/files/mkvtoolnix-1.6.0-lzo2.patch
new file mode 100644
index 000000000000..d0fd487ceba1
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-1.6.0-lzo2.patch
@@ -0,0 +1,116 @@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 3154)
++++ configure.in	(revision 3155)
+@@ -798,17 +798,25 @@ dnl Check for liblzo
+ dnl
+   AC_ARG_ENABLE([lzo],
+     [  --enable-lzo            compile in support for LZO compression (auto)])
+-  if test x"$enable_lzo" = x"yes" -o x"$enable_lzo" = "x"; then
+-    AC_CHECK_LIB(lzo, lzo1x_1_compress,
+-                 [ LZO_LIBS="-llzo"
++  if test "x$enable_lzo" != "xno"; then
++    AC_CHECK_LIB(lzo2, lzo1x_1_compress,
++                 [ LZO_LIBS="-llzo2"
+                    lzo_found=yes ],
+-                 [ lzo_found=no ],)
+-    if test "$lzo_found" = "yes"; then
+-      AC_CHECK_HEADERS(lzo1x.h, , lzo_found=no)
++                 [ AC_CHECK_LIB(lzo, lzo1x_1_compress,
++                                [ LZO_LIBS="-llzo"
++                                  lzo_found=yes ],
++                                [ lzo_found=no ],)
++                 ],)
++    if test "x$lzo_found" = "xyes"; then
++      AC_CHECK_HEADERS([lzo1x.h lzo/lzo1x.h])
++      if test "x$ac_cv_header_lzo1x_h" != "xyes" && "x$ac_cv_header_lzo_lzo1x_h" != "xyes"; then
++        lzo_found=no
++      fi
+     fi
+   fi
+   if test x"$lzo_found" = xyes ; then
+     opt_features_yes="$opt_features_yes; LZO compression"
++    AC_DEFINE([HAVE_LZO], [1], [Define this if LZO compression is present])
+   else
+     opt_features_no="$opt_features_no; LZO compression"
+   fi
+Index: src/merge/mkvmerge.cpp
+===================================================================
+--- src/merge/mkvmerge.cpp	(revision 3154)
++++ src/merge/mkvmerge.cpp	(revision 3155)
+@@ -277,7 +277,7 @@ print_capabilities() {
+ #if defined(HAVE_BZLIB_H)
+   mxinfo("BZ2\n");
+ #endif
+-#if defined(HAVE_LZO1X_H)
++#if defined(HAVE_LZO)
+   mxinfo("LZO\n");
+ #endif
+ #if defined(HAVE_FLAC_FORMAT_H)
+@@ -901,7 +901,7 @@ parse_compression(const string &s,
+ 
+   ti.compression_list[id] = COMPRESSION_UNSPECIFIED;
+   parts[1] = downcase(parts[1]);
+-#ifdef HAVE_LZO1X_H
++#ifdef HAVE_LZO
+   if ((parts[1] == "lzo") || (parts[1] == "lzo1x"))
+     ti.compression_list[id] = COMPRESSION_LZO;
+ #endif
+Index: src/common/compression.h
+===================================================================
+--- src/common/compression.h	(revision 3154)
++++ src/common/compression.h	(revision 3155)
+@@ -80,8 +80,13 @@ public:
+   static compressor_ptr create(const char *method);
+ };
+ 
+-#if defined(HAVE_LZO1X_H)
+-#include <lzo1x.h>
++#ifdef HAVE_LZO
++
++#ifdef HAVE_LZO_LZO1X_H
++# include <lzo/lzo1x.h>
++#else
++# include <lzo1x.h>
++#endif
+ 
+ class MTX_DLL_API lzo_compressor_c: public compressor_c {
+ protected:
+@@ -94,7 +99,7 @@ public:
+   virtual void decompress(memory_cptr &buffer);
+   virtual void compress(memory_cptr &buffer);
+ };
+-#endif // HAVE_LZO1X_H
++#endif // HAVE_LZO
+ 
+ #if defined(HAVE_ZLIB_H)
+ #include <zlib.h>
+Index: src/common/compression.cpp
+===================================================================
+--- src/common/compression.cpp	(revision 3154)
++++ src/common/compression.cpp	(revision 3155)
+@@ -40,8 +40,13 @@ static const int compression_method_map[
+ 
+ // ---------------------------------------------------------------------
+ 
+-#if defined(HAVE_LZO1X_H)
+-#include <lzoutil.h>
++#ifdef HAVE_LZO
++
++#ifdef HAVE_LZO_LZO1X_H
++# include <lzo/lzoutil.h>
++#else
++# include <lzoutil.h>
++#endif
+ 
+ lzo_compressor_c::lzo_compressor_c():
+   compressor_c(COMPRESSION_LZO) {
+@@ -88,7 +93,7 @@ lzo_compressor_c::compress(memory_cptr &
+   buffer = memory_cptr(new memory_c(dst, dstsize, true));
+ }
+ 
+-#endif // HAVE_LZO1X_H
++#endif // HAVE_LZO
+ 
+ // ---------------------------------------------------------------------
+ 
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.5.5.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.5.5.ebuild
index 7b2393dc05d5..5dcd20eea430 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-1.5.5.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-1.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.5.5.ebuild,v 1.4 2005/11/19 23:37:12 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.5.5.ebuild,v 1.5 2005/12/15 21:59:03 flameeyes Exp $
 
 inherit eutils wxwidgets
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="gtk2 wxwindows flac bzip2 lzo"
+IUSE="wxwindows flac bzip2 lzo"
 
 DEPEND=">=dev-libs/libebml-0.7.3
 	>=media-libs/libmatroska-0.7.5
@@ -27,13 +27,7 @@ DEPEND=">=dev-libs/libebml-0.7.3
 pkg_setup() {
 	WX_GTK_VER="2.6"
 	if use wxwindows; then
-		if ! use gtk2 ; then
-			need-wxwidgets gtk || die "You must compile wxGTK without wx_nogtk useflag."
-		else
-			need-wxwidgets gtk2 || die "You must compile wxGTK with gtk2 useflag."
-		fi
-	elif use gtk2; then
-		einfo "You won't have gtk2 support as you requested not to use wxwindows."
+		need-wxwidgets gtk2 || die "You must compile wxGTK with X useflag."
 	fi
 }
 
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild
index 65eb7d55c597..a23f1430ba92 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild,v 1.1 2005/10/30 23:37:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild,v 1.2 2005/12/15 21:59:03 flameeyes Exp $
 
 inherit eutils wxwidgets
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk2 wxwindows flac bzip2 lzo"
+IUSE="wxwindows flac bzip2 lzo"
 
 DEPEND=">=dev-libs/libebml-0.7.3
 	>=media-libs/libmatroska-0.7.5
@@ -27,16 +27,17 @@ DEPEND=">=dev-libs/libebml-0.7.3
 pkg_setup() {
 	WX_GTK_VER="2.6"
 	if use wxwindows; then
-		if ! use gtk2 ; then
-			need-wxwidgets gtk || die "You must compile wxGTK without wx_nogtk useflag."
-		else
-			need-wxwidgets gtk2 || die "You must compile wxGTK with gtk2 useflag."
-		fi
-	elif use gtk2; then
-		einfo "You won't have gtk2 support as you requested not to use wxwindows."
+		need-wxwidgets gtk2 || die "You must compile wxGTK with X useflag."
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-lzo2.patch"
+}
+
 src_compile() {
 	econf \
 		$(use_enable lzo) \