diff options
author | joerg <joerg@pkgsrc.org> | 2006-05-19 20:53:34 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-05-19 20:53:34 +0000 |
commit | 32ca6eb1866425892f13a252c2df643ac929f500 (patch) | |
tree | e4c1253ed3759643a8a0456565195f7a73130a26 | |
parent | f8d6eb0e4acfbb301aadaf1884fd012202f55ef7 (diff) | |
download | pkgsrc-32ca6eb1866425892f13a252c2df643ac929f500.tar.gz |
Include cdda and vcd plugin in PLIST, they should be enabled by default.
Bump revision for this. Add DragonFly support.
-rw-r--r-- | multimedia/vlc08/Makefile | 4 | ||||
-rw-r--r-- | multimedia/vlc08/PLIST | 4 | ||||
-rw-r--r-- | multimedia/vlc08/distinfo | 6 | ||||
-rw-r--r-- | multimedia/vlc08/patches/patch-aa | 13 | ||||
-rw-r--r-- | multimedia/vlc08/patches/patch-ab | 13 | ||||
-rw-r--r-- | multimedia/vlc08/patches/patch-ai | 157 |
6 files changed, 191 insertions, 6 deletions
diff --git a/multimedia/vlc08/Makefile b/multimedia/vlc08/Makefile index a09f7647ea7..8c84e613216 100644 --- a/multimedia/vlc08/Makefile +++ b/multimedia/vlc08/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2006/05/10 16:28:43 drochner Exp $ +# $NetBSD: Makefile,v 1.4 2006/05/19 20:53:34 joerg Exp $ # DISTNAME= vlc-${VLC_VER} +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/ EXTRACT_SUFX= .tar.bz2 @@ -10,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.videolan.org/ COMMENT= VideoLAN Client +USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes diff --git a/multimedia/vlc08/PLIST b/multimedia/vlc08/PLIST index 1510073b8b2..41cfde99fe3 100644 --- a/multimedia/vlc08/PLIST +++ b/multimedia/vlc08/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2006/05/10 16:28:43 drochner Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/05/19 20:53:34 joerg Exp $ bin/vlc bin/vlc-config bin/wxvlc @@ -21,10 +21,12 @@ lib/vlc/access/libaccess_http_plugin.so lib/vlc/access/libaccess_mms_plugin.so lib/vlc/access/libaccess_tcp_plugin.so lib/vlc/access/libaccess_udp_plugin.so +lib/vlc/access/libcdda_plugin.so lib/vlc/access/libcddax_plugin.so lib/vlc/access/libdvdnav_plugin.so lib/vlc/access/libdvdread_plugin.so lib/vlc/access/libscreen_plugin.so +lib/vlc/access/libvcd_plugin.so lib/vlc/access_filter/libaccess_filter_record_plugin.so lib/vlc/access_filter/libaccess_filter_timeshift_plugin.so lib/vlc/access_output/libaccess_output_dummy_plugin.so diff --git a/multimedia/vlc08/distinfo b/multimedia/vlc08/distinfo index c90404ed4f9..a68c460b14d 100644 --- a/multimedia/vlc08/distinfo +++ b/multimedia/vlc08/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.2 2006/05/10 16:28:43 drochner Exp $ +$NetBSD: distinfo,v 1.3 2006/05/19 20:53:34 joerg Exp $ SHA1 (vlc-0.8.5.tar.bz2) = 2f0a26a336a5211f32c7bcc653dfd0b27f1fb26b RMD160 (vlc-0.8.5.tar.bz2) = d24140a5b4bf771754028090e103bb5c171e4fd8 Size (vlc-0.8.5.tar.bz2) = 8562996 bytes +SHA1 (patch-aa) = a12d95fc0d6266969431a3c42d438b3cc11acc79 +SHA1 (patch-ab) = 3a0754638228d664570c7c437b5188195b23c734 SHA1 (patch-ag) = 4c1b802dc4df1c521398dc9b07794232bb5b21d9 SHA1 (patch-ah) = 5a355a70b7b39c0a33db7cc37e3944f903686d3f -SHA1 (patch-ai) = 99214a216739200660795aaf3100fd69da7d45ee +SHA1 (patch-ai) = 655df187ab529eb30753531dafbf4b68f7a85785 diff --git a/multimedia/vlc08/patches/patch-aa b/multimedia/vlc08/patches/patch-aa new file mode 100644 index 00000000000..fdf372d5e88 --- /dev/null +++ b/multimedia/vlc08/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1 2006/05/19 20:53:34 joerg Exp $ + +--- include/vlc_common.h.orig 2006-05-19 19:46:18.000000000 +0000 ++++ include/vlc_common.h +@@ -873,7 +873,7 @@ static inline void _SetQWBE( uint8_t *p, + # define vlc_strtoll NULL + #endif + +-#if defined(SYS_BEOS) ++#if defined(SYS_BEOS) || defined(__DragonFly__) + typedef struct { + long long quot; /* Quotient. */ + long long rem; /* Remainder. */ diff --git a/multimedia/vlc08/patches/patch-ab b/multimedia/vlc08/patches/patch-ab new file mode 100644 index 00000000000..4b3a2ae7d1a --- /dev/null +++ b/multimedia/vlc08/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.3 2006/05/19 20:53:34 joerg Exp $ + +--- src/extras/libc.c.orig 2006-05-19 20:06:19.000000000 +0000 ++++ src/extras/libc.c +@@ -346,7 +346,7 @@ int64_t vlc_atoll( const char *nptr ) + /***************************************************************************** + * lldiv: returns quotient and remainder + *****************************************************************************/ +-#if defined(SYS_BEOS) ++#if defined(SYS_BEOS) || defined(__DragonFly__) + lldiv_t vlc_lldiv( long long numer, long long denom ) + { + lldiv_t d; diff --git a/multimedia/vlc08/patches/patch-ai b/multimedia/vlc08/patches/patch-ai index 9b5f5a83ccb..888c71e0870 100644 --- a/multimedia/vlc08/patches/patch-ai +++ b/multimedia/vlc08/patches/patch-ai @@ -1,7 +1,33 @@ -$NetBSD: patch-ai,v 1.1 2006/05/10 16:28:43 drochner Exp $ +$NetBSD: patch-ai,v 1.2 2006/05/19 20:53:34 joerg Exp $ ---- configure.orig 2006-05-08 13:43:40.000000000 +0200 +--- configure.orig 2006-05-06 15:54:17.000000000 +0000 +++ configure +@@ -30035,13 +30035,13 @@ fi + if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then + THREAD_LIB=error + if test "${THREAD_LIB}" = "error"; then +- echo "$as_me:$LINENO: checking for main in -lpthread" >&5 +-echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 ++echo $ECHO_N "checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6 + if test "${ac_cv_lib_pthread_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpthread $LIBS" ++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -30093,7 +30093,7 @@ fi + echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5 + echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6 + if test $ac_cv_lib_pthread_main = yes; then +- THREAD_LIB="-lpthread" ++ THREAD_LIB="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" + fi + + fi @@ -36628,7 +36628,7 @@ fi; test "${enable_debug}" != "yes" && enable_debug="no" @@ -11,6 +37,115 @@ $NetBSD: patch-ai,v 1.1 2006/05/10 16:28:43 drochner Exp $ cat >>confdefs.h <<\_ACEOF #define NDEBUG 1 _ACEOF +@@ -37311,7 +37311,7 @@ echo "${ECHO_T}yes" >&6 + + + for element in access_dv; do +- eval "LDFLAGS_${element}="'"'"-L${with_dv_raw1394}/lib -lraw1394 -lpthread "'$'"{LDFLAGS_${element}} "'"' ++ eval "LDFLAGS_${element}="'"'"-L${with_dv_raw1394}/lib -lraw1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"' + am_modules_with_ldflags="${am_modules_with_ldflags} ${element}" + done + +@@ -37563,7 +37563,7 @@ echo $ECHO_N "checking for avc1394 heade + echo "${ECHO_T}yes" >&6 + + for element in access_dv; do +- eval "LDFLAGS_${element}="'"'"-L${with_dv_avc1394}/lib -lavc1394 -lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"' ++ eval "LDFLAGS_${element}="'"'"-L${with_dv_avc1394}/lib -lavc1394 -lrom1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"' + am_modules_with_ldflags="${am_modules_with_ldflags} ${element}" + done + +@@ -37727,7 +37727,7 @@ if test `eval echo '${'$as_ac_Header'}'` + _ACEOF + + for element in access_dv; do +- eval "LDFLAGS_${element}="'"'"-lavc1394 -lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"' ++ eval "LDFLAGS_${element}="'"'"-lavc1394 -lrom1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"' + am_modules_with_ldflags="${am_modules_with_ldflags} ${element}" + done + +@@ -37766,7 +37766,7 @@ echo "$as_me: error: cannot cd to ${real + echo "${ECHO_T}${real_dv_avc1394_tree}/src/.libs/libavc1394.a" >&6 + + for element in access_dv; do +- eval "LDFLAGS_${element}="'"'"-L${real_dv_avc1394_tree}/src/.libs -lavc1394 -lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"' ++ eval "LDFLAGS_${element}="'"'"-L${real_dv_avc1394_tree}/src/.libs -lavc1394 -lrom1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"' + am_modules_with_ldflags="${am_modules_with_ldflags} ${element}" + done + +@@ -43126,14 +43126,14 @@ echo "${ECHO_T}no" >&6 + echo "$as_me: error: cannot cd to ${with_ffmpeg_tree}" >&2;} + { (exit 1); exit 1; }; } + fi +- if ! test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then ++ if ! test -f "${real_ffmpeg_tree}/libavcodec.a"; then + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 +- { { echo "$as_me:$LINENO: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&5 +-echo "$as_me: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&2;} ++ { { echo "$as_me:$LINENO: error: cannot find ${real_ffmpeg_tree}/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&5 ++echo "$as_me: error: cannot find ${real_ffmpeg_tree}/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&2;} + { (exit 1); exit 1; }; } + fi +- if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then ++ if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec.a"; then + if test -f "${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a"; then + + for element in ffmpeg; do +@@ -43144,13 +43144,13 @@ echo "$as_me: error: cannot find ${real_ + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 +- { { echo "$as_me:$LINENO: error: ${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&5 +-echo "$as_me: error: ${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&2;} ++ { { echo "$as_me:$LINENO: error: ${real_ffmpeg_tree}/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&5 ++echo "$as_me: error: ${real_ffmpeg_tree}/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&2;} + { (exit 1); exit 1; }; } + fi + fi +- echo "$as_me:$LINENO: result: ${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&5 +-echo "${ECHO_T}${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&6 ++ echo "$as_me:$LINENO: result: ${real_ffmpeg_tree}/libavcodec.a" >&5 ++echo "${ECHO_T}${real_ffmpeg_tree}/libavcodec.a" >&6 + + if fgrep -s "CONFIG_ZLIB=yes" "${real_ffmpeg_tree}/config.mak"; then + if test "${with_ffmpeg_zlib}" != "yes"; then +@@ -43318,7 +43318,7 @@ fi + + + for element in ffmpeg; do +- eval "LDFLAGS_${element}="'"'"-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a "'$'"{LDFLAGS_${element}} "'"' ++ eval "LDFLAGS_${element}="'"'"-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec.a "'$'"{LDFLAGS_${element}} "'"' + am_modules_with_ldflags="${am_modules_with_ldflags} ${element}" + done + +@@ -55864,7 +55864,7 @@ fi + + + for element in directfb; do +- eval "LDFLAGS_${element}="'"'"-ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"' ++ eval "LDFLAGS_${element}="'"'"-ldirectfb -lfusion -ldirect ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"' + am_modules_with_ldflags="${am_modules_with_ldflags} ${element}" + done + +@@ -56043,7 +56043,7 @@ if test "${with_directfb+set}" = set; th + + + for element in directfb; do +- eval "LDFLAGS_${element}="'"'"-L${with_directfb}/lib -ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"' ++ eval "LDFLAGS_${element}="'"'"-L${with_directfb}/lib -ldirectfb -lfusion -ldirect ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"' + am_modules_with_ldflags="${am_modules_with_ldflags} ${element}" + done + +@@ -58056,7 +58056,7 @@ echo $ECHO_N "checking for XML parser to + LIBS_save="$LIBS" + LIBS_cclink="no" + for l in "`xml2-config --libs`" -lexpat -lxerces-c; do +- LIBS="$LIBS_save ${real_cyberlink_tree}/lib/unix/libclink.a -lpthread $l" ++ LIBS="$LIBS_save ${real_cyberlink_tree}/lib/unix/libclink.a ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $l" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF @@ -58120,7 +58120,7 @@ rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext done @@ -20,6 +155,24 @@ $NetBSD: patch-ai,v 1.1 2006/05/10 16:28:43 drochner Exp $ { { echo "$as_me:$LINENO: error: cannot find XML parser for CyberLink See \`config.log' for more details." >&5 echo "$as_me: error: cannot find XML parser for CyberLink +@@ -58132,7 +58132,7 @@ fi + echo "${ECHO_T}${LIBS_cclink}" >&6 + + for element in upnp_cc; do +- eval "LDFLAGS_${element}="'"'"${real_cyberlink_tree}/lib/unix/libclink.a -lpthread ${LIBS_cclink} "'$'"{LDFLAGS_${element}} "'"' ++ eval "LDFLAGS_${element}="'"'"${real_cyberlink_tree}/lib/unix/libclink.a ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${LIBS_cclink} "'$'"{LDFLAGS_${element}} "'"' + am_modules_with_ldflags="${am_modules_with_ldflags} ${element}" + done + +@@ -58181,7 +58181,7 @@ if test "${ac_cv_lib_upnp_UpnpInit+set}" + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lupnp -lpthread $LIBS" ++LIBS="-lupnp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF @@ -58244,7 +58244,7 @@ else has_upnp="no" fi |