OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Torsten Homeyer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 23-Mar-2004 14:56:40 Branch: HEAD Handle: 2004032313563900 Modified files: openpkg-src/xine-lib xine-lib.patch xine-lib.spec Log: upgrading package: xine-lib 1rc3a -> 1rc3b Summary: Revision Changes Path 1.6 +99 -42 openpkg-src/xine-lib/xine-lib.patch 1.23 +3 -3 openpkg-src/xine-lib/xine-lib.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/xine-lib/xine-lib.patch ============================================================================ $ cvs diff -u -r1.5 -r1.6 xine-lib.patch --- openpkg-src/xine-lib/xine-lib.patch 17 Dec 2003 09:09:05 -0000 1.5 +++ openpkg-src/xine-lib/xine-lib.patch 23 Mar 2004 13:56:39 -0000 1.6 @@ -1,3 +1,102 @@ +--- configure.orig 2004-03-17 23:01:45.000000000 +0100 ++++ configure 2004-03-23 14:08:23.000000000 +0100 +@@ -28298,6 +28298,7 @@ + /* end confdefs.h. */ + $ac_includes_default + #include <sys/fbio.h> ++#include <sys/visual_io.h> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -28341,6 +28342,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <sys/fbio.h> ++#include <sys/visual_io.h> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +--- 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 <string.h> + #include <errno.h> + ++#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 ++#endif ++ + #define LOG_MODULE "metronom" + #define LOG_VERBOSE + /* +--- 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,19 @@ + #include <inttypes.h> + #include <math.h> + ++#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) ++#endif ++ + #define XINE_ENABLE_EXPERIMENTAL_FEATURES + #define XINE_ENGINE_INTERNAL + +--- 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 <inttypes.h> + #include <assert.h> + ++#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 ++#endif ++ + #define XINE_ENABLE_EXPERIMENTAL_FEATURES + #define XINE_ENGINE_INTERNAL + +--- 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 +@@ -53,6 +53,14 @@ + #include <theora/theora.h> + #endif + ++#ifndef _MACHINE_INTTYPES_H_ ++#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 + /* --- src/video_out/video_out_sdl.c 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 @@ @@ -9,45 +108,3 @@ #else # include <SDL/SDL.h> #endif ---- 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); @@ . patch -p0 <<'@@ .' Index: openpkg-src/xine-lib/xine-lib.spec ============================================================================ $ cvs diff -u -r1.22 -r1.23 xine-lib.spec --- openpkg-src/xine-lib/xine-lib.spec 7 Feb 2004 18:00:19 -0000 1.22 +++ openpkg-src/xine-lib/xine-lib.spec 23 Mar 2004 13:56:39 -0000 1.23 @@ -26,8 +26,8 @@ # FIXME: ms: still slightly broken due to video drivers/plugins failures?! # package version -%define V_dist 1-rc3a -%define V_opkg 1rc3a +%define V_dist 1-rc3b +%define V_opkg 1rc3b # package information Name: xine-lib @@ -40,7 +40,7 @@ Group: Video License: GPL Version: %{V_opkg} -Release: 20040207 +Release: 20040323 # list of sources Source0: http://download.sourceforge.net/xine/xine-lib-%{V_dist}.tar.gz @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]