From bccec864dcaf6fd454793c8e769b04f3e6f02359 Mon Sep 17 00:00:00 2001 From: miwi Date: Tue, 9 Jan 2007 22:48:40 +0000 Subject: - Update to 0.6.1 PR: ports/107634 Submitted by: KATO Tsuguru --- multimedia/mplayerxp/Makefile | 157 +++++++++------------ multimedia/mplayerxp/distinfo | 6 +- .../mplayerxp/files/patch-codecs__common.mak | 24 ++++ multimedia/mplayerxp/files/patch-codecs__configure | 10 ++ .../files/patch-codecs__libavcodec__xvidff.c | 13 ++ .../files/patch-codecs__libfaad2__common.h | 106 ++++++++++++++ .../files/patch-codecs__libfaad2__output.c | 13 ++ multimedia/mplayerxp/files/patch-loader::Makefile | 18 +-- .../mplayerxp/files/patch-loader__dmo__Makefile | 15 ++ .../mplayerxp/files/patch-loader__dshow__Makefile | 15 ++ .../mplayerxp/files/patch-mplayerxp::Makefile | 9 +- .../mplayerxp/files/patch-mplayerxp::libdha::mmi.c | 10 -- .../patch-mplayerxp::vidix::drivers::radeon_vid.c | 10 -- .../files/patch-mplayerxp__libao2__afmt.h | 37 +++++ .../files/patch-mplayerxp__libao2__ao_null.c | 11 ++ .../files/patch-mplayerxp__libao2__ao_oss.c | 18 +++ .../patch-mplayerxp__libmpdemux__asf_streaming.c | 10 ++ .../files/patch-mplayerxp__libmpdemux__demux_mov.c | 13 ++ .../patch-mplayerxp__libmpdemux__mux_mpxp64.c | 21 +++ .../files/patch-mplayerxp__libmpdemux__s_network.c | 13 ++ .../files/patch-mplayerxp__libvo__vo_null.c | 12 ++ .../mplayerxp/files/patch-mplayerxp__mplayer.c | 12 ++ .../mplayerxp/files/patch-mplayerxp__mplayer.h | 11 ++ .../mplayerxp/files/patch-mplayerxp__nls__Makefile | 11 ++ .../mplayerxp/files/patch-mplayerxp__nls__recode.c | 14 ++ .../files/patch-mplayerxp__postproc__dsp.c | 11 ++ .../mplayerxp/files/patch-mplayerxp__sig_hand.h | 10 ++ .../mplayerxp/files/patch-mplayerxp__subreader.c | 14 ++ multimedia/mplayerxp/pkg-plist | 35 ++--- 29 files changed, 504 insertions(+), 155 deletions(-) create mode 100644 multimedia/mplayerxp/files/patch-codecs__common.mak create mode 100644 multimedia/mplayerxp/files/patch-codecs__configure create mode 100644 multimedia/mplayerxp/files/patch-codecs__libavcodec__xvidff.c create mode 100644 multimedia/mplayerxp/files/patch-codecs__libfaad2__common.h create mode 100644 multimedia/mplayerxp/files/patch-codecs__libfaad2__output.c create mode 100644 multimedia/mplayerxp/files/patch-loader__dmo__Makefile create mode 100644 multimedia/mplayerxp/files/patch-loader__dshow__Makefile delete mode 100644 multimedia/mplayerxp/files/patch-mplayerxp::libdha::mmi.c delete mode 100644 multimedia/mplayerxp/files/patch-mplayerxp::vidix::drivers::radeon_vid.c create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__libao2__afmt.h create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_null.c create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_oss.c create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__asf_streaming.c create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__demux_mov.c create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__mux_mpxp64.c create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__s_network.c create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__libvo__vo_null.c create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__mplayer.c create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__mplayer.h create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__nls__Makefile create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__nls__recode.c create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__postproc__dsp.c create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__sig_hand.h create mode 100644 multimedia/mplayerxp/files/patch-mplayerxp__subreader.c diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile index 7c9388989059..6f3639edcc11 100644 --- a/multimedia/mplayerxp/Makefile +++ b/multimedia/mplayerxp/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mplayerxp -PORTVERSION= 0.1.9 -PORTREVISION= 5 +PORTVERSION= 0.6.1 CATEGORIES= multimedia audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,16 +14,17 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Multi-threaded branch of the well known mplayer media player -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - mp3lame.0:${PORTSDIR}/audio/lame \ - png.5:${PORTSDIR}/graphics/png +LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ + jpeg.9:${PORTSDIR}/graphics/jpeg \ + png.5:${PORTSDIR}/graphics/png \ + vcdinfo.2:${PORTSDIR}/multimedia/vcdimager RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts -BROKEN= Does not compile - ONLY_FOR_ARCHS= i386 + USE_BZIP2= yes -USE_GNOME= gtk12 +#USE_GNOME= gtk12 +USE_GCC= 3.4+ USE_ICONV= yes USE_XLIB= yes USE_GMAKE= yes @@ -35,11 +35,6 @@ MAN1= mplayerxp.1 WIN32_CODEC_PREFIX= ${LOCALBASE}/lib/win32 -# dirs to create before installation -DIRS_TO_CREATE= etc/mplayerxp \ - lib/mplayerxp/codecs \ - lib/mplayerxp/wine - .include # add this after so that we inherit /etc/make.conf @@ -54,23 +49,42 @@ CONFIGURE_ARGS+= --with-extralibdir=${LOCALBASE}/lib \ --disable-fbdev \ --disable-lirc \ --disable-rtc \ + --disable-vm \ --disable-tv-v4l # insure CC,LD safeness MAKE_ARGS+= CC="${CC}" LD="${LD}" +CFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -fomit-frame-pointer + +.if ${OSVERSION} < 500000 +CFLAGS+= -Dint_fast8_t=int8_t +CFLAGS+= -Dint_fast16_t=int16_t +CFLAGS+= -Dint_fast32_t=int32_t +CFLAGS+= -Duint_fast8_t=uint8_t +CFLAGS+= -Duint_fast16_t=uint16_t +CFLAGS+= -Duint_fast32_t=uint32_t +CFLAGS+= -Duint_fast64_t=uint64_t +CFLAGS+= -DPRId64=\\\"lld\\\" +CFLAGS+= -DPRIu64=\\\"llu\\\" +CFLAGS+= -DPRIx64=\\\"llx\\\" +CFLAGS+= -DPRIX64=\\\"llX\\\" +.endif + ## ## Feature detection ## -# KDE aRts -.if exists(${LOCALBASE}/lib/libartsc.so) -WITH_ARTS=yes -.endif # xine libdvdnav .if exists(${LOCALBASE}/lib/libdvdnav.so) WITH_DVD=yes WITH_LIBDVDNAV=yes .endif +.if exists(${LOCALBASE}/lib/libdvdplay.a) +# ogle's libdvdplay +WITH_DVD=yes +WITH_DVDPLAY=yes +.endif # cdparanoia (cdda support) .if exists(${LOCALBASE}/lib/libcdda_paranoia.so) WITH_CDPARANOIA=yes @@ -101,29 +115,17 @@ WITH_XVID=yes WITHOUT_LIBDVDNAV=yes # compilation optimizations -.ifdef(WITH_OPTIMIZED_CFLAGS) -CFLAGS+= -O3 -ffast-math -fomit-frame-pointer -.endif -# 3dnow optimizations -.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 -CONFIGURE_ARGS+= --enable-3dnow --enable-3dnowex -.endif -# sse optimizations -.if !defined(WITHOUT_SSE) && ${OSVERSION} >= 400021 -CONFIGURE_ARGS+= --enable-sse --enable-sse2 -.endif -# KDE aRts -.ifdef(WITH_ARTS) -LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts +.if defined(WITH_OPTIMIZED_CFLAGS) +CFLAGS+= -O3 -ffast-math .endif # cdda support -.ifdef(WITH_CDPARANOIA) +.if defined(WITH_CDPARANOIA) LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia .else CONFIGURE_ARGS+= --disable-cdparanoia .endif # dvd support -.ifdef(WITH_DVD) +.if defined(WITH_DVD) LIB_DEPENDS+= dvdread.3:${PORTSDIR}/multimedia/libdvdread CONFIGURE_ARGS+= --with-csslibdir=${LOCALBASE}/lib @@ -137,22 +139,28 @@ LIB_DEPENDS+= dvdnav.4:${PORTSDIR}/multimedia/libdvdnav CONFIGURE_ARGS+= --with-libdvdnav=${LOCALBASE} .endif +# ogle's libdvdplay +.if defined(WITH_LIBDVDPLAY) && !defined(WITHOUT_LIBDVDPLAY) +LIB_DEPENDS+= dvdplay.0:${PORTSDIR}/multimedia/libdvdplay + +CONFIGURE_ARGS+= --with-libdvdplay=${LOCALBASE} +.endif # sdl -.ifdef(WITH_SDL) +.if defined(WITH_SDL) USE_SDL= sdl CONFIGURE_ARGS+= --enable-sdl .else CONFIGURE_ARGS+= --disable-sdl .endif # sdl_image -.ifdef(WITH_SDL_IMAGE) +.if defined(WITH_SDL_IMAGE) USE_SDL+= image CONFIGURE_ARGS+= --enable-sdl-image .else CONFIGURE_ARGS+= --disable-sdl-image .endif # xvid -.ifdef(WITH_XVID) +.if defined(WITH_XVID) LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid CONFIGURE_ARGS+= --enable-xvid \ @@ -162,7 +170,7 @@ CONFIGURE_ARGS+= --disable-xvid .endif # termcap key support # mplayerxp does not clean up after itself yet -.ifdef(WITH_TERMCAP) +.if defined(WITH_TERMCAP) CONFIGURE_ARGS+= --enable-termcap .else CONFIGURE_ARGS+= --disable-termcap @@ -176,79 +184,50 @@ CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE .endif pre-everything:: -.ifndef(WITH_OPTIMIZED_CFLAGS) +.if !defined(WITH_OPTIMIZED_CFLAGS) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> You can enable additional compilation optimizations' @${ECHO_MSG} ' by defining WITH_OPTIMIZED_CFLAGS.' .endif -.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 - @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> You can disable 3DNow! optimized routines by defining WITHOUT_3DNOW.' -.endif -.if !defined(WITHOUT_SSE) && ${OSVERSION} >= 400021 - @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> You can disable SSE optimized routines by defining WITHOUT_SSE.' -.endif -.ifndef(WITH_ARTS) - @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> You can enable KDE ARTS support by defining WITH_ARTS.' -.endif -.ifndef(WITH_CDPARANOIA) +.if !defined(WITH_CDPARANOIA) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> You can enable cdda support by defining WITH_CDPARANOIA.' .endif -.ifndef(WITH_DVD) +.if !defined(WITH_DVD) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> You can enable DVD support by defining WITH_DVD.' .endif -.ifndef(WITH_LIBDVDNAV) +.if !defined(WITH_LIBDVDNAV) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> You can enable LIBDVDNAV support by defining WITH_LIBDVDNAV.' .endif -.ifndef(WITH_SDL) +.if !defined(WITH_LIBDVDNAV) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> You can enable LIBDVDPLAY support by defining WITH_LIBDVDPLAY.' +.endif +.if !defined(WITH_SDL) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> You can enable SDL support by defining WITH_SDL.' .endif -.ifndef(WITH_SDL_IMAGE) +.if !defined(WITH_SDL_IMAGE) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> You can enable SDL_image support by defining WITH_SDL_IMAGE.' .endif -.ifndef(WITH_TERMCAP) +.if !defined(WITH_TERMCAP) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> You can enable termcap key database support by defining WITH_TERMCAP.' .endif -.ifndef(WITH_XVID) +.if !defined(WITH_XVID) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> You can enable XVID support by defining WITH_XVID.' .endif -.ifndef(WITHOUT_WIN32_CODECS) +.if !defined(WITHOUT_WIN32_CODECS) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> You can disable support for Win32 codecs by defining WITHOUT_WIN32_CODECS' .endif @${ECHO_MSG} '===>' post-patch: -# fix detection of libdvdnav -.ifdef(WITH_LIBDVDNAV) - @${REINPLACE_CMD} -E -e \ - 's|(-I\$$_dvdnavdir)|\1/include/dvdnav|; \ - s|(-L\$$_dvdnavdir)/.libs|\1/lib|; \ - s|(-ldvdnav)|\1 ${PTHREAD_LIBS}|' \ - ${WRKSRC}/mplayerxp/configure -.endif -# linux/ioctl.h -> sys/ioctl.h -.for file in mplayerxp/libdha/kernelhelper/dhahelper.h \ - mplayerxp/vidix/drivers/radeon_vid.c - @${REINPLACE_CMD} -e 's|linux/ioctl.h|sys/ioctl.h|' \ - ${WRKSRC}/${file} -.endfor -# correct SDL prefix installation -# -lpthread -> ${PHREAD_LIBS} -# win32 codec location - @${FIND} ${WRKSRC} -type f | \ - ${XARGS} -x -n 10 ${REINPLACE_CMD} -E -e \ - s|-lpthread|${PTHREAD_LIBS}|; \ - s|/usr/local/lib/win32|${WIN32_CODEC_PREFIX}|' # win32 codec location @${REINPLACE_CMD} -E -e \ 's|WIN32_PATH|"${WIN32_CODEC_PREFIX}"|' \ @@ -258,19 +237,17 @@ post-patch: ${XARGS} -x -n 10 ${REINPLACE_CMD} -E -e \ 's,(\$$\(INSTALL\)|install)(.*)-D,${INSTALL}\2,' # PTHREAD_{CFLAGS,LIBS} -# location of xine libdvdnav header files +# stdint.h -> inttypes.h @${REINPLACE_CMD} -E -e \ - 's|-pthread|${PTHREAD_LIBS}|; \ - s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \ + 's|-lpthread|${PTHREAD_LIBS}|; \ + s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|; \ + s|||' \ ${WRKSRC}/mplayerxp/configure -# FreeBSD does not have -ldl - @${REINPLACE_CMD} -e 's|-ldl||' \ - ${WRKSRC}/mplayerxp/vidix/Makefile # ffmpeg currently is not compatible with mplayerxp -.for file in ad_ffmp3.c vd_ffmpeg.c - @${REINPLACE_CMD} -e 's|libavcodec.so|libNOTavcodec.so|' \ - ${WRKSRC}/mplayerxp/libmpcodecs/${file} -.endfor +#.for file in ad_ffmp3.c vd_ffmpeg.c +# @${REINPLACE_CMD} -e 's|libavcodec.so|libNOTavcodec.so|' \ +# ${WRKSRC}/mplayerxp/libmpcodecs/${file} +#.endfor # native libdivxdecore is not compatible with mplayerxp .for file in vd_divx4.c vd_xvid.c @${REINPLACE_CMD} -e 's|libdivxdecore|libNOTdivxdecore|' \ @@ -280,7 +257,7 @@ post-patch: pre-install: # create dirs before installation since the port uses a install # utility option not available in FreeBSD -.for dir in ${DIRS_TO_CREATE} +.for dir in etc/mplayerxp lib/mplayerxp/codecs lib/mplayerxp/wine @${MKDIR} ${PREFIX}/${dir} .endfor diff --git a/multimedia/mplayerxp/distinfo b/multimedia/mplayerxp/distinfo index ca1ec7f70272..4c828ac49538 100644 --- a/multimedia/mplayerxp/distinfo +++ b/multimedia/mplayerxp/distinfo @@ -1,3 +1,3 @@ -MD5 (mplayerxp-0.1.9.tar.bz2) = c85c07053ad2fa94a8b102ab869769f9 -SHA256 (mplayerxp-0.1.9.tar.bz2) = 14b33146b422f954bad507813c223eb09e8ad44ac864ed79fc01c7c9e951f00c -SIZE (mplayerxp-0.1.9.tar.bz2) = 1363915 +MD5 (mplayerxp-0.6.1.tar.bz2) = 3458b8e231accbcb19c7a32acdeb1a45 +SHA256 (mplayerxp-0.6.1.tar.bz2) = f5d2654edc92a356ee6d0679c6b9cdc347b0fa7a5ab4fb9726e17f968c7bfdc2 +SIZE (mplayerxp-0.6.1.tar.bz2) = 3880162 diff --git a/multimedia/mplayerxp/files/patch-codecs__common.mak b/multimedia/mplayerxp/files/patch-codecs__common.mak new file mode 100644 index 000000000000..61e5eb6c8bcd --- /dev/null +++ b/multimedia/mplayerxp/files/patch-codecs__common.mak @@ -0,0 +1,24 @@ +--- codecs/common.mak.orig Fri Dec 1 16:20:40 2006 ++++ codecs/common.mak Mon Dec 25 00:55:17 2006 +@@ -22,7 +22,7 @@ + endif + + ifneq ($(TARGET_OS),WIN32) +-LDFLAGS+=-Xlinker -rpath=$(BINDIR) ++LDFLAGS+=-L${LOCALBASE}/lib -L${X11BASE}/lib -Xlinker -rpath=$(BINDIR) + endif + + ifeq ($(TARGET_ARCH_SPARC64),yes) +@@ -42,9 +42,9 @@ + $(RANLIB) $@ + + $(SLIBNAME): $(SHARED_OBJS) +-ifneq ($(TARGET_OS),WIN32) +- install -d $(BINDIR) +-endif ++#ifneq ($(TARGET_OS),WIN32) ++# install -d $(BINDIR) ++#endif + $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS) + #ifeq ($(TARGET_OS),WIN32) + # -lib /machine:i386 /def:$(@:.dll=.def) diff --git a/multimedia/mplayerxp/files/patch-codecs__configure b/multimedia/mplayerxp/files/patch-codecs__configure new file mode 100644 index 000000000000..2a8a0d9c97f3 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-codecs__configure @@ -0,0 +1,10 @@ +--- codecs/configure.orig Sat Sep 30 16:20:13 2006 ++++ codecs/configure Tue Oct 3 12:15:45 2006 +@@ -604,7 +604,7 @@ + BUILD_SHARED=yes + SRC_PATH=$source_path + +-MAKE=make ++#MAKE=make + CC=$_cc + AR=ar diff --git a/multimedia/mplayerxp/files/patch-codecs__libavcodec__xvidff.c b/multimedia/mplayerxp/files/patch-codecs__libavcodec__xvidff.c new file mode 100644 index 000000000000..6054c611345f --- /dev/null +++ b/multimedia/mplayerxp/files/patch-codecs__libavcodec__xvidff.c @@ -0,0 +1,13 @@ +--- codecs/libavcodec/xvidff.c.orig Wed Oct 18 02:39:04 2006 ++++ codecs/libavcodec/xvidff.c Mon Dec 25 01:35:12 2006 +@@ -31,6 +31,10 @@ + #include "avcodec.h" + #include "xvid_internal.h" + ++#ifndef roundf ++#define roundf(x) (floor((x)+(float )0.5f)) ++#endif ++ + /** + * Buffer management macros. + */ diff --git a/multimedia/mplayerxp/files/patch-codecs__libfaad2__common.h b/multimedia/mplayerxp/files/patch-codecs__libfaad2__common.h new file mode 100644 index 000000000000..635090a41e73 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-codecs__libfaad2__common.h @@ -0,0 +1,106 @@ +--- 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 ++ ++ #define sin sinf ++ #define cos cosf ++ #define log logf ++ #define floor floorf ++ #define ceil ceilf ++ #define sqrt sqrtf ++ ++ #else ++ ++#include ++ ++#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 new file mode 100644 index 000000000000..03d8fa3ba0e4 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-codecs__libfaad2__output.c @@ -0,0 +1,13 @@ +--- 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::Makefile b/multimedia/mplayerxp/files/patch-loader::Makefile index 705ba19c5870..7aa5cff5c6a5 100644 --- a/multimedia/mplayerxp/files/patch-loader::Makefile +++ b/multimedia/mplayerxp/files/patch-loader::Makefile @@ -1,11 +1,11 @@ ---- loader/Makefile.orig Sun Nov 24 20:00:35 2002 -+++ loader/Makefile Sun Nov 24 20:00:44 2002 -@@ -54,7 +54,7 @@ - ifeq ($(TARGET_ARCH_X86),yes) - $(LIBNAME): $(LIB_OBJECTS) stubs.s - $(CC) -c ./stubs.s -o stubs.o -- $(LD) --shared -soname $@ -o $@ $(LIB_OBJECTS) stubs.o -lc -lm -lpthread -+ $(LD) --shared -soname $@ -o $@ $(LIB_OBJECTS) stubs.o -lc -lm +--- 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 - dep: +-LD_LIBS=-lc -lm -lpthread ++LD_LIBS=-lc -lm + ifeq ($(TARGET_OS),WIN32) + LD_LIBS+=-lkernel32 + endif diff --git a/multimedia/mplayerxp/files/patch-loader__dmo__Makefile b/multimedia/mplayerxp/files/patch-loader__dmo__Makefile new file mode 100644 index 000000000000..a77a29f55103 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-loader__dmo__Makefile @@ -0,0 +1,15 @@ +--- loader/dmo/Makefile.orig Fri Oct 20 00:57:44 2006 ++++ loader/dmo/Makefile Mon Dec 25 00:17:23 2006 +@@ -29,9 +29,9 @@ + $(CC) -c $(CFLAGS) -o $@ $< + + $(LIBNAME): $(OBJS) +-ifneq ($(TARGET_OS),WIN32) +- install -d $(BINDIR) +-endif ++#ifneq ($(TARGET_OS),WIN32) ++# install -d $(BINDIR) ++#endif + $(LD) --shared $(LD_FLAGS) -o $@ $(OBJS) ../dshow/DS_Filter$(SLIBSUF) $(LD_LIBS) + all: $(LIBNAME) + diff --git a/multimedia/mplayerxp/files/patch-loader__dshow__Makefile b/multimedia/mplayerxp/files/patch-loader__dshow__Makefile new file mode 100644 index 000000000000..4f233db5cb7b --- /dev/null +++ b/multimedia/mplayerxp/files/patch-loader__dshow__Makefile @@ -0,0 +1,15 @@ +--- loader/dshow/Makefile.orig Fri Oct 20 00:57:44 2006 ++++ loader/dshow/Makefile Mon Dec 25 00:16:16 2006 +@@ -34,9 +34,9 @@ + $(CC) -c $(CFLAGS) -o $@ $< + + $(LIBNAME): $(OBJS) +-ifneq ($(TARGET_OS),WIN32) +- install -d $(BINDIR) +-endif ++#ifneq ($(TARGET_OS),WIN32) ++# install -d $(BINDIR) ++#endif + $(LD) --shared $(LD_FLAGS) -o $(LIBNAME) $(OBJS) $(LD_LIBS) + + test: test.c $(LIBNAME) diff --git a/multimedia/mplayerxp/files/patch-mplayerxp::Makefile b/multimedia/mplayerxp/files/patch-mplayerxp::Makefile index 66bc17676c7d..43b3618ef302 100644 --- a/multimedia/mplayerxp/files/patch-mplayerxp::Makefile +++ b/multimedia/mplayerxp/files/patch-mplayerxp::Makefile @@ -1,6 +1,6 @@ ---- mplayerxp/Makefile.orig Tue Jul 2 05:38:23 2002 -+++ mplayerxp/Makefile Sun Nov 24 21:41:24 2002 -@@ -120,23 +120,11 @@ +--- 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) @@ -11,9 +11,6 @@ - @echo "*** of this project" - @exit 1 -endif - ifeq ($(VIDIX),yes) - $(DO_MAKE) - 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 diff --git a/multimedia/mplayerxp/files/patch-mplayerxp::libdha::mmi.c b/multimedia/mplayerxp/files/patch-mplayerxp::libdha::mmi.c deleted file mode 100644 index 54ac4d4e4630..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp::libdha::mmi.c +++ /dev/null @@ -1,10 +0,0 @@ ---- mplayerxp/libdha/mmi.c.orig Sun Nov 24 11:02:13 2002 -+++ mplayerxp/libdha/mmi.c Sun Nov 24 11:02:31 2002 -@@ -1,6 +1,7 @@ - /* Memory manager interface */ - #include - #include -+#include - #include /* mlock */ - #include - #include diff --git a/multimedia/mplayerxp/files/patch-mplayerxp::vidix::drivers::radeon_vid.c b/multimedia/mplayerxp/files/patch-mplayerxp::vidix::drivers::radeon_vid.c deleted file mode 100644 index cf5152013321..000000000000 --- a/multimedia/mplayerxp/files/patch-mplayerxp::vidix::drivers::radeon_vid.c +++ /dev/null @@ -1,10 +0,0 @@ ---- mplayerxp/vidix/drivers/radeon_vid.c.orig Sun Nov 24 15:13:43 2002 -+++ mplayerxp/vidix/drivers/radeon_vid.c Sun Nov 24 15:13:53 2002 -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include "../../libdha/pci_ids.h" - #include "../../libdha/pci_names.h" diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libao2__afmt.h b/multimedia/mplayerxp/files/patch-mplayerxp__libao2__afmt.h new file mode 100644 index 000000000000..433b999c7619 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__libao2__afmt.h @@ -0,0 +1,37 @@ +--- 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 new file mode 100644 index 000000000000..12c529f21104 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_null.c @@ -0,0 +1,11 @@ +--- mplayerxp/libao2/ao_null.c.orig Thu Nov 30 15:32:02 2006 ++++ mplayerxp/libao2/ao_null.c Sun Dec 24 21:48:25 2006 +@@ -1,7 +1,7 @@ +-#include + #include + #include + #include ++#include + #include + + #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 new file mode 100644 index 000000000000..6d9c459acbf9 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_oss.c @@ -0,0 +1,18 @@ +--- mplayerxp/libao2/ao_oss.c.orig Sat Jul 2 18:59:01 2005 ++++ mplayerxp/libao2/ao_oss.c Sun Oct 1 22:06:55 2006 +@@ -171,6 +171,7 @@ + } + show_fmts(); + rval=0; ++#ifndef __FreeBSD__ + if (ioctl (audio_fd, SNDCTL_DSP_GETCAPS, &rval) != -1) + { + MSG_INFO("AO-INFO: Capabilities: "); +@@ -185,6 +186,7 @@ + if(rval & DSP_CAP_BIND) MSG_INFO("bind "); + MSG_INFO("\n"); + } ++#endif + close(audio_fd); + } + // open & setup audio device diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__asf_streaming.c b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__asf_streaming.c new file mode 100644 index 000000000000..0affaf9808fa --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__asf_streaming.c @@ -0,0 +1,10 @@ +--- 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 + #include + #include ++#include + #include + + #include "config.h" diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__demux_mov.c b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__demux_mov.c new file mode 100644 index 000000000000..ba691d73c189 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__demux_mov.c @@ -0,0 +1,13 @@ +--- mplayerxp/libmpdemux/demux_mov.c.orig Wed Sep 13 16:11:59 2006 ++++ mplayerxp/libmpdemux/demux_mov.c Sun Oct 1 21:57:58 2006 +@@ -51,6 +51,10 @@ + #define char2short(x,y) BE_16(*((uint16_t *)&(((unsigned char *)(x))[(y)]))) + #define char2int(x,y) BE_32(*((uint32_t *)&(((unsigned char *)(x))[(y)]))) + ++#ifndef SIZE_MAX ++#define SIZE_MAX ((size_t)-1) ++#endif ++ + typedef struct { + unsigned int pts; // duration + unsigned int size; diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__mux_mpxp64.c b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__mux_mpxp64.c new file mode 100644 index 000000000000..b2eaa1a73347 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__mux_mpxp64.c @@ -0,0 +1,21 @@ +--- 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 new file mode 100644 index 000000000000..657d3af47995 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__s_network.c @@ -0,0 +1,13 @@ +--- 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__vo_null.c b/multimedia/mplayerxp/files/patch-mplayerxp__libvo__vo_null.c new file mode 100644 index 000000000000..e422601c0c42 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__libvo__vo_null.c @@ -0,0 +1,12 @@ +--- mplayerxp/libvo/vo_null.c.orig Thu Jan 19 17:17:41 2006 ++++ mplayerxp/libvo/vo_null.c Sun Oct 1 22:39:27 2006 +@@ -35,7 +35,9 @@ + #include "video_out_internal.h" + #include "dri_vo.h" + #include "vo_msg.h" ++#if 0 + #include ++#endif + + LIBVO_EXTERN(null) + diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__mplayer.c b/multimedia/mplayerxp/files/patch-mplayerxp__mplayer.c new file mode 100644 index 000000000000..5d62a189052c --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__mplayer.c @@ -0,0 +1,12 @@ +--- 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 + #include +-#include + #include ++#include + #include + #include + #include diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__mplayer.h b/multimedia/mplayerxp/files/patch-mplayerxp__mplayer.h new file mode 100644 index 000000000000..f75b54746a02 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__mplayer.h @@ -0,0 +1,11 @@ +--- 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 ++ + 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 new file mode 100644 index 000000000000..16b068d425d8 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__nls__Makefile @@ -0,0 +1,11 @@ +--- 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__nls__recode.c b/multimedia/mplayerxp/files/patch-mplayerxp__nls__recode.c new file mode 100644 index 000000000000..f4557a37ccf7 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__nls__recode.c @@ -0,0 +1,14 @@ +--- mplayerxp/nls/recode.c.orig Sat Feb 11 03:39:53 2006 ++++ mplayerxp/nls/recode.c Sun Oct 1 22:34:34 2006 +@@ -3,11 +3,7 @@ + #include + #include + #ifdef USE_ICONV +-#ifdef __FreeBSD__ +-#include +-#else + #include +-#endif + #endif + #include "nls_msg.h" + #include "./nls.h" diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__postproc__dsp.c b/multimedia/mplayerxp/files/patch-mplayerxp__postproc__dsp.c new file mode 100644 index 000000000000..5dcdb6edaa39 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__postproc__dsp.c @@ -0,0 +1,11 @@ +--- mplayerxp/postproc/dsp.c.orig Sat Jul 2 18:59:04 2005 ++++ mplayerxp/postproc/dsp.c Sun Oct 1 22:10:31 2006 +@@ -11,7 +11,7 @@ + /* Design and implementation of different types of digital filters + + */ +-#include ++#include + #include + #define __USE_ISOC99 1 + #include diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__sig_hand.h b/multimedia/mplayerxp/files/patch-mplayerxp__sig_hand.h new file mode 100644 index 000000000000..93d2d5bd5eb4 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__sig_hand.h @@ -0,0 +1,10 @@ +--- 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 ++#include + + #define MAX_XPTHREADS 16 + diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__subreader.c b/multimedia/mplayerxp/files/patch-mplayerxp__subreader.c new file mode 100644 index 000000000000..25de138a11c4 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__subreader.c @@ -0,0 +1,14 @@ +--- mplayerxp/subreader.c.orig Sat Feb 11 03:39:49 2006 ++++ mplayerxp/subreader.c Sun Oct 1 21:15:14 2006 +@@ -19,11 +19,7 @@ + #define ERR ((void *) -1) + + #ifdef USE_ICONV +-#ifdef __FreeBSD__ +-#include +-#else + #include +-#endif + #endif + char *sub_cp=NULL; + diff --git a/multimedia/mplayerxp/pkg-plist b/multimedia/mplayerxp/pkg-plist index 51aa87b26c9f..ba39c87fc4c3 100644 --- a/multimedia/mplayerxp/pkg-plist +++ b/multimedia/mplayerxp/pkg-plist @@ -1,40 +1,21 @@ %%DVD%%bin/fibmap_mplayerxp bin/mplayerxp etc/mplayerxp/codecs.conf -include/vidix/fourcc.h -include/vidix/vidix.h -include/vidix/vidixlib.h -lib/libdha-0.2.so -lib/libdha.so -lib/libvidix.so +etc/mplayerxp/eqbands lib/mplayerxp/codecs/libMP3.so lib/mplayerxp/codecs/liba52.so -lib/mplayerxp/codecs/libac3-iec958.so -lib/mplayerxp/codecs/libadpcm.so -lib/mplayerxp/codecs/libcinepak.so -lib/mplayerxp/codecs/libcyuv.so -lib/mplayerxp/codecs/libfli.so +lib/mplayerxp/codecs/libavcodec.so +lib/mplayerxp/codecs/libavformat.so +lib/mplayerxp/codecs/libavutil.so +lib/mplayerxp/codecs/libdca.so +lib/mplayerxp/codecs/libfaad2.so lib/mplayerxp/codecs/libmpeg2.so -lib/mplayerxp/codecs/libmsvidc.so lib/mplayerxp/codecs/libnuppelvideo.so -lib/mplayerxp/codecs/libqtrle.so -lib/mplayerxp/codecs/libqtrpza.so -lib/mplayerxp/codecs/libqtsmc.so -lib/mplayerxp/codecs/libroqav.so +lib/mplayerxp/codecs/libpostproc.so +lib/mplayerxp/wine/DMO_Filter.so lib/mplayerxp/wine/DS_Filter.so lib/mplayerxp/wine/libloader.so -lib/vidix/genfb_vid.so -lib/vidix/mach64_vid.so -lib/vidix/mga_crtc2_vid.so -lib/vidix/mga_vid.so -lib/vidix/nvidia_vid.so -lib/vidix/pm2_vid.so -lib/vidix/pm3_vid.so -lib/vidix/radeon_vid.so -lib/vidix/rage128_vid.so -@dirrm lib/vidix @dirrm lib/mplayerxp/wine @dirrm lib/mplayerxp/codecs @dirrm lib/mplayerxp -@dirrm include/vidix @dirrm etc/mplayerxp -- cgit