April 2007 - DVDnav-discuss - lists.mplayerhq.hu

r878 - trunk/libdvdnav/src/dvdread/md5.c
by nicodvb 17 Apr '07

17 Apr '07

Author: nicodvb Date: Tue Apr 17 23:02:51 2007 New Revision: 878 Modified: trunk/libdvdnav/src/dvdread/md5.c Log: removed redefinition of memcpy() as bcopy() (maybe done for some probably inexistent systems); patch by Diego Petteno Modified: trunk/libdvdnav/src/dvdread/md5.c ============================================================================== --- trunk/libdvdnav/src/dvdread/md5.c (original) +++ trunk/libdvdnav/src/dvdread/md5.c Tue Apr 17 23:02:51 2007 @@ -26,14 +26,8 @@ #include <sys/types.h> -#if STDC_HEADERS || defined _LIBC -# include <stdlib.h> -# include <string.h> -#else -# ifndef HAVE_MEMCPY -# define memcpy(d, s, n) bcopy ((s), (d), (n)) -# endif -#endif +#include <stdlib.h> +#include <string.h> #include "md5.h" /* #include "unlocked-io.h" */

1 0

r877 - in trunk/libdvdnav/src/vm: decoder.c vmcmd.c
by nicodvb 17 Apr '07

17 Apr '07

Author: nicodvb Date: Tue Apr 17 22:57:17 2007 New Revision: 877 Modified: trunk/libdvdnav/src/vm/decoder.c trunk/libdvdnav/src/vm/vmcmd.c Log: replaced 08llx with PRIx64; patch by Diego Petteno' Modified: trunk/libdvdnav/src/vm/decoder.c ============================================================================== --- trunk/libdvdnav/src/vm/decoder.c (original) +++ trunk/libdvdnav/src/vm/decoder.c Tue Apr 17 22:57:17 2007 @@ -572,7 +572,7 @@ static int32_t eval_command(uint8_t *byt if(command.instruction & ~ command.examined) { fprintf(MSG_OUT, "libdvdnav: decoder.c: [WARNING, unknown bits:"); - fprintf(MSG_OUT, " %08llx", (command.instruction & ~ command.examined) ); + fprintf(MSG_OUT, " %08"PRIx64, (command.instruction & ~ command.examined) ); fprintf(MSG_OUT, "]\n"); } Modified: trunk/libdvdnav/src/vm/vmcmd.c ============================================================================== --- trunk/libdvdnav/src/vm/vmcmd.c (original) +++ trunk/libdvdnav/src/vm/vmcmd.c Tue Apr 17 22:57:17 2007 @@ -520,7 +520,7 @@ void vm_print_mnemonic(vm_cmd_t *vm_comm if(command.instruction & ~ command.examined) { fprintf(MSG_OUT, " libdvdnav: vmcmd.c: [WARNING, unknown bits:"); - fprintf(MSG_OUT, " %08llx", (command.instruction & ~ command.examined) ); + fprintf(MSG_OUT, " %08"PRIx64, (command.instruction & ~ command.examined) ); fprintf(MSG_OUT, "]"); } }

1 0

[PATCH] Support non-Linux GLIBC systems and OS X
by Diego 'Flameeyes' Pettenò 17 Apr '07

17 Apr '07

Hi, the attached patch is something we have applied to the internal copy of libdvdnav in xine-lib for a while now, and adds support for non-Linux GLIBC-based systems (GNU/k*BSD, GNU/Hurd (:P) and Syllable), and for OS X (by using library functions/macros). HTH, -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

5 4

r876 - in trunk/libdvdnav/src: dvdnav.c highlight.c navigation.c read_cache.c searching.c
by nicodvb 16 Apr '07

16 Apr '07

Author: nicodvb Date: Tue Apr 17 00:43:56 2007 New Revision: 876 Modified: trunk/libdvdnav/src/dvdnav.c trunk/libdvdnav/src/highlight.c trunk/libdvdnav/src/navigation.c trunk/libdvdnav/src/read_cache.c trunk/libdvdnav/src/searching.c Log: include inttypes.h wherever necessary Modified: trunk/libdvdnav/src/dvdnav.c ============================================================================== --- trunk/libdvdnav/src/dvdnav.c (original) +++ trunk/libdvdnav/src/dvdnav.c Tue Apr 17 00:43:56 2007 @@ -29,6 +29,7 @@ #define LOG_DEBUG */ +#include <inttypes.h> #include "dvdnav_internal.h" #include "read_cache.h" #include "nav_read.h" Modified: trunk/libdvdnav/src/highlight.c ============================================================================== --- trunk/libdvdnav/src/highlight.c (original) +++ trunk/libdvdnav/src/highlight.c Tue Apr 17 00:43:56 2007 @@ -26,6 +26,7 @@ #endif #include <assert.h> +#include <inttypes.h> #include "nav_types.h" #include "dvdnav_internal.h" Modified: trunk/libdvdnav/src/navigation.c ============================================================================== --- trunk/libdvdnav/src/navigation.c (original) +++ trunk/libdvdnav/src/navigation.c Tue Apr 17 00:43:56 2007 @@ -25,6 +25,7 @@ #include "config.h" #endif +#include <inttypes.h> #include "dvdnav_internal.h" /* Navigation API calls */ Modified: trunk/libdvdnav/src/read_cache.c ============================================================================== --- trunk/libdvdnav/src/read_cache.c (original) +++ trunk/libdvdnav/src/read_cache.c Tue Apr 17 00:43:56 2007 @@ -31,6 +31,7 @@ #include "config.h" #endif +#include <inttypes.h> #include "dvdnav.h" #include "dvdnav_internal.h" #include "read_cache.h" Modified: trunk/libdvdnav/src/searching.c ============================================================================== --- trunk/libdvdnav/src/searching.c (original) +++ trunk/libdvdnav/src/searching.c Tue Apr 17 00:43:56 2007 @@ -26,6 +26,7 @@ #endif #include <assert.h> +#include <inttypes.h> #include "dvdnav_internal.h" /*

1 0

r875 - trunk/libdvdnav/src/dvdread/bswap.h
by nicodvb 16 Apr '07

16 Apr '07

Author: nicodvb Date: Mon Apr 16 23:24:01 2007 New Revision: 875 Modified: trunk/libdvdnav/src/dvdread/bswap.h Log: support for non-linux GLIBC-based systems and OSX; patch by Diego Petteno' (flameeyes gmail com) Modified: trunk/libdvdnav/src/dvdread/bswap.h ============================================================================== --- trunk/libdvdnav/src/dvdread/bswap.h (original) +++ trunk/libdvdnav/src/dvdread/bswap.h Mon Apr 16 23:24:01 2007 @@ -35,12 +35,18 @@ #include <sys/param.h> #endif -#if defined(__linux__) +#if defined(__linux__) || defined(__GLIBC__) #include <byteswap.h> #define B2N_16(x) x = bswap_16(x) #define B2N_32(x) x = bswap_32(x) #define B2N_64(x) x = bswap_64(x) +#elif defined(__APPLE__) +#include <libkern/OSByteOrder.h> +#define B2N_16(x) x = OSSwapBigToHostInt16(x) +#define B2N_32(x) x = OSSwapBigToHostInt32(x) +#define B2N_64(x) x = OSSwapBigToHostInt64(x) + #elif defined(__NetBSD__) #include <sys/endian.h> #define B2N_16(x) BE16TOH(x)

1 0

[PATCH] Improve build system similarly to FFmpeg's
by Diego 'Flameeyes' Pettenò 16 Apr '07

16 Apr '07

Hi, as I'm working on integrating this new libdvdnav sources into xine-lib (1.2), I've found a bit limited the build system as it is; the attached patch adds a few extra features like the ones present in FFmpeg's configure. Namely it replaces --enable-debug with --disable-strip (more proper name, --enable-debug would make me think about debug code sincerely), adds an option to disable passing -O3 to CFLAGS, and adds options to decide which CC and MAKE to use, plus adds support for passing extra CFLAGS/LDFLAGS, exactly as FFmpeg. Unfortunately it's not yet enough for what I need, as it doesn't support (yet) to build with srcdir != builddir, but I'll probably give it a try later on to handle that. For who's interested to see what I'm doing in xine-lib, the branch where I'm working is http://hg.debian.org/hg/xine-lib/playgrounds/xine-lib-1.2-newdvdnav . HTH, -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

3 3

r874 - in trunk/libdvdnav: Makefile configure2
by nicodvb 16 Apr '07

16 Apr '07

Author: nicodvb Date: Mon Apr 16 22:49:16 2007 New Revision: 874 Modified: trunk/libdvdnav/Makefile trunk/libdvdnav/configure2 Log: added options to specify cc, make, ldflags, cflags, optimizations and disable-strip; also unbound --disable-debug from -strip; patch by Diego Petteno' (flameeyes gmail com) Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Mon Apr 16 22:49:16 2007 @@ -4,8 +4,6 @@ include config.mak .SUFFIXES: .so -MAKE=make -CC=gcc AR=ar LD=ld RANLIB=ranlib @@ -38,7 +36,7 @@ LIB = $(L).a SHLIB = $(L).so -CFLAGS += -g -Wall -funsigned-char -O3 +CFLAGS += -g -Wall -funsigned-char CFLAGS += -I$(CURDIR) -I$(CURDIR)/src -I$(CURDIR)/src/vm \ -I$(CURDIR)/src/dvdread Modified: trunk/libdvdnav/configure2 ============================================================================== --- trunk/libdvdnav/configure2 (original) +++ trunk/libdvdnav/configure2 Mon Apr 16 22:49:16 2007 @@ -3,6 +3,9 @@ dvdnav_sh_version=4.1.1 dvdnav_sh_major=`echo $dvdnav_sh_version | awk -F. '{print $1}'` +cc=gcc +make=make + show_help(){ echo "Usage: configure [options]" echo "Options: [defaults in brackets after descriptions]" @@ -17,7 +20,14 @@ show_help(){ echo " --disable-static do not build static libraries [default=no]" echo " --enable-shared build shared libraries [default=no]" echo " --disable-shared do not build shared libraries [default=yes]" - echo " --enable-debug install with debugging symbols [default=no]" + echo "Advanced options (experts only):" + echo " --cc=CC use C compiler CC [$cc]" + echo " --make=MAKE use specified make [$make]" + echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS" + echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS" + echo "Developer options:" + echo " --disable-strip disable stripping of executables and shared libraries" + echo " --disable-opts disable compiler optimizations" exit 1 } @@ -25,12 +35,11 @@ SHARED=yes STATIC=yes PREFIX=/usr/local/ INSTALLSTRIP=-s +optimizations="-O3" for opt do optval="${opt#*=}" case "$opt" in - --enable-debug) INSTALLSTRIP= - ;; --enable-shared) SHARED=yes ;; --disable-shared) SHARED=no @@ -47,6 +56,18 @@ for opt do ;; --incdir=*) incdir="$optval" ;; + --cc=*) cc="$optval" + ;; + --make=*) make="$optval" + ;; + --extra-cflags=*) cflags="$cflags $optval" + ;; + --extra-ldflags=*) ldflags="$ldflags $optval" + ;; + --disable-strip) INSTALLSTRIP= + ;; + --disable-opts) optimizations="" + ;; --help) show_help ;; esac @@ -68,6 +89,10 @@ BUILD_SHARED=$SHARED BUILD_STATIC=$STATIC SHLIB_VERSION=$dvdnav_sh_version SHLIB_MAJOR=$dvdnav_sh_major +CC=$cc +MAKE=$make +CFLAGS=$optimizations $cflags +LDFLAGS=$ldflags INSTALLSTRIP=$INSTALLSTRIP EOF

1 0

r873 - trunk/libdvdnav/configure2
by nicodvb 15 Apr '07

15 Apr '07

Author: nicodvb Date: Mon Apr 16 00:29:49 2007 New Revision: 873 Modified: trunk/libdvdnav/configure2 Log: removed trailing whitespaces that broke install- targets Modified: trunk/libdvdnav/configure2 ============================================================================== --- trunk/libdvdnav/configure2 (original) +++ trunk/libdvdnav/configure2 Mon Apr 16 00:29:49 2007 @@ -61,9 +61,9 @@ test -z $incdir && incdir=$PREFIX/includ cat > config.mak << EOF # Automatically generated by configure, do not edit PREFIX=$PREFIX -libdir=$libdir -shlibdir=$shlibdir -incdir=$incdir +libdir=$libdir +shlibdir=$shlibdir +incdir=$incdir BUILD_SHARED=$SHARED BUILD_STATIC=$STATIC SHLIB_VERSION=$dvdnav_sh_version

1 0

r872 - trunk/libdvdnav/configure2
by nicodvb 15 Apr '07

15 Apr '07

Author: nicodvb Date: Mon Apr 16 00:24:00 2007 New Revision: 872 Modified: trunk/libdvdnav/configure2 Log: 10l: double definition of enable-static/enable-shared that prevented disabling each of them Modified: trunk/libdvdnav/configure2 ============================================================================== --- trunk/libdvdnav/configure2 (original) +++ trunk/libdvdnav/configure2 Mon Apr 16 00:24:00 2007 @@ -21,7 +21,6 @@ show_help(){ exit 1 } - SHARED=yes STATIC=yes PREFIX=/usr/local/ @@ -34,11 +33,11 @@ for opt do ;; --enable-shared) SHARED=yes ;; - --enable-shared) SHARED=no + --disable-shared) SHARED=no ;; --enable-static) STATIC=yes ;; - --enable-static) STATIC=no + --disable-static) STATIC=no ;; --prefix=*) PREFIX="$optval" ;;

1 0

removing autoshit stuff from dvdnav build system
by Nico Sabbi 15 Apr '07

15 Apr '07

I'm convinced that we are in desperate need to replace the build system with something sane like the one in ffmpeg or mplayer, but I have 0 experience on the subject and prefer coding in C. Any volunteer? Hopeful thanks, Nico

3 6