summaryrefslogtreecommitdiff
path: root/packages/mplayer
diff options
context:
space:
mode:
Diffstat (limited to 'packages/mplayer')
-rw-r--r--packages/mplayer/files/Makefile.patch (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch)0
-rw-r--r--packages/mplayer/files/libfaad-fixed.patch16
-rw-r--r--packages/mplayer/files/vo_w100.c (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c)0
-rw-r--r--packages/mplayer/files/vo_w100_api.h (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h)0
-rw-r--r--packages/mplayer/files/vo_w100_fb.h (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h)0
-rw-r--r--packages/mplayer/files/w100-Makefile.patch (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch)0
-rw-r--r--packages/mplayer/files/w100-configure.patch (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch)0
-rw-r--r--packages/mplayer/files/w100-mplayer.patch (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch)0
-rw-r--r--packages/mplayer/files/w100-video_out.patch (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch)0
-rw-r--r--packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty0
-rw-r--r--packages/mplayer/mplayer_1.0pre8.bb (renamed from packages/mplayer/mplayer_1.0pre7+cvs20060519.bb)6
-rw-r--r--packages/mplayer/mplayer_svn.bb74
12 files changed, 92 insertions, 4 deletions
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch b/packages/mplayer/files/Makefile.patch
index da316ad129..da316ad129 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch
+++ b/packages/mplayer/files/Makefile.patch
diff --git a/packages/mplayer/files/libfaad-fixed.patch b/packages/mplayer/files/libfaad-fixed.patch
new file mode 100644
index 0000000000..2b85179038
--- /dev/null
+++ b/packages/mplayer/files/libfaad-fixed.patch
@@ -0,0 +1,16 @@
+--- mplayer-1.1.5/libfaad2/Makefile.orig 2006-05-12 14:45:49.000000000 +0100
++++ mplayer-1.1.5/libfaad2/Makefile 2006-05-12 14:46:36.000000000 +0100
+@@ -6,11 +6,11 @@
+ SRCS = bits.c cfft.c common.c decoder.c drc.c error.c filtbank.c hcr.c huffman.c ic_predict.c is.c lt_predict.c mdct.c mp4.c ms.c output.c pns.c ps_dec.c ps_syntax.c pulse.c rvlc.c sbr_dct.c sbr_dec.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c specrec.c ssr.c ssr_fb.c ssr_ipqf.c syntax.c tns.c
+ OBJS = $(SRCS:.c=.o)
+
+-CFLAGS = -I. $(OPTFLAGS)
++#CFLAGS = -I. $(OPTFLAGS)
+
+ # Uncomment this to use the FIXED_POINT implementation of FAAD2.
+ # This should improve performance, especially for SBR files.
+-#CFLAGS = -I. $(OPTFLAGS) -DFIXED_POINT
++CFLAGS = -I. $(OPTFLAGS) -DFIXED_POINT
+
+ .SUFFIXES: .c .o
+
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c b/packages/mplayer/files/vo_w100.c
index 702707c656..702707c656 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c
+++ b/packages/mplayer/files/vo_w100.c
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h b/packages/mplayer/files/vo_w100_api.h
index 59cf58be26..59cf58be26 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h
+++ b/packages/mplayer/files/vo_w100_api.h
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h b/packages/mplayer/files/vo_w100_fb.h
index 39318c645b..39318c645b 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h
+++ b/packages/mplayer/files/vo_w100_fb.h
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch b/packages/mplayer/files/w100-Makefile.patch
index 01899556d3..01899556d3 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch
+++ b/packages/mplayer/files/w100-Makefile.patch
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch b/packages/mplayer/files/w100-configure.patch
index 03610610e4..03610610e4 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch
+++ b/packages/mplayer/files/w100-configure.patch
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch b/packages/mplayer/files/w100-mplayer.patch
index 4bed6326d1..4bed6326d1 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch
+++ b/packages/mplayer/files/w100-mplayer.patch
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch b/packages/mplayer/files/w100-video_out.patch
index 9855853fe6..9855853fe6 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch
+++ b/packages/mplayer/files/w100-video_out.patch
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty b/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb b/packages/mplayer/mplayer_1.0pre8.bb
index 9298f0645c..a55c59dc96 100644
--- a/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb
+++ b/packages/mplayer/mplayer_1.0pre8.bb
@@ -5,8 +5,7 @@ HOMEPAGE = "http://www.mplayerhq.hu/"
DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common"
RDEPENDS = "mplayer-common"
LICENSE = "GPL"
-SRC_URI = "http://www.xora.org.uk/oe/mplayer_20060519.tar.bz2 \
- http://www.xora.org.uk/oe/ffmpeg_20060519.tar.bz2 \
+SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
file://vo_w100.c \
file://vo_w100_api.h \
file://vo_w100_fb.h \
@@ -25,7 +24,7 @@ PARALLEL_MAKE = ""
DEPENDS_append_c7x0 = " sharp-aticore-oss"
-S = "${WORKDIR}/mplayer_20060519"
+S = "${WORKDIR}/MPlayer-${PV}"
PACKAGES =+ "mencoder"
@@ -60,7 +59,6 @@ EXTRA_OECONF = " \
EXTRA_OECONF_append_c7x0 = " --enable-w100 "
do_configure() {
- cp -r ${WORKDIR}/ffmpeg_20060519/libavcodec ${WORKDIR}/ffmpeg_20060519/libavutil ${WORKDIR}/ffmpeg_20060519/libavformat ${S}
cp ${WORKDIR}/vo_w100.c ${S}/libvo
cp ${WORKDIR}/vo_w100_api.h ${S}/libvo
cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
new file mode 100644
index 0000000000..7af431430b
--- /dev/null
+++ b/packages/mplayer/mplayer_svn.bb
@@ -0,0 +1,74 @@
+DESCRIPTION = "Open Source multimedia player."
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.mplayerhq.hu/"
+DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common"
+RDEPENDS = "mplayer-common"
+LICENSE = "GPL"
+SRC_URI = "svn://svn.mplayerhq.hu/;module=mplayer \
+ file://vo_w100.c \
+ file://vo_w100_api.h \
+ file://vo_w100_fb.h \
+ file://Makefile.patch;patch=1 \
+ file://w100-configure.patch;patch=1 \
+ file://w100-Makefile.patch;patch=1 \
+ file://w100-video_out.patch;patch=1 \
+ file://w100-mplayer.patch;patch=1"
+
+MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
+RCONFLICTS_${PN} = "mplayer-atty"
+RREPLACES_${PN} = "mplayer-atty"
+
+PV = "1.0pre8+svn${SRCDATE}"
+PR = "r0"
+DEFAULT_PREFERENCE = "-1"
+
+PARALLEL_MAKE = ""
+
+DEPENDS_append_c7x0 = " sharp-aticore-oss"
+
+S = "${WORKDIR}/mplayer/trunk/"
+
+PACKAGES =+ "mencoder"
+
+FILES_${PN} = "${bindir}/mplayer"
+FILES_mencoder = "${bindir}/mencoder"
+
+inherit autotools
+
+EXTRA_OECONF = " \
+ --prefix=/usr \
+ --mandir=${mandir} \
+ --target=${TARGET_SYS} \
+ \
+ --enable-mencoder \
+ --disable-gui \
+ --enable-largefiles \
+ --disable-linux-devfs \
+ --disable-lirc \
+ --disable-lircc \
+ --disable-tv \
+ --enable-rtc \
+ --disable-smb \
+ --disable-win32 \
+ \
+ --enable-tremor-low \
+ --disable-mp3lib \
+ \
+ --disable-x11 \
+ --enable-sdl \
+ --enable-fbdev "
+
+EXTRA_OECONF_append_c7x0 = " --enable-w100 "
+
+do_configure() {
+ cp ${WORKDIR}/vo_w100.c ${S}/libvo
+ cp ${WORKDIR}/vo_w100_api.h ${S}/libvo
+ cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo
+ ./configure ${EXTRA_OECONF}
+}
+
+do_compile () {
+ oe_runmake
+}
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 02:18:16 +0000