head 1.15; access; symbols OPENPKG_E1_MP_HEAD:1.14 OPENPKG_E1_MP:1.14 OPENPKG_E1_MP_2_STABLE:1.14.2.2 OPENPKG_E1_FP:1.14.2.2 OPENPKG_2_STABLE_MP:1.14 OPENPKG_2_STABLE_20061018:1.14.2.2 OPENPKG_2_STABLE:1.14.0.2 OPENPKG_CW_FP:1.13 OPENPKG_1_STABLE_MP:1.2; locks; strict; comment @# @; 1.15 date 2009.06.08.07.58.51; author rse; state dead; branches; next 1.14; commitid lyE2UmeKeEqxG1Rt; 1.14 date 2005.11.23.08.50.31; author thl; state Exp; branches 1.14.2.1; next 1.13; commitid g8znofLnNQq5xRar; 1.13 date 2005.01.04.18.44.36; author ms; state Exp; branches; next 1.12; 1.12 date 2004.06.21.12.05.29; author thl; state Exp; branches; next 1.11; 1.11 date 2004.04.29.13.41.43; author ms; state Exp; branches; next 1.10; 1.10 date 2004.04.07.14.40.25; author tho; state Exp; branches; next 1.9; 1.9 date 2004.03.30.10.23.30; author tho; state Exp; branches; next 1.8; 1.8 date 2004.03.29.14.02.44; author tho; state Exp; branches; next 1.7; 1.7 date 2004.03.24.12.44.46; author tho; state Exp; branches; next 1.6; 1.6 date 2004.03.23.13.56.39; author tho; state Exp; branches; next 1.5; 1.5 date 2003.12.17.09.09.05; author rse; state Exp; branches; next 1.4; 1.4 date 2003.11.21.19.34.32; author rse; state Exp; branches; next 1.3; 1.3 date 2003.08.11.10.11.03; author rse; state Exp; branches; next 1.2; 1.2 date 2003.06.04.09.12.42; author rse; state Exp; branches; next 1.1; 1.1 date 2003.05.08.14.07.14; author ms; state Exp; branches; next ; 1.14.2.1 date 2005.11.23.08.50.31; author rse; state dead; branches; next 1.14.2.2; commitid iZxwRSmmWscPXUQr; 1.14.2.2 date 2006.10.16.14.58.22; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.15 log @OpenPKG primarily is about server-computing, so remove some of the dedicated GUI applications @ text @Index: ffmpeg.m4 diff -Nau ffmpeg.m4.orig ffmpeg.m4 --- m4/ffmpeg.m4.orig 2005-01-04 12:40:59 +0100 +++ m4/ffmpeg.m4 2005-01-04 12:43:07 +0100 @@@@ -55,7 +55,7 @@@@ "ac_cv_lib_avcodec_pp_get_context" \ "ac_cv_lib_postproc_pp_get_context" \ "ac_cv_lib_avcodec_register_avcodec"; do - $as_unset $i || test "${$i+set}" != set || { $i=; export $i; } + $as_unset $i || test "${i}set" != set && { $i=; export $i; } done dnl look for headers Index: config.h.in diff -Nau config.h.in.orig config.h.in --- config.h.in.orig 2005-01-04 16:00:38 +0100 +++ config.h.in 2005-01-04 16:01:17 +0100 @@@@ -612,5 +612,8 @@@@ /* define ssize_t to __int64 if it's missing in default includes */ #undef ssize_t +/* define intmax_t to long int if it's missing in default includes */ +#undef intmax_t + /* include internal system specific header */ #include "os_internal.h" Index: configure.ac diff -Nau configure.ac.orig configure.ac --- configure.ac.orig 2005-01-04 15:49:14 +0100 +++ configure.ac 2005-01-04 15:50:33 +0100 @@@@ -183,7 +183,7 @@@@ dnl For systems without inttypes.h would be needed extend generated replacement. dnl AC_CHECK_GENERATE_INTTYPES([lib]) AC_CHECK_TYPE(ssize_t, :, AC_DEFINE(ssize_t, __int64, [define ssize_t to __int64 if it's missing in default includes])) - +AC_CHECK_TYPE(intmax_t, :, AC_DEFINE(intmax_t, long int, [define intmax_t to long int if it's missing in default includes])) dnl --------------------------------------------- dnl threads and OS specific stuff Index: configure diff -Nau configure.orig configure --- configure.orig 2004-03-17 23:01:45.000000000 +0100 +++ configure 2004-03-23 14:08:23.000000000 +0100 @@@@ -24472,6 +24472,72 @@@@ fi +echo "$as_me:$LINENO: checking for intmax_t" >&5 +echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6 +if test "${ac_cv_type_intmax_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((intmax_t *) 0) + return 0; +if (sizeof (intmax_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_intmax_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_intmax_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_intmax_t" >&5 +echo "${ECHO_T}$ac_cv_type_intmax_t" >&6 +if test $ac_cv_type_intmax_t = yes; then + : +else + +cat >>confdefs.h <<\_ACEOF +#define intmax_t long int +_ACEOF + +fi + case "$host" in @@@@ -25379,7 +25379,7 @@@@ "ac_cv_lib_avcodec_pp_get_context" \ "ac_cv_lib_postproc_pp_get_context" \ "ac_cv_lib_avcodec_register_avcodec"; do - $as_unset $i || test "${$i+set}" != set || { $i=; export $i; } + $as_unset $i || test "${i}set" != set && { $i=; export $i; } done if test "${ac_cv_header_avcodec_h+set}" = set; then @@@@ -30951,6 +30937,7 @@@@ /* end confdefs.h. */ $ac_includes_default #include +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@@@ -30994,6 +30981,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 Index: src/xine-engine/metronom.c diff -Nau src/xine-engine/metronom.c.orig src/xine-engine/metronom.c --- src/xine-engine/metronom.c.orig 2004-03-23 10:32:16.000000000 +0100 +++ src/xine-engine/metronom.c 2004-03-23 10:33:07.000000000 +0100 @@@@ -33,6 +33,18 @@@@ #include #include +#ifndef PRId64 +# if (#cpu(i386) || #cpu(powerpc)) +# define PRId64 "lld" /* int64_t */ +# else +# define PRId64 "ld" /* int64_t */ +# endif +#endif +#ifndef INT16_MAX +# define INT16_MAX 0x7fff +# define UINT16_MAX 0xffff +#endif + #define LOG_MODULE "metronom" #define LOG_VERBOSE /* Index: src/libdts/xine_decoder.c diff -Nau src/libdts/xine_decoder.c.orig src/libdts/xine_decoder.c --- src/libdts/xine_decoder.c.orig 2004-12-16 14:59:10 +0100 +++ src/libdts/xine_decoder.c 2005-01-04 17:35:17 +0100 @@@@ -53,6 +53,12 @@@@ #define MAX_AC5_FRAME 4096 +#ifndef INT16_MAX +# define INT16_MAX 0x7fff +# define UINT16_MAX 0xffff +# define INT16_MIN (-0x7fff-1) +#endif + typedef struct { audio_decoder_class_t decoder_class; } dts_class_t; Index: src/xine-engine/audio_out.c diff -Nau src/xine-engine/audio_out.c.orig src/xine-engine/audio_out.c --- src/xine-engine/audio_out.c.orig 2004-03-16 21:21:58.000000000 +0100 +++ src/xine-engine/audio_out.c 2004-03-23 10:22:59.000000000 +0100 @@@@ -77,6 +77,24 @@@@ #include #include +#ifndef PRId64 +# if (#cpu(i386) || #cpu(powerpc)) +# define PRId64 "lld" /* int64_t */ +# else +# define PRId64 "ld" /* int64_t */ +# endif +#endif +#ifndef INT16_MAX +# define INT16_MAX 0x7fff +# define UINT16_MAX 0xffff +# define INT16_MIN (-0x7fff-1) +#endif +#ifndef INT8_MAX +# define INT8_MAX 0x7f +# define UINT8_MAX 0xff +# define INT8_MIN (-0x7f-1) +#endif + #define XINE_ENABLE_EXPERIMENTAL_FEATURES #define XINE_ENGINE_INTERNAL Index: src/xine-engine/video_out.c diff -Nau src/xine-engine/video_out.c.orig src/xine-engine/video_out.c --- src/xine-engine/video_out.c.orig 2004-03-16 21:21:58.000000000 +0100 +++ src/xine-engine/video_out.c 2004-03-23 10:23:36.000000000 +0100 @@@@ -37,6 +37,18 @@@@ #include #include +#ifndef PRId64 +# if (#cpu(i386) || #cpu(powerpc)) +# define PRId64 "lld" /* int64_t */ +# else +# define PRId64 "ld" /* int64_t */ +# endif +#endif +#ifndef INT16_MAX +# define INT16_MAX 0x7fff +# define UINT16_MAX 0xffff +#endif + #define XINE_ENABLE_EXPERIMENTAL_FEATURES #define XINE_ENGINE_INTERNAL Index: src/demuxers/demux_ogg.c diff -Nau src/demuxers/demux_ogg.c.orig src/demuxers/demux_ogg.c --- src/demuxers/demux_ogg.c.orig 2004-03-23 14:20:30.000000000 +0100 +++ src/demuxers/demux_ogg.c 2004-03-23 14:20:50.000000000 +0100 @@@@ -60,6 +60,14 @@@@ #include #endif +#ifndef PRId64 +# if (#cpu(i386) || #cpu(powerpc)) +# define PRId64 "lld" /* int64_t */ +# else +# define PRId64 "ld" /* int64_t */ +# endif +#endif + #define LOG_MODULE "demux_ogg" #define LOG_VERBOSE /* Index: src/video_out/video_out_sdl.c diff -Nau src/video_out/video_out_sdl.c.orig src/video_out/video_out_sdl.c --- src/video_out/video_out_sdl.c.orig 2003-02-14 15:47:37.000000000 +0100 +++ src/video_out/video_out_sdl.c 2003-05-08 14:28:24.000000000 +0200 @@@@ -48,7 +48,7 @@@@ #include #include #if defined (__FreeBSD__) -# include +# include #else # include #endif Index: src/video_out/libdha/libdha.h diff -Nau src/video_out/libdha/libdha.h.orig src/video_out/libdha/libdha.h --- src/video_out/libdha/libdha.h.orig 2004-03-29 12:47:54.000000000 +0200 +++ src/video_out/libdha/libdha.h 2004-03-29 12:52:44.000000000 +0200 @@@@ -16,10 +16,14 @@@@ #ifndef LIBDHA_H #define LIBDHA_H -#if defined (__FreeBSD__) -# include -#else +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) # include +#elif defined (__FreeBSD__) +# include +#else +# include #endif #ifdef __cplusplus Index: src/input/dvb/dmx.h diff -Nau src/input/dvb/dmx.h.orig src/input/dvb/dmx.h --- src/input/dvb/dmx.h.orig 2004-03-30 09:16:41.000000000 +0200 +++ src/input/dvb/dmx.h 2004-03-30 09:18:41.000000000 +0200 @@@@ -36,6 +36,16 @@@@ #endif #endif +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) +# include +#elif defined (__FreeBSD__) +# include +#else +# include +#endif + #define DMX_FILTER_SIZE 16 typedef enum Index: src/input/dvb/frontend.h diff -Nau src/input/dvb/frontend.h.orig src/input/dvb/frontend.h --- src/input/dvb/frontend.h.orig 2004-03-30 09:21:25.000000000 +0200 +++ src/input/dvb/frontend.h 2004-03-30 09:21:39.000000000 +0200 @@@@ -38,6 +38,15 @@@@ #endif #endif +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) +# include +#elif defined (__FreeBSD__) +# include +#else +# include +#endif typedef enum { FE_QPSK, Index: src/libfaad/common.h diff -Nau src/libfaad/common.h.orig src/libfaad/common.h --- src/libfaad/common.h.orig 2004-03-30 09:31:33.000000000 +0200 +++ src/libfaad/common.h 2004-03-30 09:32:27.000000000 +0200 @@@@ -177,35 +177,14 @@@@ # include #endif -/* precedence defining int-types by header files for all platforms */ -#if HAVE_INTTYPES_H +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) +# include +#elif defined (__FreeBSD__) # include #else -# if HAVE_STDINT_H -# include -# else -/* we need these... */ -# ifdef WIN32 -typedef unsigned __int64 uint64_t; -typedef unsigned __int32 uint32_t; -typedef unsigned __int16 uint16_t; -typedef unsigned __int8 uint8_t; -typedef __int64 int64_t; -typedef __int32 int32_t; -typedef __int16 int16_t; -typedef __int8 int8_t; -# else /* WIN32 */ -typedef float float32_t; -typedef unsigned long long uint64_t; -typedef unsigned long uint32_t; -typedef unsigned short uint16_t; -typedef unsigned char uint8_t; -typedef long long int64_t; -typedef long int32_t; -typedef short int16_t; -typedef char int8_t; -# endif /* WIN32 */ -# endif +# include #endif #if HAVE_UNISTD_H # include Index: src/libxineadec/nosefart/memguard.c diff -Nau src/libxineadec/nosefart/memguard.c.orig src/libxineadec/nosefart/memguard.c --- src/libxineadec/nosefart/memguard.c.orig 2004-03-30 09:34:54.000000000 +0200 +++ src/libxineadec/nosefart/memguard.c 2004-03-30 09:35:10.000000000 +0200 @@@@ -34,12 +34,14 @@@@ #include #include -#if HAVE_INTTYPES_H -# include +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) +# include +#elif defined (__FreeBSD__) +# include #else -# if HAVE_STDINT_H -# include -# endif +# include #endif #include "memguard.h" Index: src/post/deinterlace/speedy.h diff -Nau src/post/deinterlace/speedy.h.orig src/post/deinterlace/speedy.h --- src/post/deinterlace/speedy.h.orig 2004-03-30 09:40:28.000000000 +0200 +++ src/post/deinterlace/speedy.h 2004-03-30 09:40:40.000000000 +0200 @@@@ -19,10 +19,14 @@@@ #ifndef SPEEDY_H_INCLUDED #define SPEEDY_H_INCLUDED -#if HAVE_INTTYPES_H -#include +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) +# include +#elif defined (__FreeBSD__) +# include #else -#include +# include #endif #ifdef __cplusplus Index: src/xine-engine/Makefile.in --- src/xine-engine/Makefile.in.orig 2005-11-15 12:40:21 +0100 +++ src/xine-engine/Makefile.in 2005-11-21 09:51:46 +0100 @@@@ -547,8 +547,8 @@@@ # FIXME: these are currently unused: EXTRA_DIST = lrb.c lrb.h accel_xvmc.h @@INCLUDED_INTL_TRUE@@INCLUDED_INTLLIBS = @@INTLLIBS@@ -libxine_la_DEPENDENCIES = $(INCLUDED_INTLLIBS) $(XINEUTILS_LIB) \ - $(pthread_dep) $(LIBXINEPOSIX) +libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) $(zlib_dep) \ + $(dirent_lib) $(pthread_dep) $(LIBXINEPOSIX) libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @@INTLLIBS@@ $(ZLIB_LIBS) \ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \ Index: src/input/input_plugin.h diff -Nau src/input/input_plugin.h.orig src/input/input_plugin.h --- src/input/input_plugin.h.orig 2004-09-27 00:54:52 +0200 +++ src/input/input_plugin.h 2005-01-04 15:38:00 +0100 @@@@ -39,6 +39,40 @@@@ #define INPUT_PLUGIN_IFACE_VERSION 15 +#if !defined(PRIiMAX) +#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__) +# define PRIiMAX "li" +#elif defined(__i386__) || defined(__powerpc__) +# define PRIiMAX "lli" +#endif /* #if defined(__alpha__) || defined(__amd64__) || ... */ +#endif /* #if !defined(PRIiMAX) */ + +#if !defined(PRIXMAX) +#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__) +# define PRIXMAX "lX" +#elif defined(__i386__) || defined(__powerpc__) +# define PRIXMAX "llX" +#endif /* #if defined(__alpha__) || defined(__amd64__) || ... */ +#endif /* #if !defined(PRIXMAX) */ + +#if !defined(SCNdMAX) +#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__) +# define SCNdMAX "ld" +#elif defined(__i386__) || defined(__powerpc__) +# define SCNdMAX "lld" +#endif /* #if defined(__alpha__) || defined(__amd64__) || ... */ +#endif /* #if !defined(SCNdMAX) */ + +#if !defined(PRIx32) +# define PRIx32 "x" +#endif /* #if !defined(PRIx32) */ +#if !defined(PRIx16) +# define PRIx16 "x" +#endif /* #if !defined(PRIx16) */ +#if !defined(PRIx8) +# define PRIx8 "x" +#endif /* #if !defined(PRIx8) */ + typedef struct input_class_s input_class_t ; typedef struct input_plugin_s input_plugin_t; Index: src/xine-engine/post.h diff -Nau src/xine-engine/post.h.orig src/xine-engine/post.h --- src/xine-engine/post.h.orig 2005-01-04 18:06:34 +0100 +++ src/xine-engine/post.h 2005-01-04 18:07:27 +0100 @@@@ -42,6 +42,17 @@@@ #define POST_PLUGIN_IFACE_VERSION 9 +#ifndef INT32_MAX +# define INT32_MAX 0x7fffffff +# define UINT32_MAX 0xffffffffU +# define INT32_MIN (-0x7fffffff-1) +#endif +#ifndef INT16_MAX +# define INT16_MAX 0x7fff +# define UINT16_MAX 0xffff +# define INT16_MIN (-0x7fff-1) +#endif + typedef struct post_class_s post_class_t; typedef struct post_plugin_s post_plugin_t; @ 1.14 log @upgrading package: xine-lib 1.0.1 -> 1.1.1 @ text @@ 1.14.2.1 log @file xine-lib.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:58:22 +0000 @ text @d1 501 @ 1.14.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 501 Index: ffmpeg.m4 diff -Nau ffmpeg.m4.orig ffmpeg.m4 --- m4/ffmpeg.m4.orig 2005-01-04 12:40:59 +0100 +++ m4/ffmpeg.m4 2005-01-04 12:43:07 +0100 @@@@ -55,7 +55,7 @@@@ "ac_cv_lib_avcodec_pp_get_context" \ "ac_cv_lib_postproc_pp_get_context" \ "ac_cv_lib_avcodec_register_avcodec"; do - $as_unset $i || test "${$i+set}" != set || { $i=; export $i; } + $as_unset $i || test "${i}set" != set && { $i=; export $i; } done dnl look for headers Index: config.h.in diff -Nau config.h.in.orig config.h.in --- config.h.in.orig 2005-01-04 16:00:38 +0100 +++ config.h.in 2005-01-04 16:01:17 +0100 @@@@ -612,5 +612,8 @@@@ /* define ssize_t to __int64 if it's missing in default includes */ #undef ssize_t +/* define intmax_t to long int if it's missing in default includes */ +#undef intmax_t + /* include internal system specific header */ #include "os_internal.h" Index: configure.ac diff -Nau configure.ac.orig configure.ac --- configure.ac.orig 2005-01-04 15:49:14 +0100 +++ configure.ac 2005-01-04 15:50:33 +0100 @@@@ -183,7 +183,7 @@@@ dnl For systems without inttypes.h would be needed extend generated replacement. dnl AC_CHECK_GENERATE_INTTYPES([lib]) AC_CHECK_TYPE(ssize_t, :, AC_DEFINE(ssize_t, __int64, [define ssize_t to __int64 if it's missing in default includes])) - +AC_CHECK_TYPE(intmax_t, :, AC_DEFINE(intmax_t, long int, [define intmax_t to long int if it's missing in default includes])) dnl --------------------------------------------- dnl threads and OS specific stuff Index: configure diff -Nau configure.orig configure --- configure.orig 2004-03-17 23:01:45.000000000 +0100 +++ configure 2004-03-23 14:08:23.000000000 +0100 @@@@ -24472,6 +24472,72 @@@@ fi +echo "$as_me:$LINENO: checking for intmax_t" >&5 +echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6 +if test "${ac_cv_type_intmax_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((intmax_t *) 0) + return 0; +if (sizeof (intmax_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_intmax_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_intmax_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_intmax_t" >&5 +echo "${ECHO_T}$ac_cv_type_intmax_t" >&6 +if test $ac_cv_type_intmax_t = yes; then + : +else + +cat >>confdefs.h <<\_ACEOF +#define intmax_t long int +_ACEOF + +fi + case "$host" in @@@@ -25379,7 +25379,7 @@@@ "ac_cv_lib_avcodec_pp_get_context" \ "ac_cv_lib_postproc_pp_get_context" \ "ac_cv_lib_avcodec_register_avcodec"; do - $as_unset $i || test "${$i+set}" != set || { $i=; export $i; } + $as_unset $i || test "${i}set" != set && { $i=; export $i; } done if test "${ac_cv_header_avcodec_h+set}" = set; then @@@@ -30951,6 +30937,7 @@@@ /* end confdefs.h. */ $ac_includes_default #include +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@@@ -30994,6 +30981,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 Index: src/xine-engine/metronom.c diff -Nau src/xine-engine/metronom.c.orig src/xine-engine/metronom.c --- src/xine-engine/metronom.c.orig 2004-03-23 10:32:16.000000000 +0100 +++ src/xine-engine/metronom.c 2004-03-23 10:33:07.000000000 +0100 @@@@ -33,6 +33,18 @@@@ #include #include +#ifndef PRId64 +# if (#cpu(i386) || #cpu(powerpc)) +# define PRId64 "lld" /* int64_t */ +# else +# define PRId64 "ld" /* int64_t */ +# endif +#endif +#ifndef INT16_MAX +# define INT16_MAX 0x7fff +# define UINT16_MAX 0xffff +#endif + #define LOG_MODULE "metronom" #define LOG_VERBOSE /* Index: src/libdts/xine_decoder.c diff -Nau src/libdts/xine_decoder.c.orig src/libdts/xine_decoder.c --- src/libdts/xine_decoder.c.orig 2004-12-16 14:59:10 +0100 +++ src/libdts/xine_decoder.c 2005-01-04 17:35:17 +0100 @@@@ -53,6 +53,12 @@@@ #define MAX_AC5_FRAME 4096 +#ifndef INT16_MAX +# define INT16_MAX 0x7fff +# define UINT16_MAX 0xffff +# define INT16_MIN (-0x7fff-1) +#endif + typedef struct { audio_decoder_class_t decoder_class; } dts_class_t; Index: src/xine-engine/audio_out.c diff -Nau src/xine-engine/audio_out.c.orig src/xine-engine/audio_out.c --- src/xine-engine/audio_out.c.orig 2004-03-16 21:21:58.000000000 +0100 +++ src/xine-engine/audio_out.c 2004-03-23 10:22:59.000000000 +0100 @@@@ -77,6 +77,24 @@@@ #include #include +#ifndef PRId64 +# if (#cpu(i386) || #cpu(powerpc)) +# define PRId64 "lld" /* int64_t */ +# else +# define PRId64 "ld" /* int64_t */ +# endif +#endif +#ifndef INT16_MAX +# define INT16_MAX 0x7fff +# define UINT16_MAX 0xffff +# define INT16_MIN (-0x7fff-1) +#endif +#ifndef INT8_MAX +# define INT8_MAX 0x7f +# define UINT8_MAX 0xff +# define INT8_MIN (-0x7f-1) +#endif + #define XINE_ENABLE_EXPERIMENTAL_FEATURES #define XINE_ENGINE_INTERNAL Index: src/xine-engine/video_out.c diff -Nau src/xine-engine/video_out.c.orig src/xine-engine/video_out.c --- src/xine-engine/video_out.c.orig 2004-03-16 21:21:58.000000000 +0100 +++ src/xine-engine/video_out.c 2004-03-23 10:23:36.000000000 +0100 @@@@ -37,6 +37,18 @@@@ #include #include +#ifndef PRId64 +# if (#cpu(i386) || #cpu(powerpc)) +# define PRId64 "lld" /* int64_t */ +# else +# define PRId64 "ld" /* int64_t */ +# endif +#endif +#ifndef INT16_MAX +# define INT16_MAX 0x7fff +# define UINT16_MAX 0xffff +#endif + #define XINE_ENABLE_EXPERIMENTAL_FEATURES #define XINE_ENGINE_INTERNAL Index: src/demuxers/demux_ogg.c diff -Nau src/demuxers/demux_ogg.c.orig src/demuxers/demux_ogg.c --- src/demuxers/demux_ogg.c.orig 2004-03-23 14:20:30.000000000 +0100 +++ src/demuxers/demux_ogg.c 2004-03-23 14:20:50.000000000 +0100 @@@@ -60,6 +60,14 @@@@ #include #endif +#ifndef PRId64 +# if (#cpu(i386) || #cpu(powerpc)) +# define PRId64 "lld" /* int64_t */ +# else +# define PRId64 "ld" /* int64_t */ +# endif +#endif + #define LOG_MODULE "demux_ogg" #define LOG_VERBOSE /* Index: src/video_out/video_out_sdl.c diff -Nau src/video_out/video_out_sdl.c.orig src/video_out/video_out_sdl.c --- src/video_out/video_out_sdl.c.orig 2003-02-14 15:47:37.000000000 +0100 +++ src/video_out/video_out_sdl.c 2003-05-08 14:28:24.000000000 +0200 @@@@ -48,7 +48,7 @@@@ #include #include #if defined (__FreeBSD__) -# include +# include #else # include #endif Index: src/video_out/libdha/libdha.h diff -Nau src/video_out/libdha/libdha.h.orig src/video_out/libdha/libdha.h --- src/video_out/libdha/libdha.h.orig 2004-03-29 12:47:54.000000000 +0200 +++ src/video_out/libdha/libdha.h 2004-03-29 12:52:44.000000000 +0200 @@@@ -16,10 +16,14 @@@@ #ifndef LIBDHA_H #define LIBDHA_H -#if defined (__FreeBSD__) -# include -#else +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) # include +#elif defined (__FreeBSD__) +# include +#else +# include #endif #ifdef __cplusplus Index: src/input/dvb/dmx.h diff -Nau src/input/dvb/dmx.h.orig src/input/dvb/dmx.h --- src/input/dvb/dmx.h.orig 2004-03-30 09:16:41.000000000 +0200 +++ src/input/dvb/dmx.h 2004-03-30 09:18:41.000000000 +0200 @@@@ -36,6 +36,16 @@@@ #endif #endif +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) +# include +#elif defined (__FreeBSD__) +# include +#else +# include +#endif + #define DMX_FILTER_SIZE 16 typedef enum Index: src/input/dvb/frontend.h diff -Nau src/input/dvb/frontend.h.orig src/input/dvb/frontend.h --- src/input/dvb/frontend.h.orig 2004-03-30 09:21:25.000000000 +0200 +++ src/input/dvb/frontend.h 2004-03-30 09:21:39.000000000 +0200 @@@@ -38,6 +38,15 @@@@ #endif #endif +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) +# include +#elif defined (__FreeBSD__) +# include +#else +# include +#endif typedef enum { FE_QPSK, Index: src/libfaad/common.h diff -Nau src/libfaad/common.h.orig src/libfaad/common.h --- src/libfaad/common.h.orig 2004-03-30 09:31:33.000000000 +0200 +++ src/libfaad/common.h 2004-03-30 09:32:27.000000000 +0200 @@@@ -177,35 +177,14 @@@@ # include #endif -/* precedence defining int-types by header files for all platforms */ -#if HAVE_INTTYPES_H +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) +# include +#elif defined (__FreeBSD__) # include #else -# if HAVE_STDINT_H -# include -# else -/* we need these... */ -# ifdef WIN32 -typedef unsigned __int64 uint64_t; -typedef unsigned __int32 uint32_t; -typedef unsigned __int16 uint16_t; -typedef unsigned __int8 uint8_t; -typedef __int64 int64_t; -typedef __int32 int32_t; -typedef __int16 int16_t; -typedef __int8 int8_t; -# else /* WIN32 */ -typedef float float32_t; -typedef unsigned long long uint64_t; -typedef unsigned long uint32_t; -typedef unsigned short uint16_t; -typedef unsigned char uint8_t; -typedef long long int64_t; -typedef long int32_t; -typedef short int16_t; -typedef char int8_t; -# endif /* WIN32 */ -# endif +# include #endif #if HAVE_UNISTD_H # include Index: src/libxineadec/nosefart/memguard.c diff -Nau src/libxineadec/nosefart/memguard.c.orig src/libxineadec/nosefart/memguard.c --- src/libxineadec/nosefart/memguard.c.orig 2004-03-30 09:34:54.000000000 +0200 +++ src/libxineadec/nosefart/memguard.c 2004-03-30 09:35:10.000000000 +0200 @@@@ -34,12 +34,14 @@@@ #include #include -#if HAVE_INTTYPES_H -# include +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) +# include +#elif defined (__FreeBSD__) +# include #else -# if HAVE_STDINT_H -# include -# endif +# include #endif #include "memguard.h" Index: src/post/deinterlace/speedy.h diff -Nau src/post/deinterlace/speedy.h.orig src/post/deinterlace/speedy.h --- src/post/deinterlace/speedy.h.orig 2004-03-30 09:40:28.000000000 +0200 +++ src/post/deinterlace/speedy.h 2004-03-30 09:40:40.000000000 +0200 @@@@ -19,10 +19,14 @@@@ #ifndef SPEEDY_H_INCLUDED #define SPEEDY_H_INCLUDED -#if HAVE_INTTYPES_H -#include +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) +# include +#elif defined (__FreeBSD__) +# include #else -#include +# include #endif #ifdef __cplusplus Index: src/xine-engine/Makefile.in --- src/xine-engine/Makefile.in.orig 2005-11-15 12:40:21 +0100 +++ src/xine-engine/Makefile.in 2005-11-21 09:51:46 +0100 @@@@ -547,8 +547,8 @@@@ # FIXME: these are currently unused: EXTRA_DIST = lrb.c lrb.h accel_xvmc.h @@INCLUDED_INTL_TRUE@@INCLUDED_INTLLIBS = @@INTLLIBS@@ -libxine_la_DEPENDENCIES = $(INCLUDED_INTLLIBS) $(XINEUTILS_LIB) \ - $(pthread_dep) $(LIBXINEPOSIX) +libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) $(zlib_dep) \ + $(dirent_lib) $(pthread_dep) $(LIBXINEPOSIX) libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @@INTLLIBS@@ $(ZLIB_LIBS) \ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \ Index: src/input/input_plugin.h diff -Nau src/input/input_plugin.h.orig src/input/input_plugin.h --- src/input/input_plugin.h.orig 2004-09-27 00:54:52 +0200 +++ src/input/input_plugin.h 2005-01-04 15:38:00 +0100 @@@@ -39,6 +39,40 @@@@ #define INPUT_PLUGIN_IFACE_VERSION 15 +#if !defined(PRIiMAX) +#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__) +# define PRIiMAX "li" +#elif defined(__i386__) || defined(__powerpc__) +# define PRIiMAX "lli" +#endif /* #if defined(__alpha__) || defined(__amd64__) || ... */ +#endif /* #if !defined(PRIiMAX) */ + +#if !defined(PRIXMAX) +#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__) +# define PRIXMAX "lX" +#elif defined(__i386__) || defined(__powerpc__) +# define PRIXMAX "llX" +#endif /* #if defined(__alpha__) || defined(__amd64__) || ... */ +#endif /* #if !defined(PRIXMAX) */ + +#if !defined(SCNdMAX) +#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__) +# define SCNdMAX "ld" +#elif defined(__i386__) || defined(__powerpc__) +# define SCNdMAX "lld" +#endif /* #if defined(__alpha__) || defined(__amd64__) || ... */ +#endif /* #if !defined(SCNdMAX) */ + +#if !defined(PRIx32) +# define PRIx32 "x" +#endif /* #if !defined(PRIx32) */ +#if !defined(PRIx16) +# define PRIx16 "x" +#endif /* #if !defined(PRIx16) */ +#if !defined(PRIx8) +# define PRIx8 "x" +#endif /* #if !defined(PRIx8) */ + typedef struct input_class_s input_class_t ; typedef struct input_plugin_s input_plugin_t; Index: src/xine-engine/post.h diff -Nau src/xine-engine/post.h.orig src/xine-engine/post.h --- src/xine-engine/post.h.orig 2005-01-04 18:06:34 +0100 +++ src/xine-engine/post.h 2005-01-04 18:07:27 +0100 @@@@ -42,6 +42,17 @@@@ #define POST_PLUGIN_IFACE_VERSION 9 +#ifndef INT32_MAX +# define INT32_MAX 0x7fffffff +# define UINT32_MAX 0xffffffffU +# define INT32_MIN (-0x7fffffff-1) +#endif +#ifndef INT16_MAX +# define INT16_MAX 0x7fff +# define UINT16_MAX 0xffff +# define INT16_MIN (-0x7fff-1) +#endif + typedef struct post_class_s post_class_t; typedef struct post_plugin_s post_plugin_t; @ 1.13 log @upgrading package: xine-lib 1rc5 -> 1.0 @ text @a287 18 Index: src/video_out/video_out_xv.c diff -Nau src/video_out/video_out_xv.c.orig src/video_out/video_out_xv.c --- src/video_out/video_out_xv.c.orig 2004-03-30 08:27:16.000000000 +0200 +++ src/video_out/video_out_xv.c 2004-03-30 08:30:17.000000000 +0200 @@@@ -46,8 +46,12 @@@@ #if defined (__SVR4) && defined (__sun) # include -#else +#elif defined (__linux) # include +#elif defined (__FreeBSD__) +# include +#else +# include #endif #include d422 3 a424 4 diff -Nau src/xine-engine/Makefile.in.orig src/xine-engine/Makefile.in --- src/xine-engine/Makefile.in.orig 2004-04-29 12:46:23.000000000 +0200 +++ src/xine-engine/Makefile.in 2004-04-29 12:46:29.000000000 +0200 @@@@ -542,7 +542,7 @@@@ d428 2 a429 1 -libxine_la_DEPENDENCIES = $(INCLUDED_INTLLIBS) $(XINEUTILS_LIB) $(zlib_dep) \ d431 1 a431 1 $(dirent_lib) $(pthread_dep) $(LIBXINEPOSIX) d434 1 @ 1.12 log @upgrading package: xine-lib 1rc4a -> 1rc5 @ text @d1 41 d44 83 a126 1 @@@@ -28284,6 +28284,7 @@@@ d134 1 a134 1 @@@@ -28327,6 +28328,7 @@@@ d142 2 d165 19 d186 1 a186 1 @@@@ -77,6 +77,19 @@@@ d191 1 a191 1 +# if (#cpu(i386) || #cpu(powerpc)) d202 5 d211 2 d220 1 a220 1 +# if (#cpu(i386) || #cpu(powerpc)) d234 2 d238 1 a238 1 @@@@ -53,6 +53,14 @@@@ d243 1 a243 1 +# if (#cpu(i386) || #cpu(powerpc)) d253 3 a255 1 --- src/video_out/video_out_sdl.c 2003-02-14 15:47:37.000000000 +0100 d266 2 d288 2 d306 2 d327 2 d347 2 d351 1 a351 2 @@@@ -189,23 +189,17 @@@@ #if HAVE_STRINGS_H d354 2 a356 2 -# include + d362 1 a362 1 +# include d368 11 d387 1 a390 1 + d393 2 a394 1 #endif d417 2 d439 2 a440 39 --- src/post/deinterlace/deinterlace.h.orig 2004-03-30 09:46:20.000000000 +0200 +++ src/post/deinterlace/deinterlace.h 2004-03-30 09:46:32.000000000 +0200 @@@@ -19,10 +19,14 @@@@ #ifndef DEINTERLACE_H_INCLUDED #define DEINTERLACE_H_INCLUDED -#if HAVE_INTTYPES_H -#include +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) +# include +#elif defined (__FreeBSD__) +# include #else -#include +# include #endif #ifdef __cplusplus --- src/post/goom/goom_config.h.orig 2004-03-30 09:52:02.000000000 +0200 +++ src/post/goom/goom_config.h 2004-03-30 09:52:16.000000000 +0200 @@@@ -4,6 +4,16 @@@@ #include +#if defined (__SVR4) && defined (__sun) +# include +#elif defined (__linux) +# include +#elif defined (__FreeBSD__) +# include +#else +# include +#endif + /* #define VERSION "1.9dev5" */ /* #define _DEBUG */ d443 1 a443 1 @@@@ -275,7 +275,7 @@@@ d445 5 a449 1 EXTRA_DIST = lrb.c lrb.h a450 2 -libxine_la_DEPENDENCIES = @@INTLLIBS@@ $(XINEUTILS_LIB) +libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) d452 64 a515 1 -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) d517 2 @ 1.11 log @security update (xine SA XSA-2004-1 and XSA-2003-3), correct dependency to gettext, and correct flaky usage of ISO C inline specifier @ text @d102 1 a102 1 @@@@ -48,9 +48,9 @@@@ d109 1 a109 2 -# include +# include a110 2 #define LOG_MODULE "video_out_sdl" a310 11 --- src/libffmpeg/libavcodec/mpegvideo.h.orig 2004-04-29 15:17:42.000000000 +0200 +++ src/libffmpeg/libavcodec/mpegvideo.h 2004-04-29 15:17:46.000000000 +0200 @@@@ -901,7 +901,7 @@@@ int ff_h263_resync(MpegEncContext *s); int ff_h263_get_gob_height(MpegEncContext *s); int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my); -inline int ff_h263_round_chroma(int x); +int ff_h263_round_chroma(int x); /* rv10.c */ @ 1.10 log @modifying package: xine-lib-1rc3b 20040330 -> 20040407 @ text @d3 1 a3 1 @@@@ -28298,6 +28298,7 @@@@ d11 1 a11 1 @@@@ -28341,6 +28342,7 @@@@ d102 1 a102 1 @@@@ -48,7 +48,7 @@@@ d107 1 a107 1 +# include d109 2 a110 1 # include d112 2 d149 1 a149 1 #if defined(__FreeBSD__) d303 22 @ 1.9 log @modifying package: xine-lib-1rc3b 20040329 -> 20040330 @ text @d125 1 a125 1 +# include d141 1 a141 1 +# include d158 1 a158 1 +# include d177 1 a177 1 +# include d198 1 a198 1 +# include d232 1 a232 1 +# include d254 1 a254 1 +# include d274 1 a274 1 +# include d292 1 a292 1 +# include @ 1.8 log @modifying package: xine-lib-1rc3b 20040324 -> 20040329 @ text @d113 3 a115 1 @@@@ -18,6 +18,8 @@@@ d117 58 a174 3 #if defined (__FreeBSD__) # include +#elif defined (__linux) d176 23 d200 14 a213 1 # include d215 85 @ 1.7 log @modifying package: xine-lib-1rc3b 20040323 -> 20040324 @ text @d111 11 @ 1.6 log @upgrading package: xine-lib 1rc3a -> 1rc3b @ text @d25 10 a34 10 +#ifndef _MACHINE_INTTYPES_H_ +#if (#cpu(i386) || #cpu(powerpc)) +#define PRId64 "lld" /* int64_t */ +#else +#define PRId64 "ld" /* int64_t */ +#endif +#endif +#ifndef _MACHINE__STDINT_H_ +#define INT16_MAX 0x7fff +#define UINT16_MAX 0xffff d46 11 a56 11 +#ifndef _MACHINE_INTTYPES_H_ +#if (#cpu(i386) || #cpu(powerpc)) +#define PRId64 "lld" /* int64_t */ +#else +#define PRId64 "ld" /* int64_t */ +#endif +#endif +#ifndef _MACHINE__STDINT_H_ +#define INT16_MAX 0x7fff +#define UINT16_MAX 0xffff +#define INT16_MIN (-0x7fff-1) d68 10 a77 10 +#ifndef _MACHINE_INTTYPES_H_ +#if (#cpu(i386) || #cpu(powerpc)) +#define PRId64 "lld" /* int64_t */ +#else +#define PRId64 "ld" /* int64_t */ +#endif +#endif +#ifndef _MACHINE__STDINT_H_ +#define INT16_MAX 0x7fff +#define UINT16_MAX 0xffff d89 6 a94 6 +#ifndef _MACHINE_INTTYPES_H_ +#if (#cpu(i386) || #cpu(powerpc)) +#define PRId64 "lld" /* int64_t */ +#else +#define PRId64 "ld" /* int64_t */ +#endif @ 1.5 log @upgrading package: xine-lib 1rc2 -> 1rc3 @ text @d1 99 a110 42 --- src/xine-engine/audio_out.c.orig Sun Jul 27 18:42:56 2003 +++ src/xine-engine/audio_out.c Mon Aug 11 09:41:32 2003 @@@@ -425,7 +425,7 @@@@ num_frames = pts_len * this->frames_per_kpts / 1024; xprintf (this->xine, XINE_VERBOSITY_DEBUG, - "inserting %d 0-frames to fill a gap of %" PRId64 " pts\n", num_frames, pts_len); + "inserting %d 0-frames to fill a gap of %lu pts\n", num_frames, (unsigned long)pts_len); if ((this->output.mode == AO_CAP_MODE_A52) || (this->output.mode == AO_CAP_MODE_AC5)) { write_pause_burst(this,num_frames); @@@@ -790,7 +790,7 @@@@ this->resample_sync_factor = (avg_gap < 0) ? 0.995 : 1.005; llprintf (LOG_RESAMPLE_SYNC, - "sample rate adjusted to reduce gap: gap=%" PRId64 "\n", avg_gap); + "sample rate adjusted to reduce gap: gap=%lu\n", (unsigned long)avg_gap); return 0; } else if (info->reduce_gap && abs(avg_gap) < 50) { Index: src/video_out/video_out_pgx64.c --- src/video_out/video_out_pgx64.c.orig 2003-11-21 20:12:57.000000000 +0100 +++ src/video_out/video_out_pgx64.c 2003-11-21 20:22:28.000000000 +0100 @@@@ -345,6 +345,8 @@@@ frame->vo_frame.proc_frame = NULL; frame->vo_frame.proc_slice = NULL; +#define memalign(n,l) (((int)(l / n) + 1) * n) + switch (format) { case XINE_IMGFMT_YUY2: frame->native_format = VIDEO_FORMAT_YUY2; @@@@ -522,7 +524,9 @@@@ this->vregs[CAPTURE_CONFIG] = this->dblbuf_select ? le2me_32(CAPTURE_CONFIG_BUF1) : le2me_32(CAPTURE_CONFIG_BUF0); this->dblbuf_select = 1 - this->dblbuf_select; +#ifdef FBIOVERTICAL ioctl(this->fbfd, FBIOVERTICAL); +#endif if (this->current != NULL) { this->current->vo_frame.free(&this->current->vo_frame); @ 1.4 log @upgrading package: xine-lib 1rc1 -> 1rc2 @ text @d14 1 a14 1 @@@@ -425,8 +425,8 @@@@ d17 3 a19 5 xprintf (this->xine, XINE_VERBOSITY_LOG, - "inserting %d 0-frames to fill a gap of %" PRId64 " pts\n", - num_frames, pts_len); + "inserting %d 0-frames to fill a gap of %lu pts\n", + num_frames, (unsigned long)pts_len); @ 1.3 log @upgrading package: xine-lib 1.0b12 -> 1rc0a @ text @d34 22 @ 1.2 log @use better versioning @ text @d12 22 @ 1.1 log @Patch broken FreeBSD build and upgrade to new beta version, but it\'s still segfaulting on FreeBSD @ text @d1 2 a2 3 diff -Naur xine-lib-1-beta11.orig/src/video_out/video_out_sdl.c xine-lib-1-beta11/src/video_out/video_out_sdl.c --- xine-lib-1-beta11.orig/src/video_out/video_out_sdl.c 2003-02-14 15:47:37.000000000 +0100 +++ xine-lib-1-beta11/src/video_out/video_out_sdl.c 2003-05-08 14:28:24.000000000 +0200 @