pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib/patches update to 1.1.7



details:   https://anonhg.NetBSD.org/pkgsrc/rev/87d6b131026c
branches:  trunk
changeset: 530076:87d6b131026c
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Jun 15 18:20:06 2007 +0000

description:
update to 1.1.7
changes:
-bugfixes, among others for VCD playback
-adds support for libdca (formerly libdts)
-handle disappearing audio devices (possibly ALSA specific)

diffstat:

 multimedia/xine-lib/patches/patch-ac |  118 ------------------------
 multimedia/xine-lib/patches/patch-ae |    8 +-
 multimedia/xine-lib/patches/patch-ag |   87 +++++++++--------
 multimedia/xine-lib/patches/patch-an |  170 -----------------------------------
 multimedia/xine-lib/patches/patch-ao |   10 +-
 multimedia/xine-lib/patches/patch-ap |   10 +-
 multimedia/xine-lib/patches/patch-av |   30 ------
 multimedia/xine-lib/patches/patch-ax |   12 --
 8 files changed, 62 insertions(+), 383 deletions(-)

diffs (truncated from 576 to 300 lines):

diff -r 3279197ebb5a -r 87d6b131026c multimedia/xine-lib/patches/patch-ac
--- a/multimedia/xine-lib/patches/patch-ac      Fri Jun 15 18:20:05 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/12/08 09:24:26 abs Exp $
-
---- src/audio_out/audio_sun_out.c.orig 2006-07-16 17:18:09.000000000 +0100
-+++ src/audio_out/audio_sun_out.c
-@@ -41,6 +41,11 @@
- #ifdef        __svr4__
- #include <stropts.h>
- #endif
-+#include <sys/param.h>
-+
-+#if (defined(BSD) && BSD >= 199306)
-+typedef unsigned uint_t;
-+#endif
- 
- #include "xine_internal.h"
- #include "xineutils.h"
-@@ -89,7 +94,9 @@ typedef struct sun_driver_s {
-   uint32_t       num_channels;
-   int          bytes_per_frame;
- 
-+#ifndef __NetBSD__
-   uint32_t       frames_in_buffer;     /* number of frames writen to audio hardware   */
-+#endif
- 
-   enum {
-       RTSC_UNKNOWN = 0,
-@@ -114,12 +121,14 @@ typedef struct sun_driver_s {
-   unsigned     buf_len;
- #endif
- 
-+#ifndef __NetBSD__
- #if   SW_SAMPLE_COUNT
-   struct timeval tv0;
-   uint_t       sample0;
- #endif
- 
-   uint_t       last_samplecnt;
-+#endif
- } sun_driver_t;
- 
- 
-@@ -129,6 +138,7 @@ typedef struct sun_driver_s {
-  */
- static int realtime_samplecounter_available(xine_t *xine, char *dev)
- {
-+#ifndef __NetBSD__
-   int fd = -1;
-   audio_info_t info;
-   int rtsc_ok = RTSC_DISABLED;
-@@ -247,6 +257,9 @@ error:
-   }
- 
-   return rtsc_ok;
-+#else
-+  return RTSC_ENABLED;
-+#endif
- }
- 
- 
-@@ -430,7 +443,9 @@ static int ao_sun_open(ao_driver_t *this
-   
-   this->mode                  = mode;
-   this->input_sample_rate     = rate;
-+#ifndef __NetBSD__
-   this->frames_in_buffer      = 0;
-+#endif
- 
-   /*
-    * open audio device
-@@ -462,6 +477,9 @@ static int ao_sun_open(ao_driver_t *this
-       info.play.sample_rate = this->input_sample_rate;
-       info.play.eof = 0;
-       info.play.samples = 0;
-+#ifdef __NetBSD__
-+      info.blocksize = 1024;
-+#endif
- 
-       this->convert_u8_s8 = 0;
- 
-@@ -523,7 +541,9 @@ static int ao_sun_open(ao_driver_t *this
-       return 0;
-   }
- 
-+#ifndef __NetBSD__
-   this->last_samplecnt = 0;
-+#endif
- 
-   this->output_sample_rate = info.play.sample_rate;
-   this->num_channels = info.play.channels;
-@@ -564,6 +584,7 @@ static int ao_sun_delay(ao_driver_t *thi
-   sun_driver_t *this = (sun_driver_t *) this_gen;
-   audio_info_t info;
- 
-+#ifndef __NetBSD__
-   if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0 &&
-       (this->frames_in_buffer == 0 || info.play.samples > 0)) {
- 
-@@ -610,6 +631,10 @@ static int ao_sun_delay(ao_driver_t *thi
-     }
- #endif
-   }
-+#else
-+  if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0)
-+    return info.play.seek / this->bytes_per_frame;
-+#endif
-   return NOT_REAL_TIME;
- }
- 
-@@ -718,7 +743,9 @@ static int ao_sun_write(ao_driver_t *thi
-   if (num_written > 0) {
-     int buffered_samples;
- 
-+#ifndef __NetBSD__
-     this->frames_in_buffer += num_written / this->bytes_per_frame;
-+#endif
- 
-     /* 
-      * Avoid storing too much data in the sound driver's buffers.
diff -r 3279197ebb5a -r 87d6b131026c multimedia/xine-lib/patches/patch-ae
--- a/multimedia/xine-lib/patches/patch-ae      Fri Jun 15 18:20:05 2007 +0000
+++ b/multimedia/xine-lib/patches/patch-ae      Fri Jun 15 18:20:06 2007 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-ae,v 1.3 2006/12/08 09:24:26 abs Exp $
+$NetBSD: patch-ae,v 1.4 2007/06/15 18:20:06 drochner Exp $
 
---- src/input/input_vcd.c.orig 2006-07-10 23:08:16.000000000 +0100
+--- src/input/input_vcd.c.orig 2007-04-05 00:18:00.000000000 +0200
 +++ src/input/input_vcd.c
-@@ -33,6 +33,7 @@
+@@ -32,6 +32,7 @@
  #include <errno.h>
  #include <fcntl.h>
  #include <sys/ioctl.h>
 +#include <sys/param.h>
  #include <string.h>
+ #include <netinet/in.h>
  #ifdef HAVE_LINUX_CDROM_H
- # include <linux/cdrom.h>
 @@ -95,7 +96,7 @@ typedef struct {
  #if defined (__linux__) || defined(__sun)
    struct cdrom_tochdr    tochdr;
diff -r 3279197ebb5a -r 87d6b131026c multimedia/xine-lib/patches/patch-ag
--- a/multimedia/xine-lib/patches/patch-ag      Fri Jun 15 18:20:05 2007 +0000
+++ b/multimedia/xine-lib/patches/patch-ag      Fri Jun 15 18:20:06 2007 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
+$NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $
 
---- configure.ac.orig  2007-01-28 18:17:56.000000000 +0100
+--- configure.ac.orig  2007-04-08 18:31:32.000000000 +0200
 +++ configure.ac
-@@ -220,7 +220,7 @@ AC_ARG_WITH(pthread-prefix, 
-   [pthread_prefix="no"])
+@@ -98,7 +98,7 @@ dnl ------------------------------------
+ AC_CANONICAL_HOST
+ AC_CANONICAL_BUILD
  
- case "$host" in
--  *-*-freebsd*)
-+  *-*-freebsd* | *-*-dragonfly*)
-     if test "x$pthread_prefix" = "xno"; then
-       pthread_prefix="/usr/local"
-     fi
-@@ -584,6 +584,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
+-test "$host" == "$build" && check_athlon=yes
++test "$host" = "$build" && check_athlon=yes
+ 
+ AC_CONFIG_HEADERS([config.h])
+ 
+@@ -549,6 +549,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
  AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
  AC_SUBST(NET_LIBS)
  
@@ -21,7 +21,7 @@
  
  dnl ---------------------------------------------
  dnl socklen_t
-@@ -774,7 +777,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub"
+@@ -739,7 +742,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub"
  AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions)
  AC_MSG_RESULT()
  dnl Check if vld "extended" XvMC is available
@@ -30,7 +30,7 @@
        AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
                     ac_have_xxmc="yes",
                     [ac_have_xxmc="no"
-@@ -804,7 +807,7 @@ if test "x$ac_have_xxmc" = "xyes"; then
+@@ -769,7 +772,7 @@ if test "x$ac_have_xxmc" = "xyes"; then
  fi
  dnl Try fallback to standard XvMC if vld failed
  if test "x$ac_have_xxmc" = "xno"; then
@@ -39,7 +39,7 @@
          AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
                 ac_have_xxmc="yes",
               [ac_have_xxmc="no"
-@@ -858,7 +861,7 @@ saved_libs="$LIBS"
+@@ -823,7 +826,7 @@ saved_libs="$LIBS"
  XVMC_LIBS="-L$xvmc_path -l$xvmc_stub"
  AC_MSG_CHECKING(whether to enable the xvmc plugin)
  AC_MSG_RESULT()
@@ -48,7 +48,7 @@
        AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
               ac_have_xvmc="yes",
             [ac_have_xvmc="no"
-@@ -909,7 +912,6 @@ if test "x$enable_xinerama" != "xno"; th
+@@ -914,7 +917,6 @@ if test "x$enable_xinerama" != "xno"; th
     ])
     if test "x$ac_have_xinerama" = "xyes"; then
        AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
@@ -56,37 +56,37 @@
     fi
  else
    ac_have_xinerama=no
-@@ -1422,10 +1424,21 @@ AC_ARG_ENABLE([oss],
-   [with_oss=$enableval], [with_oss=yes])
+@@ -1416,8 +1418,21 @@ AC_ARG_ENABLE([oss],
+       AS_HELP_STRING([--disable-oss], [Do not build OSS audio output support]))
  
- if test "x$with_oss" = "xyes"; then
+ if test "x$enable_oss" != "xno"; then
++ 
++   case "$host" in
++     *-*-netbsd*|*-*-openbsd*)
++       OSS_LIBS="-lossaudio"
++       ;;
++     *)
++       OSS_LIBS=""
++       ;;
++   esac
 +
-+  case "$host" in
-+    *-*-netbsd*|*-*-openbsd*)
-+      OSS_LIBS="-lossaudio"
-+      ;;
-+    *)
-+      OSS_LIBS=""
-+      ;;
-+  esac
-+
-   AC_MSG_CHECKING(for OSS audio support)
-   have_ossaudio=no
-   AC_TRY_COMPILE([
-           #ifdef __NetBSD__
-+          #include <sys/ioctl.h>
-           #include <soundcard.h>
-           #else
-           #include <sys/soundcard.h>
-@@ -1440,6 +1453,7 @@ else
-   have_ossaudio=no
+    AC_CHECK_HEADERS([sys/soundcard.h machine/soundcard.h soundcard.h], [break])
+    AC_CHECK_DECL([SNDCTL_DSP_SETFRAGMENT], [have_ossaudio=yes], [], [
++     #ifdef __NetBSD__
++     #include <sys/ioctl.h>
++     #endif
+      #ifdef HAVE_SYS_SOUNDCARD_H
+      # include <sys/soundcard.h>
+      #endif
+@@ -1433,6 +1448,7 @@ if test "x$enable_oss" != "xno"; then
  fi
+ 
  AM_CONDITIONAL(HAVE_OSS, test "x$have_ossaudio" = "xyes")
 +AC_SUBST(OSS_LIBS)
  
  
  dnl ---------------------------------------------
-@@ -1565,9 +1579,10 @@ AC_ARG_ENABLE([gnomevfs],
+@@ -1542,9 +1558,10 @@ AC_ARG_ENABLE([gnomevfs],
    [with_gnome_vfs=$enableval], [with_gnome_vfs=yes])
  
  if test "x$with_gnome_vfs" = "xyes"; then
@@ -100,7 +100,7 @@
    AC_SUBST(GNOME_VFS_CFLAGS)
    AC_SUBST(GNOME_VFS_LIBS)
    if test "x$no_gnome_vfs" != "xyes"; then
-@@ -1913,7 +1928,7 @@ int has_timeout=sizeof(test.timeout);],
+@@ -1879,7 +1896,7 @@ int has_timeout=sizeof(test.timeout);]])
            AC_DEFINE([HAVE_WIN32_CDROM], [1], 
                        [Define 1 if you have MinGW CD-ROM support])
         ;;
@@ -109,3 +109,12 @@
            AC_DEFINE([HAVE_FREEBSD_CDROM], [1], 
                        [Define 1 if you have FreeBSD CD-ROM support])
         ;;
+@@ -2574,7 +2591,7 @@ case $host in
+      dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads
+      dnl are requested, as different implementations are present; to avoid problems
+      dnl use -Wl,-z,defs only for those platform not behaving this way.
+-     *-freebsd*) ;;
++     *-freebsd* | *-netbsd*) ;;
+      *)
+       AC_TRY_LDFLAGS([-Wl,-z,defs], [NOUNDEF="-Wl,-z,defs"])
+       ;;
diff -r 3279197ebb5a -r 87d6b131026c multimedia/xine-lib/patches/patch-an
--- a/multimedia/xine-lib/patches/patch-an      Fri Jun 15 18:20:05 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@



Home | Main Index | Thread Index | Old Index