diff options
author | joerg <joerg> | 2006-01-03 14:35:32 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-01-03 14:35:32 +0000 |
commit | 30bd7ee6aac4bdad6f3cbf0e7e3346016609d6f7 (patch) | |
tree | 8d9fdca2e07b3160dbb583f9a99a97c4d61bde90 /multimedia | |
parent | 02f76559c11ddea7c9a80fc7eef8c5bfeb1b0de0 (diff) | |
download | pkgsrc-30bd7ee6aac4bdad6f3cbf0e7e3346016609d6f7.tar.gz |
Use PTHREAD_* for thread lib detection in configure. Fix DragonFly
in internal dvdread.
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/libdvdnav/distinfo | 4 | ||||
-rw-r--r-- | multimedia/libdvdnav/patches/patch-aa | 30 | ||||
-rw-r--r-- | multimedia/libdvdnav/patches/patch-ab | 13 |
3 files changed, 46 insertions, 1 deletions
diff --git a/multimedia/libdvdnav/distinfo b/multimedia/libdvdnav/distinfo index b8f6a33936c..e2a3d1a81f3 100644 --- a/multimedia/libdvdnav/distinfo +++ b/multimedia/libdvdnav/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/05/04 16:24:52 drochner Exp $ +$NetBSD: distinfo,v 1.4 2006/01/03 14:35:32 joerg Exp $ SHA1 (libdvdnav-0.1.10.tar.gz) = 22289cb8f297664ce36551b818c0083e936632a7 RMD160 (libdvdnav-0.1.10.tar.gz) = 75e7878ab6fd99294b5a1c8fca1391bdbf113616 Size (libdvdnav-0.1.10.tar.gz) = 539803 bytes +SHA1 (patch-aa) = d8170dcb91c08384a6f77f69d3d960e8144686cd +SHA1 (patch-ab) = cd8a866df5c037b2f882939048ed1e368d55a384 diff --git a/multimedia/libdvdnav/patches/patch-aa b/multimedia/libdvdnav/patches/patch-aa new file mode 100644 index 00000000000..8f6fcdb0dd4 --- /dev/null +++ b/multimedia/libdvdnav/patches/patch-aa @@ -0,0 +1,30 @@ +$NetBSD: patch-aa,v 1.3 2006/01/03 14:35:32 joerg Exp $ + +--- configure.orig 2006-01-03 14:22:24.000000000 +0000 ++++ configure +@@ -21228,13 +21228,13 @@ case $host in + *mingw32* | *cygwin*) + ;; + *) +- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 ++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6 + if test "${ac_cv_lib_pthread_pthread_create+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 +@@ -21293,7 +21293,7 @@ fi + echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 + echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 + if test $ac_cv_lib_pthread_pthread_create = yes; then +- THREAD_LIBS="-lpthread" ++ THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" + else + { { echo "$as_me:$LINENO: error: pthread needed" >&5 + echo "$as_me: error: pthread needed" >&2;} diff --git a/multimedia/libdvdnav/patches/patch-ab b/multimedia/libdvdnav/patches/patch-ab new file mode 100644 index 00000000000..b918e3b3306 --- /dev/null +++ b/multimedia/libdvdnav/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2006/01/03 14:35:32 joerg Exp $ + +--- src/dvdread/bswap.h.orig 2006-01-03 14:25:33.000000000 +0000 ++++ src/dvdread/bswap.h +@@ -53,7 +53,7 @@ + #define B2N_32(x) x = swap32(x) + #define B2N_64(x) x = swap64(x) + +-#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000 ++#elif defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD_version >= 470000) + #include <sys/endian.h> + #define B2N_16(x) x = be16toh(x) + #define B2N_32(x) x = be32toh(x) |