diff options
Diffstat (limited to 'multimedia/mplayerxp/files')
19 files changed, 0 insertions, 412 deletions
diff --git a/multimedia/mplayerxp/files/patch-codecs__libfaad2__common.h b/multimedia/mplayerxp/files/patch-codecs__libfaad2__common.h deleted file mode 100644 index 635090a41e73..000000000000 --- a/multimedia/mplayerxp/files/patch-codecs__libfaad2__common.h +++ /dev/null @@ -1,106 +0,0 @@ ---- codecs/libfaad2/common.h.orig Mon Oct 2 18:33:38 2006 -+++ codecs/libfaad2/common.h Mon Oct 2 18:34:46 2006 -@@ -327,21 +317,91 @@ - *y1 = MUL_F(x1, c1) + MUL_F(x2, c2); - *y2 = MUL_F(x2, c1) - MUL_F(x1, c2); - } -+ -+ #if defined(HAVE_LRINTF) -+ #define HAS_LRINTF -+ #elif defined(_WIN32) && !defined(__MINGW32__) && !defined(HAVE_LRINTF) -+ #define HAS_LRINTF -+ static INLINE int lrintf(float f) -+ { -+ int i; -+ __asm -+ { -+ fld f -+ fistp i -+ } -+ return i; -+ } -+ #elif (defined(__i386__) && defined(__GNUC__)) && !defined(HAVE_LRINTF) -+ #define HAS_LRINTF -+ // from http://www.stereopsis.com/FPU.html -+ static INLINE int lrintf(float f) -+ { -+ int i; -+ __asm__ __volatile__ ( -+ "flds %1 \n\t" -+ "fistpl %0 \n\t" -+ : "=m" (i) -+ : "m" (f)); -+ return i; -+ } -+ #endif -+ -+ -+ #ifdef __ICL /* only Intel C compiler has fmath ??? */ -+ -+ #include <mathf.h> -+ -+ #define sin sinf -+ #define cos cosf -+ #define log logf -+ #define floor floorf -+ #define ceil ceilf -+ #define sqrt sqrtf -+ -+ #else -+ -+#include <math.h> -+ -+#ifdef HAVE_LRINTF -+# define HAS_LRINTF -+# define _ISOC9X_SOURCE 1 -+# define _ISOC99_SOURCE 1 -+# define __USE_ISOC9X 1 -+# define __USE_ISOC99 1 - #endif - --static inline long int lrintf(float x) --{ --#if defined( ARCH_X86 ) || defined(ARCH_X86_64) -- int32_t i; -- asm volatile( -- "fistpl %0\n\t" -- : "=m" (i) : "t" (x) : "st" -- ); -- return i; --#else -- return ((int32_t)(x)); -+#ifdef HAVE_SINF -+# define sin sinf -+#error -+#endif -+#ifdef HAVE_COSF -+# define cos cosf -+#endif -+#ifdef HAVE_LOGF -+# define log logf -+#endif -+#ifdef HAVE_EXPF -+# define exp expf -+#endif -+#ifdef HAVE_FLOORF -+# define floor floorf -+#endif -+#ifdef HAVE_CEILF -+# define ceil ceilf -+#endif -+#ifdef HAVE_SQRTF -+# define sqrt sqrtf -+#endif -+ -+ #endif -+ -+#endif -+ -+#ifndef HAS_LRINTF -+/* standard cast */ -+#define lrintf(f) ((int32_t)(f)) - #endif --} - - typedef real_t complex_t[2]; - #define RE(A) A[0] diff --git a/multimedia/mplayerxp/files/patch-codecs__libfaad2__output.c b/multimedia/mplayerxp/files/patch-codecs__libfaad2__output.c deleted file mode 100644 index 03d8fa3ba0e4..000000000000 --- a/multimedia/mplayerxp/files/patch-codecs__libfaad2__output.c +++ /dev/null @@ -1,13 +0,0 @@ ---- codecs/libfaad2/output.c.orig Fri May 6 00:34:38 2005 -+++ codecs/libfaad2/output.c Tue Oct 3 02:29:41 2006 -@@ -97,8 +97,10 @@ - #define RENAME(a) a ## _c - #include "i386/output.h" - -+#if 0 - #if defined( ARCH_X86 ) || defined(ARCH_X86_64) - #define CAN_COMPILE_X86_ASM -+#endif - #endif - - #ifdef CAN_COMPILE_X86_ASM diff --git a/multimedia/mplayerxp/files/patch-loader-win32.c b/multimedia/mplayerxp/files/patch-loader-win32.c deleted file mode 100644 index 8644577722ab..000000000000 --- a/multimedia/mplayerxp/files/patch-loader-win32.c +++ /dev/null @@ -1,11 +0,0 @@ ---- loader/win32.c.orig Thu Jan 18 11:06:11 2007 -+++ loader/win32.c Thu Jan 18 11:06:32 2007 -@@ -66,7 +66,7 @@ - #include <kstat.h> - #endif - --#if HAVE_VSSCANF -+#if 1 - int vsscanf( const char *str, const char *format, va_list ap); - #else - /* system has no vsscanf. try to provide one */ diff --git a/multimedia/mplayerxp/files/patch-loader__Makefile b/multimedia/mplayerxp/files/patch-loader__Makefile deleted file mode 100644 index 7aa5cff5c6a5..000000000000 --- a/multimedia/mplayerxp/files/patch-loader__Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- loader/Makefile.orig Sat Dec 2 18:04:56 2006 -+++ loader/Makefile Sun Dec 24 21:46:50 2006 -@@ -19,7 +19,7 @@ - resource.o registry.o elfdll.o cpudetect.o get_path.o wrapper.o - endif - --LD_LIBS=-lc -lm -lpthread -+LD_LIBS=-lc -lm - ifeq ($(TARGET_OS),WIN32) - LD_LIBS+=-lkernel32 - endif diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__Makefile b/multimedia/mplayerxp/files/patch-mplayerxp__Makefile deleted file mode 100644 index 43b3618ef302..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__Makefile +++ /dev/null @@ -1,23 +0,0 @@ ---- mplayerxp/Makefile.orig Thu Jul 21 17:08:04 2005 -+++ mplayerxp/Makefile Sun Oct 1 20:33:39 2006 -@@ -72,20 +72,8 @@ - $(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML - - install: $(ALL_PRG) --ifeq ($(INSTALL),) -- @echo "*** 'install' utility was not found and you can't run automatic" -- @echo "*** installation. Please download 'fileutils' from ftp://ftp.gnu.org and" -- @echo "*** install them to have possibility perform autiomatic installation" -- @echo "*** of this project" -- @exit 1 --endif - $(INSTALL) -D -m 755 $(PRG) $(BINDIR)/$(PRG) - @if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi -- @if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi -- @if test ! -f $(DATADIR)/font/font.desc ; then \ -- echo "*** Download font at http://www.mplayerhq.hu/homepage/dload.html" ; \ -- echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/" ; \ -- fi - - ifeq ($(CSS_USE),yes) - @echo "Following task requires root privs. If it fails don't panic" diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__configure b/multimedia/mplayerxp/files/patch-mplayerxp__configure deleted file mode 100644 index 81ac46ca5693..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__configure +++ /dev/null @@ -1,43 +0,0 @@ ---- mplayerxp/configure.orig 2009-01-25 08:00:03.000000000 +0000 -+++ mplayerxp/configure 2009-09-29 16:05:01.545372105 +0000 -@@ -85,13 +85,11 @@ - --enable-dga build with DGA1 or DGA2 support [autodetect] - --enable-vesa build with VESA support [autodetect] - --enable-sdl build with SDL render support [autodetect] -- --enable-vm build with XF86VidMode support for X11 [autodetect] - --enable-x11 build with X11 render support [autodetect] - --enable-xdpms build with X11 DPMS support [autodetect] - --enable-xinerama build with Xinerama support for X11 [autodetect] - --enable-xf86vm build with Xf86vm support for X11 [autodetect] - --enable-xv build with Xv render support for X 4.x [autodetect] -- --enable-xv build with Xv render support for X 4.x [autodetect] - --enable-fbdev build with FBDev render support [autodetect] - --enable-fbdev=nocopy yuv12 converts directly into framebuffer - --enable-mlib build with MLIB support (Solaris only) [autodetect] -@@ -431,6 +429,8 @@ - --disable-libdvdplay) libdvdplay=no ;; - --enable-xinerama) xinerama=yes ;; - --disable-xinerama) xinerama=no ;; -+ --enable-xf86vm) xf86vm=yes ;; -+ --disable-xf86vm) xf86vm=no ;; - --enable-alsa) alsa=yes ;; - --disable-alsa) alsa=no ;; - --enable-tv) tv=yes ;; -@@ -806,7 +806,7 @@ - print_config HAVE_ config.h config.mak xv - - enabled xinerama && require2 xinerama "X11/Xlib.h X11/extensions/Xinerama.h" XineramaIsActive -lXinerama --print_config HAVE_ config.h config.mak xv -+print_config HAVE_ config.h config.mak xinerama - - # Note: the -lXxf86vm library is the VideoMode extension and though it's not - # needed for DGA, AFAIK every distribution packages together with DGA stuffs -@@ -906,7 +906,7 @@ - print_config USE_ config.h config.mak dvdread - enabled libdvdread && _inputmodules="dvdread $_inputmodules" || _noinputmodules="dvdread $_noinputmodules" - --enabled libdvdnav && require2 libdvdnav dvdnav/dvdnav.h dvdnav_set_PGC_positioning_flag -ldvdnav -+enabled libdvdnav && require2 libdvdnav "sys/types.h dvdnav/dvdnav.h" dvdnav_set_PGC_positioning_flag -ldvdnav - dvdnav=$libdvdnav - print_config USE_ config.h config.mak dvdnav - enabled libdvdnav && _inputmodules="dvdnav $_inputmodules" || _noinputmodules="dvdnav $_noinputmodules" diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libao2__afmt.h b/multimedia/mplayerxp/files/patch-mplayerxp__libao2__afmt.h deleted file mode 100644 index 433b999c7619..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__libao2__afmt.h +++ /dev/null @@ -1,37 +0,0 @@ ---- mplayerxp/libao2/afmt.h.orig Wed Oct 20 15:00:03 2004 -+++ mplayerxp/libao2/afmt.h Sun Oct 1 21:44:02 2006 -@@ -30,12 +30,30 @@ - # define AFMT_AC3 0x00000400 /* Dolby Digital AC3 */ - #endif - -+/* 24 bit formats from the linux kernel */ -+#ifndef AFMT_S24_LE -+ -+// FreeBSD fix... -+#if AFMT_S32_LE == 0x1000 -+ -+# define AFMT_S24_LE 0x00010000 -+# define AFMT_S24_BE 0x00020000 -+# define AFMT_U24_LE 0x00040000 -+# define AFMT_U24_BE 0x00080000 -+ -+#else -+ -+# define AFMT_S24_LE 0x00000800 -+# define AFMT_S24_BE 0x00001000 -+# define AFMT_U24_LE 0x00002000 -+# define AFMT_U24_BE 0x00004000 -+ -+#endif -+ -+#endif -+ - /* 32 bit formats (MSB aligned) formats */ - #ifndef AFMT_S32_LE --# define AFMT_S24_LE 0x00000800 --# define AFMT_S24_BE 0x00001000 --# define AFMT_U24_LE 0x00002000 --# define AFMT_U24_BE 0x00004000 - # define AFMT_S32_LE 0x00008000 - # define AFMT_S32_BE 0x00010000 - # define AFMT_U32_LE 0x00020000 diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_null.c b/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_null.c deleted file mode 100644 index db6938ed9e68..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_null.c +++ /dev/null @@ -1,10 +0,0 @@ ---- mplayerxp/libao2/ao_null.c.orig 2007-12-02 18:19:44.000000000 +0900 -+++ mplayerxp/libao2/ao_null.c 2009-01-07 18:28:00.000000000 +0900 -@@ -3,6 +3,7 @@ - #include <stdlib.h> - #include <string.h> - #include <limits.h> -+#include <sys/types.h> - #include <sys/time.h> - - #include "config.h" diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_oss.c b/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_oss.c deleted file mode 100644 index 9cc3e0d6d3ea..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_oss.c +++ /dev/null @@ -1,25 +0,0 @@ ---- mplayerxp/libao2/ao_oss.c.orig 2005-07-02 18:59:01.000000000 +0900 -+++ mplayerxp/libao2/ao_oss.c 2009-01-07 18:26:10.000000000 +0900 -@@ -18,6 +18,22 @@ - #include "audio_out.h" - #include "audio_out_internal.h" - -+#ifndef DSP_CAP_COPROC -+#define DSP_CAP_COPROC 0x00000800 -+#endif -+#ifndef DSP_CAP_TRIGGER -+#define DSP_CAP_TRIGGER 0x00001000 -+#endif -+#ifndef DSP_CAP_MMAP -+#define DSP_CAP_MMAP 0x00002000 -+#endif -+#ifndef DSP_CAP_MULTI -+#define DSP_CAP_MULTI 0x00004000 -+#endif -+#ifndef DSP_CAP_BIND -+#define DSP_CAP_BIND 0x00008000 -+#endif -+ - static ao_info_t info = - { - "OSS/ioctl audio output", diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__Makefile b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__Makefile deleted file mode 100644 index 30d893c7ec11..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- mplayerxp/libmpdemux/Makefile.orig 2008-12-25 01:04:59.000000000 +0900 -+++ mplayerxp/libmpdemux/Makefile 2009-01-08 23:53:57.000000000 +0900 -@@ -30,7 +30,7 @@ - - OBJS = $(SRCS:.c=.o) - INCLUDE = -I../loader -I../../codecs/ -I../../codecs/libavcodec -I../../codecs/libavutil --CFLAGS = $(OPTFLAGS) $(INCLUDE) -W -Wall -+CFLAGS = $(INCLUDE) $(OPTFLAGS) -W -Wall - - .SUFFIXES: .c .o - diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__asf_streaming.c b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__asf_streaming.c deleted file mode 100644 index 0affaf9808fa..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__asf_streaming.c +++ /dev/null @@ -1,10 +0,0 @@ ---- mplayerxp/libmpdemux/asf_streaming.c.orig Wed Jul 6 15:40:40 2005 -+++ mplayerxp/libmpdemux/asf_streaming.c Tue Jan 9 17:58:53 2007 -@@ -2,6 +2,7 @@ - #include <stdlib.h> - #include <string.h> - #include <unistd.h> -+#include <limits.h> - #include <errno.h> - - #include "config.h" diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__mux_mpxp64.c b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__mux_mpxp64.c deleted file mode 100644 index b2eaa1a73347..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__mux_mpxp64.c +++ /dev/null @@ -1,21 +0,0 @@ ---- mplayerxp/libmpdemux/mux_mpxp64.c.orig Tue Mar 7 19:38:00 2006 -+++ mplayerxp/libmpdemux/mux_mpxp64.c Mon Oct 2 02:01:28 2006 -@@ -32,6 +32,18 @@ - - #include "mpxpav64.h" - -+#ifndef lrint -+#define lrint(d) ((int32_t)rint(d)) -+#endif -+ -+#ifndef lrintf -+#define lrintf(f) ((int32_t)rintf(f)) -+#endif -+ -+#ifndef llrint -+#define llrint(d) ((int64_t)rint(d)) -+#endif -+ - typedef struct priv_mpxpav64_stream_s - { - /* statistics */ diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__s_network.c b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__s_network.c deleted file mode 100644 index 657d3af47995..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__s_network.c +++ /dev/null @@ -1,13 +0,0 @@ ---- mplayerxp/libmpdemux/s_network.c.orig Sat Jul 2 18:59:02 2005 -+++ mplayerxp/libmpdemux/s_network.c Sun Oct 1 23:50:43 2006 -@@ -46,6 +46,10 @@ - return 0; - } - -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(x) (x) -+#endif -+ - static int __FASTCALL__ network_read(stream_t *stream,stream_packet_t*sp) - { - network_priv_t *p=stream->priv; diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libvo__screenshot.c b/multimedia/mplayerxp/files/patch-mplayerxp__libvo__screenshot.c deleted file mode 100644 index c79e3dfd515c..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__libvo__screenshot.c +++ /dev/null @@ -1,19 +0,0 @@ ---- mplayerxp/libvo/screenshot.c.orig 2006-11-30 07:28:10.000000000 +0100 -+++ mplayerxp/libvo/screenshot.c 2012-05-06 20:04:09.000000000 +0200 -@@ -20,6 +20,7 @@ - #include <libpng/png.h> - #else - #include <png.h> -+#include <zlib.h> - #endif - #endif - -@@ -67,7 +68,7 @@ - return png; - } - -- if (setjmp(png.png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png.png_ptr))) { - MSG_V("PNG Internal error!\n"); - png_destroy_write_struct(&png.png_ptr, &png.info_ptr); - fclose(png.fp); diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__mplayer.c b/multimedia/mplayerxp/files/patch-mplayerxp__mplayer.c deleted file mode 100644 index 5d62a189052c..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__mplayer.c +++ /dev/null @@ -1,12 +0,0 @@ ---- mplayerxp/mplayer.c.orig Thu Nov 30 15:30:08 2006 -+++ mplayerxp/mplayer.c Mon Dec 25 01:37:46 2006 -@@ -9,8 +9,8 @@ - #define __USE_ISOC99 1 /* for lrint */ - #include <math.h> - #include <errno.h> --#include <sys/mman.h> - #include <sys/types.h> -+#include <sys/mman.h> - #include <sys/wait.h> - #include <sys/time.h> - #include <sys/stat.h> diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__mplayer.h b/multimedia/mplayerxp/files/patch-mplayerxp__mplayer.h deleted file mode 100644 index f75b54746a02..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__mplayer.h +++ /dev/null @@ -1,11 +0,0 @@ ---- mplayerxp/mplayer.h.orig Thu Jul 21 17:08:10 2005 -+++ mplayerxp/mplayer.h Sun Oct 1 21:27:24 2006 -@@ -1,6 +1,8 @@ - #ifndef __MPLAYERXP_MAIN - #define __MPLAYERXP_MAIN 1 - -+#include <pthread.h> -+ - typedef struct initial_audio_pts_correction_s - { - int need_correction; diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__nls__Makefile b/multimedia/mplayerxp/files/patch-mplayerxp__nls__Makefile deleted file mode 100644 index 16b068d425d8..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__nls__Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- mplayerxp/nls/Makefile.orig Tue May 24 00:06:13 2005 -+++ mplayerxp/nls/Makefile Tue Oct 3 01:28:34 2006 -@@ -5,7 +5,7 @@ - SRCS=recode.c - OBJS=$(SRCS:.c=.o) - --CFLAGS = $(OPTFLAGS) -I. -I.. -Wall -+CFLAGS = -I. -I.. $(OPTFLAGS) -Wall - # -I/usr/X11R6/include/ - - .SUFFIXES: .c .o diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__sig_hand.c b/multimedia/mplayerxp/files/patch-mplayerxp__sig_hand.c deleted file mode 100644 index bc36b560a373..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__sig_hand.c +++ /dev/null @@ -1,15 +0,0 @@ ---- mplayerxp/sig_hand.c.orig Thu Dec 5 13:48:53 2002 -+++ mplayerxp/sig_hand.c Thu Dec 5 13:49:32 2002 -@@ -5,10 +5,11 @@ - #include <string.h> - #include <stdio.h> - #include <signal.h> -+#include <sys/types.h> -+#include <sys/time.h> - #include <sys/resource.h> - #include "sig_hand.h" - #include "mp_msg.h" --#include <sys/types.h> - #include <unistd.h> - #include <stdlib.h> - #include "dec_ahead.h" diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__sig_hand.h b/multimedia/mplayerxp/files/patch-mplayerxp__sig_hand.h deleted file mode 100644 index 93d2d5bd5eb4..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp__sig_hand.h +++ /dev/null @@ -1,10 +0,0 @@ ---- mplayerxp/sig_hand.h.orig Mon Jan 17 03:39:59 2005 -+++ mplayerxp/sig_hand.h Sun Oct 1 21:26:33 2006 -@@ -5,6 +5,7 @@ - #define __SIG_HAND_H 1 - - #include <sys/types.h> -+#include <pthread.h> - - #define MAX_XPTHREADS 16 - |