diff options
author | wiz <wiz> | 2007-10-15 06:07:18 +0000 |
---|---|---|
committer | wiz <wiz> | 2007-10-15 06:07:18 +0000 |
commit | c4b3ce2ab6d4c39705dbbf3d10b598dfac48986c (patch) | |
tree | 673f3285272f2417af5d82f9065fd37faec5c0e2 /multimedia | |
parent | 0b199bb4a652fcaece1be0a9d53b0323c6fcd5c1 (diff) | |
download | pkgsrc-c4b3ce2ab6d4c39705dbbf3d10b598dfac48986c.tar.gz |
Fix typo in patch-aa.
Get rid of autoconf dependency by adding a patch for configure.
Fixes compiled-in path to support files -- bump PKGREVISION.
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/dvdstyler/Makefile | 9 | ||||
-rw-r--r-- | multimedia/dvdstyler/distinfo | 5 | ||||
-rw-r--r-- | multimedia/dvdstyler/patches/patch-aa | 4 | ||||
-rw-r--r-- | multimedia/dvdstyler/patches/patch-ac | 142 |
4 files changed, 150 insertions, 10 deletions
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile index 45ef0211304..82c1eecf62d 100644 --- a/multimedia/dvdstyler/Makefile +++ b/multimedia/dvdstyler/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:05 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2007/10/15 06:07:18 wiz Exp $ # DISTNAME= DVDStyler-1.5b4 PKGNAME= dvdstyler-1.5beta4 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvdstyler/} @@ -18,16 +18,13 @@ DEPENDS+= mpgtx-[0-9]*:../../graphics/mpgtx USE_DIRS+= xdg-1.1 USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes -USE_TOOLS+= autoconf gmake pkg-config msgfmt +USE_TOOLS+= gmake pkg-config msgfmt GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-kde CONFIGURE_ARGS+= --disable-gnome CONFIGURE_ARGS+= --disable-libgnomeui -pre-configure: - cd ${WRKSRC} && autoconf - .include "../../graphics/netpbm/buildlink3.mk" .include "../../graphics/wxsvg/buildlink3.mk" .include "../../multimedia/mjpegtools/buildlink3.mk" diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo index 2e3ff622a71..5d54ccb4b94 100644 --- a/multimedia/dvdstyler/distinfo +++ b/multimedia/dvdstyler/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.2 2006/01/31 02:57:18 xtraeme Exp $ +$NetBSD: distinfo,v 1.3 2007/10/15 06:07:19 wiz Exp $ SHA1 (DVDStyler-1.5b4.tar.gz) = 31d41e71c81bf30f95cb311d59f0acfdf6ed28cc RMD160 (DVDStyler-1.5b4.tar.gz) = a5b885dd918b47a6b3a658bfd6b802926a2ed057 Size (DVDStyler-1.5b4.tar.gz) = 658377 bytes -SHA1 (patch-aa) = 7158a3d97445b837dcd0b807abe9f47a73d6c56e +SHA1 (patch-aa) = 19c43c10825692be1545847a3d6018f010ce423f SHA1 (patch-ab) = 2ef45a125f8e816aeec322805b425b2a122bd37c +SHA1 (patch-ac) = 0635447d049bcde67cd6320e2f48c142a08f80f7 diff --git a/multimedia/dvdstyler/patches/patch-aa b/multimedia/dvdstyler/patches/patch-aa index eb68282af01..33fcd3ff53e 100644 --- a/multimedia/dvdstyler/patches/patch-aa +++ b/multimedia/dvdstyler/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2006/01/31 02:57:18 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2007/10/15 06:07:19 wiz Exp $ --- configure.in.orig 2005-10-19 11:02:58.000000000 +0200 +++ configure.in 2006-01-31 03:42:46.000000000 +0100 @@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.1 2006/01/31 02:57:18 xtraeme Exp $ + ac_cv_enable_libgnomeui="$enableval", ac_cv_enable_libgnomeui="yes") + +if test x"$ac_cv_enable_libgnomeui" = x"yes" ; then -+ PKG_CHECK_MODULES(GNOMEUI2, lignomeui-2.0, GNOME2="-DGNOME2", ++ PKG_CHECK_MODULES(GNOMEUI2, libgnomeui-2.0, GNOME2="-DGNOME2", AC_MSG_WARN([libgnomeui will not be used for rendering of thumbnails])) + CXXFLAGS="$CXXFLAGS $GNOME2" + LIBS="$LIBS $GNOMEUI2_LIBS " diff --git a/multimedia/dvdstyler/patches/patch-ac b/multimedia/dvdstyler/patches/patch-ac new file mode 100644 index 00000000000..2a08d3c95e0 --- /dev/null +++ b/multimedia/dvdstyler/patches/patch-ac @@ -0,0 +1,142 @@ +$NetBSD: patch-ac,v 1.1 2007/10/15 06:07:19 wiz Exp $ + +--- configure.orig 2005-10-19 09:02:58.000000000 +0000 ++++ configure +@@ -873,6 +1325,10 @@ Optional Features: + --enable-debug Enable debugging information + --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors ++ --enable-kde enable kde support (default: yes) ++ --enable-gnome enable gnome support (default: yes) ++ --enable-libgnomeui enable libgnomeui to render thumbnails (default: ++ yes) + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -4047,11 +4524,19 @@ else + fi + + else ++ # Check whether --enable-kde was given. ++if test "${enable_kde+set}" = set; then ++ enableval=$enable_kde; ac_cv_enable_kde="$enableval" ++else ++ ac_cv_enable_kde="yes" ++fi ++ ++ if test x"$ac_cv_enable_kde" = x"yes" ; then + + # Extract the first word of "kde-config", so it can be a program name with args. + set dummy kde-config; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_KDE_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -4115,16 +4601,29 @@ else + fi + + ++ else ++ { echo "$as_me:$LINENO: WARNING: *** kde support disabled ***" >&5 ++echo "$as_me: WARNING: *** kde support disabled ***" >&2;} ++ USE_KDE_FALSE="yes" ++ fi ++ # Check whether --enable-gnome was given. ++if test "${enable_gnome+set}" = set; then ++ enableval=$enable_gnome; ac_cv_enable_gnome="$enableval" ++else ++ ac_cv_enable_gnome="yes" ++fi ++ ++ if test x"$ac_cv_enable_gnome" = x"yes" ; then + + echo "$as_me:$LINENO: checking for GNOME data directory" >&5 + echo $ECHO_N "checking for GNOME data directory... $ECHO_C" >&6 + GNOME_DATA_DIR=`gnome-config --datadir 2>/dev/null` + if test x$GNOME_DATA_DIR = x ; then + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + else + echo "$as_me:$LINENO: result: $GNOME_DATA_DIR" >&5 + echo "${ECHO_T}$GNOME_DATA_DIR" >&6 + fi + + +@@ -4138,13 +4637,18 @@ else + fi + + ++ else ++ { echo "$as_me:$LINENO: WARNING: *** gnome support disabled ***" >&5 ++echo "$as_me: WARNING: *** gnome support disabled ***" >&2;} ++ USE_GNOME_FALSE="yes" ++ fi + fi + CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS $WX_CXXFLAGS " + LIBS="$LIBS $WX_LIBS " + + + echo "$as_me:$LINENO: checking for main in -lwxsvg" >&5 + echo $ECHO_N "checking for main in -lwxsvg... $ECHO_C" >&6 + if test "${ac_cv_lib_wxsvg_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -4611,28 +5259,37 @@ fi + + + + echo "$as_me:$LINENO: checking if wxWindows was linked with GTK2" >&5 + echo $ECHO_N "checking if wxWindows was linked with GTK2... $ECHO_C" >&6 + if $WX_CONFIG_NAME --libs | grep 'gtk2' > /dev/null ; then + GTK_USEDVERSION=2 + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + + +-if test x"$GTK_USEDVERSION" = x"2" ; then ++ ++# Check whether --enable-libgnomeui was given. ++if test "${enable_libgnomeui+set}" = set; then ++ enableval=$enable_libgnomeui; ac_cv_enable_libgnomeui="$enableval" ++else ++ ac_cv_enable_libgnomeui="yes" ++fi ++ ++ ++if test x"$ac_cv_enable_libgnomeui" = x"yes" ; then + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. + set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -4777,13 +5449,16 @@ echo "$as_me: WARNING: libgnomeui will n + else + GNOMEUI2_CFLAGS=$pkg_cv_GNOMEUI2_CFLAGS + GNOMEUI2_LIBS=$pkg_cv_GNOMEUI2_LIBS + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + GNOME2="-DGNOME2" + fi ++ CXXFLAGS="$CXXFLAGS $GNOME2" ++ LIBS="$LIBS $GNOMEUI2_LIBS " ++else ++ { echo "$as_me:$LINENO: WARNING: libgnomeui dependency disabled" >&5 ++echo "$as_me: WARNING: libgnomeui dependency disabled" >&2;} + fi +-CXXFLAGS="$CXXFLAGS $GNOME2" +-LIBS="$LIBS $GNOMEUI2_LIBS " + + CXXFLAGS="$CXXFLAGS -DDATADIR=\\\"$datadir/$PACKAGE\\\"" + |