Re: UPDATE: MPlayer 20230409
On Sun Apr 09, 2023 at 02:47:16PM -0400, Brad Smith wrote: > Here is an update to MPlayer 20230409 snapshot. Thanks, committed.
UPDATE: MPlayer 20230409
Here is an update to MPlayer 20230409 snapshot.
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.325
diff -u -p -u -p -r1.325 Makefile
--- Makefile14 Mar 2023 10:08:13 - 1.325
+++ Makefile9 Apr 2023 18:41:55 -
@@ -1,9 +1,8 @@
COMMENT= movie player supporting many formats
-V= 20211106
+V= 20230409
FFMPEG_V= 4.4.3
DISTNAME= mplayer-${V}
-REVISION= 6
CATEGORIES=x11 multimedia
MASTER_SITES= https://comstyle.com/source/
EXTRACT_SUFX= .tar.xz
@@ -19,8 +18,8 @@ WANTLIB= EGL GL SDL X11 Xext Xinerama Xs
avcodec avformat avutil bluray bs2b bz2 c cdda_interface \
cdda_paranoia crypto dv dvdnav dvdread enca fontconfig \
freetype fribidi gif iconv jpeg m mng mp3lame curses png \
- postproc pthread sndio ssl ${COMPILER_LIBCXX} swscale \
- swresample util x264 xvidcore z
+ postproc pthread sndio ssl swscale swresample util x264 \
+ xvidcore z
COMPILER= base-clang ports-gcc
COMPILER_LANGS=c
Index: distinfo
===
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 distinfo
--- distinfo7 Dec 2021 20:03:57 - 1.54
+++ distinfo9 Apr 2023 18:35:48 -
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20211106.tar.xz) = abnH7MqAyIClXGKO+xmvhnOqYozshtmDz9teTWGWJjM=
-SIZE (mplayer-20211106.tar.xz) = 5178076
+SHA256 (mplayer-20230409.tar.xz) = bwTz7Xl2T+HlT3FoBA5d1k6ZZiO5K9ITOBRiAPp6Fgo=
+SIZE (mplayer-20230409.tar.xz) = 5176244
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.95
diff -u -p -u -p -r1.95 patch-configure
--- patches/patch-configure 11 Mar 2022 20:16:48 - 1.95
+++ patches/patch-configure 14 Dec 2022 02:08:12 -
@@ -15,7 +15,7 @@ Index: configure
# Use this before starting a check
echocheck() {
echo " Checking for $@ " >> "$TMPLOG"
-@@ -1529,39 +1536,39 @@ echo configuration: $configuration > "$TMPLOG"
+@@ -1530,39 +1537,39 @@ echo configuration: $configuration > "$TMPLOG"
echo >> "$TMPLOG"
@@ -87,7 +87,7 @@ Index: configure
list_subparts() {
test ! -e ffmpeg/libav${3} && return 1
pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -1991,7 +1998,10 @@ fi
+@@ -1995,7 +2002,10 @@ fi
if arm ; then
cc_check && host_arch=aarch64 || host_arch=arm
fi
@@ -98,7 +98,7 @@ Index: configure
echo "Detected operating system: $system_name"
echo "Detected host architecture: $host_arch"
-@@ -2534,7 +2544,7 @@ case "$host_arch" in
+@@ -2540,7 +2550,7 @@ case "$host_arch" in
arch='sparc'
iproc='sparc'
if test "$host_arch" = "sparc64" ; then
@@ -107,7 +107,7 @@ Index: configure
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
-@@ -2835,7 +2845,14 @@ EOF
+@@ -2841,7 +2851,14 @@ EOF
arch='arc'
iproc='arc'
;;
@@ -122,7 +122,7 @@ Index: configure
*)
echo "The architecture of your CPU ($host_arch) is not supported by this
configure script"
echo "It seems nobody has ported MPlayer to your OS or CPU type yet."
-@@ -2909,7 +2926,7 @@ cat > $TMPC << EOF
+@@ -2915,7 +2932,7 @@ cat > $TMPC << EOF
int ff_extern;
EOF
cc_check -c || die "Symbol mangling check failed."
@@ -131,7 +131,7 @@ Index: configure
extern_prefix=${sym%%ff_extern*}
def_extern_asm="#define EXTERN_ASM $extern_prefix"
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -2974,7 +2991,7 @@ else
+@@ -2980,7 +2997,7 @@ else
fi
CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
@@ -140,7 +140,7 @@ Index: configure
# On glibc, add some more CPPFLAGS for enabling required functionality.
cpp_condition_check features.h "defined __GLIBC__" &&
-@@ -3055,7 +3072,7 @@ elif test $relocatable = "yes" ; then
+@@ -3061,7 +3078,7 @@ elif test $relocatable = "yes" ; then
fi
echores $relocatable
@@ -177,7 +177,7 @@ Index: configure
_cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
done
fi
-@@ -8488,6 +8509,7 @@ extra_ldflags="$extra_ldflags $libm"
+@@ -8445,6 +8466,7 @@ extra_ldflags="$extra_ldflags $libm"
# XML documentation tests
echocheck "XML catalogs"
for try_catalog in \
@@ -185,7 +185,7 @@ Index: configure
/etc/sgml/catalog \
/usr/share/xml/docbook/*/catalog.xml \
/opt/local/share/xml/docbook-xml/*/catalog.xml \
-@@ -8515,6 +8537,7 @@ fi
+@@ -8472,6 +8494,7 @@ fi
echocheck "XML chunked stylesheet"
for try_chunk_xsl in \
@@ -193,7 +193,7 @@ Index: configure
/usr/share/xml/docbook/*/html/chunk.xsl \
Re: UPDATE: MPlayer 20221213
ping.
On 12/21/2022 11:50 PM, Brad Smith wrote:
ping.
On 12/13/2022 10:05 PM, Brad Smith wrote:
Here is an update to MPlayer 20221213.
It rolls in a few bug fixes.
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.322
diff -u -p -u -p -r1.322 Makefile
--- Makefile 4 Dec 2022 20:12:36 - 1.322
+++ Makefile 14 Dec 2022 02:07:45 -
@@ -1,9 +1,8 @@
COMMENT= movie player supporting many formats
-V= 20211106
+V= 20221213
FFMPEG_V= 4.4.3
DISTNAME= mplayer-${V}
-REVISION= 3
CATEGORIES= x11 multimedia
MASTER_SITES= https://comstyle.com/source/
EXTRACT_SUFX= .tar.xz
Index: distinfo
===
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 distinfo
--- distinfo 7 Dec 2021 20:03:57 - 1.54
+++ distinfo 14 Dec 2022 02:07:49 -
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20211106.tar.xz) =
abnH7MqAyIClXGKO+xmvhnOqYozshtmDz9teTWGWJjM=
-SIZE (mplayer-20211106.tar.xz) = 5178076
+SHA256 (mplayer-20221213.tar.xz) =
k32WJPsww3H0qD3ZWu7BYD+bztGnWdcjNLscTJCviPg=
+SIZE (mplayer-20221213.tar.xz) = 5173100
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.95
diff -u -p -u -p -r1.95 patch-configure
--- patches/patch-configure 11 Mar 2022 20:16:48 - 1.95
+++ patches/patch-configure 14 Dec 2022 02:08:12 -
@@ -15,7 +15,7 @@ Index: configure
# Use this before starting a check
echocheck() {
echo " Checking for $@ " >> "$TMPLOG"
-@@ -1529,39 +1536,39 @@ echo configuration: $configuration > "$TMPLOG"
+@@ -1530,39 +1537,39 @@ echo configuration: $configuration > "$TMPLOG"
echo >> "$TMPLOG"
@@ -87,7 +87,7 @@ Index: configure
list_subparts() {
test ! -e ffmpeg/libav${3} && return 1
pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -1991,7 +1998,10 @@ fi
+@@ -1995,7 +2002,10 @@ fi
if arm ; then
cc_check && host_arch=aarch64 || host_arch=arm
fi
@@ -98,7 +98,7 @@ Index: configure
echo "Detected operating system: $system_name"
echo "Detected host architecture: $host_arch"
-@@ -2534,7 +2544,7 @@ case "$host_arch" in
+@@ -2540,7 +2550,7 @@ case "$host_arch" in
arch='sparc'
iproc='sparc'
if test "$host_arch" = "sparc64" ; then
@@ -107,7 +107,7 @@ Index: configure
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
-@@ -2835,7 +2845,14 @@ EOF
+@@ -2841,7 +2851,14 @@ EOF
arch='arc'
iproc='arc'
;;
@@ -122,7 +122,7 @@ Index: configure
*)
echo "The architecture of your CPU ($host_arch) is not
supported by this configure script"
echo "It seems nobody has ported MPlayer to your OS or CPU
type yet."
-@@ -2909,7 +2926,7 @@ cat > $TMPC << EOF
+@@ -2915,7 +2932,7 @@ cat > $TMPC << EOF
int ff_extern;
EOF
cc_check -c || die "Symbol mangling check failed."
@@ -131,7 +131,7 @@ Index: configure
extern_prefix=${sym%%ff_extern*}
def_extern_asm="#define EXTERN_ASM $extern_prefix"
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -2974,7 +2991,7 @@ else
+@@ -2980,7 +2997,7 @@ else
fi
CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
@@ -140,7 +140,7 @@ Index: configure
# On glibc, add some more CPPFLAGS for enabling required
functionality.
cpp_condition_check features.h "defined __GLIBC__" &&
-@@ -3055,7 +3072,7 @@ elif test $relocatable = "yes" ; then
+@@ -3061,7 +3078,7 @@ elif test $relocatable = "yes" ; then
fi
echores $relocatable
@@ -177,7 +177,7 @@ Index: configure
_cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp"
&& break
done
fi
-@@ -8488,6 +8509,7 @@ extra_ldflags="$extra_ldflags $libm"
+@@ -8445,6 +8466,7 @@ extra_ldflags="$extra_ldflags $libm"
# XML documentation tests
echocheck "XML catalogs"
for try_catalog in \
@@ -185,7 +185,7 @@ Index: configure
/etc/sgml/catalog \
/usr/share/xml/docbook/*/catalog.xml \
/opt/local/share/xml/docbook-xml/*/catalog.xml \
-@@ -8515,6 +8537,7 @@ fi
+@@ -8472,6 +8494,7 @@ fi
echocheck "XML chunked stylesheet"
for try_chunk_xsl in \
@@ -193,7 +193,7 @@ Index: configure
/usr/share/xml/docbook/*/html/chunk.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \
-@@ -8540,6 +8563,7 @@ fi
+@@ -8497,6 +8520,7 @@ fi
echocheck "XML monolithic stylesheet"
for try_docbook_xsl in \
@@ -201,7 +201,7 @@ Index: configure
/usr/share/xml/docbook/*/html/docbook.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \
-@@
Re: UPDATE: MPlayer 20221213
ping.
On 12/13/2022 10:05 PM, Brad Smith wrote:
Here is an update to MPlayer 20221213.
It rolls in a few bug fixes.
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.322
diff -u -p -u -p -r1.322 Makefile
--- Makefile4 Dec 2022 20:12:36 - 1.322
+++ Makefile14 Dec 2022 02:07:45 -
@@ -1,9 +1,8 @@
COMMENT= movie player supporting many formats
-V= 20211106
+V= 20221213
FFMPEG_V= 4.4.3
DISTNAME= mplayer-${V}
-REVISION= 3
CATEGORIES= x11 multimedia
MASTER_SITES= https://comstyle.com/source/
EXTRACT_SUFX= .tar.xz
Index: distinfo
===
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 distinfo
--- distinfo7 Dec 2021 20:03:57 - 1.54
+++ distinfo14 Dec 2022 02:07:49 -
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20211106.tar.xz) = abnH7MqAyIClXGKO+xmvhnOqYozshtmDz9teTWGWJjM=
-SIZE (mplayer-20211106.tar.xz) = 5178076
+SHA256 (mplayer-20221213.tar.xz) = k32WJPsww3H0qD3ZWu7BYD+bztGnWdcjNLscTJCviPg=
+SIZE (mplayer-20221213.tar.xz) = 5173100
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.95
diff -u -p -u -p -r1.95 patch-configure
--- patches/patch-configure 11 Mar 2022 20:16:48 - 1.95
+++ patches/patch-configure 14 Dec 2022 02:08:12 -
@@ -15,7 +15,7 @@ Index: configure
# Use this before starting a check
echocheck() {
echo " Checking for $@ " >> "$TMPLOG"
-@@ -1529,39 +1536,39 @@ echo configuration: $configuration > "$TMPLOG"
+@@ -1530,39 +1537,39 @@ echo configuration: $configuration > "$TMPLOG"
echo >> "$TMPLOG"
@@ -87,7 +87,7 @@ Index: configure
list_subparts() {
test ! -e ffmpeg/libav${3} && return 1
pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -1991,7 +1998,10 @@ fi
+@@ -1995,7 +2002,10 @@ fi
if arm ; then
cc_check && host_arch=aarch64 || host_arch=arm
fi
@@ -98,7 +98,7 @@ Index: configure
echo "Detected operating system: $system_name"
echo "Detected host architecture: $host_arch"
-@@ -2534,7 +2544,7 @@ case "$host_arch" in
+@@ -2540,7 +2550,7 @@ case "$host_arch" in
arch='sparc'
iproc='sparc'
if test "$host_arch" = "sparc64" ; then
@@ -107,7 +107,7 @@ Index: configure
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
-@@ -2835,7 +2845,14 @@ EOF
+@@ -2841,7 +2851,14 @@ EOF
arch='arc'
iproc='arc'
;;
@@ -122,7 +122,7 @@ Index: configure
*)
echo "The architecture of your CPU ($host_arch) is not supported by this
configure script"
echo "It seems nobody has ported MPlayer to your OS or CPU type yet."
-@@ -2909,7 +2926,7 @@ cat > $TMPC << EOF
+@@ -2915,7 +2932,7 @@ cat > $TMPC << EOF
int ff_extern;
EOF
cc_check -c || die "Symbol mangling check failed."
@@ -131,7 +131,7 @@ Index: configure
extern_prefix=${sym%%ff_extern*}
def_extern_asm="#define EXTERN_ASM $extern_prefix"
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -2974,7 +2991,7 @@ else
+@@ -2980,7 +2997,7 @@ else
fi
CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
@@ -140,7 +140,7 @@ Index: configure
# On glibc, add some more CPPFLAGS for enabling required functionality.
cpp_condition_check features.h "defined __GLIBC__" &&
-@@ -3055,7 +3072,7 @@ elif test $relocatable = "yes" ; then
+@@ -3061,7 +3078,7 @@ elif test $relocatable = "yes" ; then
fi
echores $relocatable
@@ -177,7 +177,7 @@ Index: configure
_cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
done
fi
-@@ -8488,6 +8509,7 @@ extra_ldflags="$extra_ldflags $libm"
+@@ -8445,6 +8466,7 @@ extra_ldflags="$extra_ldflags $libm"
# XML documentation tests
echocheck "XML catalogs"
for try_catalog in \
@@ -185,7 +185,7 @@ Index: configure
/etc/sgml/catalog \
/usr/share/xml/docbook/*/catalog.xml \
/opt/local/share/xml/docbook-xml/*/catalog.xml \
-@@ -8515,6 +8537,7 @@ fi
+@@ -8472,6 +8494,7 @@ fi
echocheck "XML chunked stylesheet"
for try_chunk_xsl in \
@@ -193,7 +193,7 @@ Index: configure
/usr/share/xml/docbook/*/html/chunk.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \
-@@ -8540,6 +8563,7 @@ fi
+@@ -8497,6 +8520,7 @@ fi
echocheck "XML monolithic stylesheet"
for try_docbook_xsl in \
@@ -201,7 +201,7 @@ Index: configure
/usr/share/xml/docbook/*/html/docbook.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \
-@@ -8593,6 +8617,7 @@ EOF
UPDATE: MPlayer 20221213
Here is an update to MPlayer 20221213.
It rolls in a few bug fixes.
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.322
diff -u -p -u -p -r1.322 Makefile
--- Makefile4 Dec 2022 20:12:36 - 1.322
+++ Makefile14 Dec 2022 02:07:45 -
@@ -1,9 +1,8 @@
COMMENT= movie player supporting many formats
-V= 20211106
+V= 20221213
FFMPEG_V= 4.4.3
DISTNAME= mplayer-${V}
-REVISION= 3
CATEGORIES=x11 multimedia
MASTER_SITES= https://comstyle.com/source/
EXTRACT_SUFX= .tar.xz
Index: distinfo
===
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 distinfo
--- distinfo7 Dec 2021 20:03:57 - 1.54
+++ distinfo14 Dec 2022 02:07:49 -
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20211106.tar.xz) = abnH7MqAyIClXGKO+xmvhnOqYozshtmDz9teTWGWJjM=
-SIZE (mplayer-20211106.tar.xz) = 5178076
+SHA256 (mplayer-20221213.tar.xz) = k32WJPsww3H0qD3ZWu7BYD+bztGnWdcjNLscTJCviPg=
+SIZE (mplayer-20221213.tar.xz) = 5173100
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.95
diff -u -p -u -p -r1.95 patch-configure
--- patches/patch-configure 11 Mar 2022 20:16:48 - 1.95
+++ patches/patch-configure 14 Dec 2022 02:08:12 -
@@ -15,7 +15,7 @@ Index: configure
# Use this before starting a check
echocheck() {
echo " Checking for $@ " >> "$TMPLOG"
-@@ -1529,39 +1536,39 @@ echo configuration: $configuration > "$TMPLOG"
+@@ -1530,39 +1537,39 @@ echo configuration: $configuration > "$TMPLOG"
echo >> "$TMPLOG"
@@ -87,7 +87,7 @@ Index: configure
list_subparts() {
test ! -e ffmpeg/libav${3} && return 1
pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -1991,7 +1998,10 @@ fi
+@@ -1995,7 +2002,10 @@ fi
if arm ; then
cc_check && host_arch=aarch64 || host_arch=arm
fi
@@ -98,7 +98,7 @@ Index: configure
echo "Detected operating system: $system_name"
echo "Detected host architecture: $host_arch"
-@@ -2534,7 +2544,7 @@ case "$host_arch" in
+@@ -2540,7 +2550,7 @@ case "$host_arch" in
arch='sparc'
iproc='sparc'
if test "$host_arch" = "sparc64" ; then
@@ -107,7 +107,7 @@ Index: configure
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
-@@ -2835,7 +2845,14 @@ EOF
+@@ -2841,7 +2851,14 @@ EOF
arch='arc'
iproc='arc'
;;
@@ -122,7 +122,7 @@ Index: configure
*)
echo "The architecture of your CPU ($host_arch) is not supported by this
configure script"
echo "It seems nobody has ported MPlayer to your OS or CPU type yet."
-@@ -2909,7 +2926,7 @@ cat > $TMPC << EOF
+@@ -2915,7 +2932,7 @@ cat > $TMPC << EOF
int ff_extern;
EOF
cc_check -c || die "Symbol mangling check failed."
@@ -131,7 +131,7 @@ Index: configure
extern_prefix=${sym%%ff_extern*}
def_extern_asm="#define EXTERN_ASM $extern_prefix"
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -2974,7 +2991,7 @@ else
+@@ -2980,7 +2997,7 @@ else
fi
CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
@@ -140,7 +140,7 @@ Index: configure
# On glibc, add some more CPPFLAGS for enabling required functionality.
cpp_condition_check features.h "defined __GLIBC__" &&
-@@ -3055,7 +3072,7 @@ elif test $relocatable = "yes" ; then
+@@ -3061,7 +3078,7 @@ elif test $relocatable = "yes" ; then
fi
echores $relocatable
@@ -177,7 +177,7 @@ Index: configure
_cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
done
fi
-@@ -8488,6 +8509,7 @@ extra_ldflags="$extra_ldflags $libm"
+@@ -8445,6 +8466,7 @@ extra_ldflags="$extra_ldflags $libm"
# XML documentation tests
echocheck "XML catalogs"
for try_catalog in \
@@ -185,7 +185,7 @@ Index: configure
/etc/sgml/catalog \
/usr/share/xml/docbook/*/catalog.xml \
/opt/local/share/xml/docbook-xml/*/catalog.xml \
-@@ -8515,6 +8537,7 @@ fi
+@@ -8472,6 +8494,7 @@ fi
echocheck "XML chunked stylesheet"
for try_chunk_xsl in \
@@ -193,7 +193,7 @@ Index: configure
/usr/share/xml/docbook/*/html/chunk.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \
-@@ -8540,6 +8563,7 @@ fi
+@@ -8497,6 +8520,7 @@ fi
echocheck "XML monolithic stylesheet"
for try_docbook_xsl in \
@@ -201,7 +201,7 @@ Index: configure
/usr/share/xml/docbook/*/html/docbook.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \
-@@ -8593,6 +8617,7 @@ EOF
+@@ -8550,6 +8574,7 @@ EOF
echocheck "XML DTD"
#FIXME: This should prefer higher version numbers, not the
Re: UPDATE: MPlayer 20211106
Brad Smith wrote:
> Here is an update to MPlayer snapshot from 20211106.
>
> [ big list of changes ]
Looks good. I lightly tested mplayer video playback on various formats.
Still works. I did not test anything that depends on mplayer or mencoder.
The two dropped patches have been upstreamed.
portcheck, lib-depends-check are happy.
ok sdk@
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
> retrieving revision 1.316
> diff -u -p -u -p -r1.316 Makefile
> --- Makefile 8 Nov 2021 12:42:11 - 1.316
> +++ Makefile 7 Nov 2021 03:08:48 -
> @@ -1,11 +1,10 @@
> -# $OpenBSD: Makefile,v 1.316 2021/11/08 12:42:11 sthen Exp $
> +# $OpenBSD: Makefile,v 1.315 2021/07/25 15:13:21 matthieu Exp $
>
> COMMENT= movie player supporting many formats
>
> -V= 20210124
> +V= 20211106
> FFMPEG_V=4.4.1
> DISTNAME=mplayer-${V}
> -REVISION=4
> CATEGORIES= x11 multimedia
> MASTER_SITES=https://comstyle.com/source/
> EXTRACT_SUFX=.tar.xz
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
> retrieving revision 1.53
> diff -u -p -u -p -r1.53 distinfo
> --- distinfo 6 Feb 2021 21:46:32 - 1.53
> +++ distinfo 7 Nov 2021 03:08:09 -
> @@ -1,2 +1,2 @@
> -SHA256 (mplayer-20210124.tar.xz) =
> lFK2anWHpV8JKwI29rkQdCpopUJgKygmFcfIn+SWcFI=
> -SIZE (mplayer-20210124.tar.xz) = 5169156
> +SHA256 (mplayer-20211106.tar.xz) =
> abnH7MqAyIClXGKO+xmvhnOqYozshtmDz9teTWGWJjM=
> +SIZE (mplayer-20211106.tar.xz) = 5178076
> Index: patches/patch-Makefile
> ===
> RCS file: /home/cvs/ports/x11/mplayer/patches/patch-Makefile,v
> retrieving revision 1.33
> diff -u -p -u -p -r1.33 patch-Makefile
> --- patches/patch-Makefile25 Dec 2019 15:52:25 - 1.33
> +++ patches/patch-Makefile7 Nov 2021 03:11:40 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.33 2019/12/
> Index: Makefile
> --- Makefile.orig
> +++ Makefile
> -@@ -35,6 +35,7 @@ OS_FEATURE-$(VSSCANF)+= osdep/vsscanf.
> +@@ -36,6 +36,7 @@ OS_FEATURE-$(VSSCANF)+= osdep/vsscanf.
> # conditional source declarations
> SRCS_AUDIO_INPUT-$(ALSA) += stream/ai_alsa.c
> SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c
> @@ -11,7 +11,7 @@ Index: Makefile
> SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes)
> SRCS_COMMON-$(BITMAP_FONT) += sub/font_load.c
> SRCS_COMMON-$(CDDA) += stream/stream_cdda.c\
> -@@ -611,7 +612,8 @@ SRCS_MPLAYER = command.c\
> +@@ -614,7 +615,8 @@ SRCS_MPLAYER = command.c\
> libvo/vo_mpegpes.c \
> libvo/vo_null.c \
> sub/spuenc.c \
> Index: patches/patch-configure
> ===
> RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
> retrieving revision 1.91
> diff -u -p -u -p -r1.91 patch-configure
> --- patches/patch-configure 25 Jul 2021 15:13:21 - 1.91
> +++ patches/patch-configure 7 Nov 2021 03:11:38 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.91 2021/07
> Index: configure
> --- configure.orig
> +++ configure
> -@@ -284,6 +284,13 @@ arm() {
> +@@ -289,6 +289,13 @@ arm() {
> esac
> }
>
> @@ -17,7 +17,7 @@ Index: configure
> # Use this before starting a check
> echocheck() {
> echo " Checking for $@ " >> "$TMPLOG"
> -@@ -1514,39 +1521,39 @@ echo configuration: $configuration > "$TMPLOG"
> +@@ -1529,39 +1536,39 @@ echo configuration: $configuration > "$TMPLOG"
> echo >> "$TMPLOG"
>
>
> @@ -89,7 +89,7 @@ Index: configure
> list_subparts() {
> test ! -e ffmpeg/libav${3} && return 1
> pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
> -@@ -1928,7 +1935,10 @@ fi
> +@@ -1991,7 +1998,10 @@ fi
> if arm ; then
> cc_check && host_arch=aarch64 || host_arch=arm
> fi
> @@ -100,7 +100,7 @@ Index: configure
>
> echo "Detected operating system: $system_name"
> echo "Detected host architecture: $host_arch"
> -@@ -2465,7 +2475,7 @@ case "$host_arch" in
> +@@ -2534,7 +2544,7 @@ case "$host_arch" in
> arch='sparc'
> iproc='sparc'
> if test "$host_arch" = "sparc64" ; then
> @@ -109,7 +109,7 @@ Index: configure
> proc='ultrasparc'
> def_fast_64bit='#define HAVE_FAST_64BIT 1'
> elif sunos ; then
> -@@ -2766,7 +2776,14 @@ EOF
> +@@ -2835,7 +2845,14 @@ EOF
> arch='arc'
> iproc='arc'
> ;;
> @@ -124,7 +124,7 @@ Index: configure
> *)
> echo "The architecture of your CPU ($host_arch) is not supported by
> this configure script"
> echo "It seems nobody has ported MPlayer to your OS or CPU type yet."
> -@@
UPDATE: MPlayer 20210124
Update to a newer MPlayer snapshot. Some bug fixes and that's about it. r38238 | reimar | 2021-01-23 17:26:28 -0500 (Sat, 23 Jan 2021) | 2 lines vf_spp.c: Add missing include for LOCAL_ALIGNED_16. r38237 | reimar | 2021-01-23 14:05:29 -0500 (Sat, 23 Jan 2021) | 7 lines codec-cfg.c: Also switch to av_strcasecmp. Except when compiling stand-alone, a libavutil dependency would complicate things when cross-compiling, and the locale issue wth strcasecmp is less of a problem when compiling it as a small stand-alone utility. r38236 | reimar | 2021-01-23 13:54:46 -0500 (Sat, 23 Jan 2021) | 2 lines m_options.c: Add sys/types.h included needed for off_t. r38235 | reimar | 2021-01-23 13:22:15 -0500 (Sat, 23 Jan 2021) | 1 line Switch to using DECLARE_ALIGNED for better portability. r38234 | reimar | 2021-01-23 13:22:13 -0500 (Sat, 23 Jan 2021) | 9 lines Remove usage of variable-length stack arrays. They have a couple of issues like complicating stack hardening, stack sizes can be very different and thus failures particularly unpredictable but also compiler support is not universal. In particular MSVC does not support it. As a side benefit, at least some of the code becomes easier to understand. r38233 | reimar | 2021-01-23 13:22:09 -0500 (Sat, 23 Jan 2021) | 10 lines Remove use of strings.h header, use avutil/avstring.h instead. The functions in strings.h are locale-dependent which we do not want them to be. In addition the header is only part of POSIX and not the C standard so it is annoying for porting. The main reason to look into it was testing the option of compiling with MSVC to allow a Windows-on-Arm port. However for that a compatibility wrapper would work as well. r38232 | ib | 2021-01-22 07:08:20 -0500 (Fri, 22 Jan 2021) | 2 lines Fix language names. r38231 | reimar | 2021-01-22 05:59:03 -0500 (Fri, 22 Jan 2021) | 2 lines ao_null.c: Fix compile issue by adding missing include. r38230 | reimar | 2021-01-21 17:54:41 -0500 (Thu, 21 Jan 2021) | 2 lines ao_dsound.c: Avoid pointer arithmetic on void * type. r38229 | reimar | 2021-01-21 17:48:36 -0500 (Thu, 21 Jan 2021) | 5 lines ao_null.c: simplify by using GetTimerMS(). It is also slightly more portable than using gettimeofday directly. r38228 | reimar | 2021-01-21 17:41:44 -0500 (Thu, 21 Jan 2021) | 5 lines Makefile: Make use of the CC_C CC_O etc variables. We defined them already for FFmpeg anyway, so might as well make use of it. r38227 | reimar | 2021-01-20 14:45:32 -0500 (Wed, 20 Jan 2021) | 7 lines sub/spudec.c: support swapped interlacing. The code assumed that the data for the top field would be first, however it is also possible that the data for the bottom field is encoded first. Fixes trac issue #2365. r38226 | reimar | 2021-01-20 13:35:02 -0500 (Wed, 20 Jan 2021) | 4 lines configure: properly enable FFmpeg CodedBitstream parsers. Fixes the warning described in trac #2370 though it did not seem to affect playback for me. r38225 | reimar | 2021-01-20 13:03:35 -0500 (Wed, 20 Jan 2021) | 7 lines mplayer.c: fix crashes for reinit_video_chain failures. The error path should undo the reset, it should not set things that the demuxer owns to NULL. In particular, the rawdv demuxer would crash if opening the vo failed. Fixes trac issue #2326. r38224 | reimar | 2021-01-20 13:03:34 -0500 (Wed, 20 Jan 2021) | 10 lines ad_hwmpa.c: avoid potential out of bounds. This happens when the frame size is larger than the size of the decoded audio - obviously this should not happen in real audio files as it doesn't make sense to select a compression mode that increases size. Note that unless all other MPEG audio codecs are disabled this codec will never be auto-selected. Fixes trac issue #2357. r38223 | reimar | 2021-01-20 13:03:33 -0500 (Wed, 20 Jan 2021) | 3 lines asfheader.c: add sanity
Re: UPDATE: MPlayer 20141103
On Sun, Nov 09, 2014 at 10:31:16AM +0100, Landry Breuil wrote: On Thu, Nov 06, 2014 at 05:26:37AM -0500, Brad Smith wrote: On Thu, Nov 06, 2014 at 09:28:45AM +0100, Landry Breuil wrote: On Wed, Nov 05, 2014 at 10:35:31PM -0500, Brad Smith wrote: On Tue, Nov 04, 2014 at 08:36:10PM +0100, Landry Breuil wrote: On Tue, Nov 04, 2014 at 12:43:03AM +, Stuart Henderson wrote: On 2014/11/03 19:09, Brad Smith wrote: Here is an update to MPlayer 20141103. OK? This works for me on amd64 with a few files I threw at it, though as ever more tests especially from people with collections of uncommon file formats would be useful. i'm seeing regressions on powerpc, but i dont know if this is due to the fixed ffmpeg or a missing underlying dep or... Basically, some files now produce no display (only sound) whatever i try -vo gl or -vo xv, and some other (mostly flvs from youtube/internet) provide garbled display. And can you reproduce these same symptoms if you move the sample files over to another architecture? No issue with the same files and same ffmpeg/mplayer versions on amd64. And i dont know where the issue lies, since even if i come back to ffmpeg-20140810(-D 2014/09/10 before the x265 dep) mplayer-20140824 (-D 2014/10/10 before the ffmpeg dep upgrade) the same files still dont play fine. Even with all .libs removed to ensure no wrong dependency. Landry
Re: UPDATE: MPlayer 20141103
On 11/12/14 14:11, Landry Breuil wrote: On Sun, Nov 09, 2014 at 10:31:16AM +0100, Landry Breuil wrote: On Thu, Nov 06, 2014 at 05:26:37AM -0500, Brad Smith wrote: On Thu, Nov 06, 2014 at 09:28:45AM +0100, Landry Breuil wrote: On Wed, Nov 05, 2014 at 10:35:31PM -0500, Brad Smith wrote: On Tue, Nov 04, 2014 at 08:36:10PM +0100, Landry Breuil wrote: On Tue, Nov 04, 2014 at 12:43:03AM +, Stuart Henderson wrote: On 2014/11/03 19:09, Brad Smith wrote: Here is an update to MPlayer 20141103. OK? This works for me on amd64 with a few files I threw at it, though as ever more tests especially from people with collections of uncommon file formats would be useful. i'm seeing regressions on powerpc, but i dont know if this is due to the fixed ffmpeg or a missing underlying dep or... Basically, some files now produce no display (only sound) whatever i try -vo gl or -vo xv, and some other (mostly flvs from youtube/internet) provide garbled display. And can you reproduce these same symptoms if you move the sample files over to another architecture? No issue with the same files and same ffmpeg/mplayer versions on amd64. And i dont know where the issue lies, since even if i come back to ffmpeg-20140810(-D 2014/09/10 before the x265 dep) mplayer-20140824 (-D 2014/10/10 before the ffmpeg dep upgrade) the same files still dont play fine. Even with all .libs removed to ensure no wrong dependency. So then there has been no regression from the previous MPlayer snapshot. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: MPlayer 20141103
On Wed, Nov 12, 2014 at 07:21:21PM -0500, Brad Smith wrote: On 11/12/14 14:11, Landry Breuil wrote: On Sun, Nov 09, 2014 at 10:31:16AM +0100, Landry Breuil wrote: On Thu, Nov 06, 2014 at 05:26:37AM -0500, Brad Smith wrote: On Thu, Nov 06, 2014 at 09:28:45AM +0100, Landry Breuil wrote: On Wed, Nov 05, 2014 at 10:35:31PM -0500, Brad Smith wrote: On Tue, Nov 04, 2014 at 08:36:10PM +0100, Landry Breuil wrote: On Tue, Nov 04, 2014 at 12:43:03AM +, Stuart Henderson wrote: On 2014/11/03 19:09, Brad Smith wrote: Here is an update to MPlayer 20141103. OK? This works for me on amd64 with a few files I threw at it, though as ever more tests especially from people with collections of uncommon file formats would be useful. i'm seeing regressions on powerpc, but i dont know if this is due to the fixed ffmpeg or a missing underlying dep or... Basically, some files now produce no display (only sound) whatever i try -vo gl or -vo xv, and some other (mostly flvs from youtube/internet) provide garbled display. And can you reproduce these same symptoms if you move the sample files over to another architecture? No issue with the same files and same ffmpeg/mplayer versions on amd64. And i dont know where the issue lies, since even if i come back to ffmpeg-20140810(-D 2014/09/10 before the x265 dep) mplayer-20140824 (-D 2014/10/10 before the ffmpeg dep upgrade) the same files still dont play fine. Even with all .libs removed to ensure no wrong dependency. So then there has been no regression from the previous MPlayer snapshot. Im not sure, but the end result is that mplayer is unusable on lots of files, while ffplay displays them fine. Landry
Re: UPDATE: MPlayer 20141103
On Thu, Nov 06, 2014 at 05:26:37AM -0500, Brad Smith wrote: On Thu, Nov 06, 2014 at 09:28:45AM +0100, Landry Breuil wrote: On Wed, Nov 05, 2014 at 10:35:31PM -0500, Brad Smith wrote: On Tue, Nov 04, 2014 at 08:36:10PM +0100, Landry Breuil wrote: On Tue, Nov 04, 2014 at 12:43:03AM +, Stuart Henderson wrote: On 2014/11/03 19:09, Brad Smith wrote: Here is an update to MPlayer 20141103. OK? This works for me on amd64 with a few files I threw at it, though as ever more tests especially from people with collections of uncommon file formats would be useful. i'm seeing regressions on powerpc, but i dont know if this is due to the fixed ffmpeg or a missing underlying dep or... Basically, some files now produce no display (only sound) whatever i try -vo gl or -vo xv, and some other (mostly flvs from youtube/internet) provide garbled display. And can you reproduce these same symptoms if you move the sample files over to another architecture? No issue with the same files and same ffmpeg/mplayer versions on amd64. Somewhat surprising but definitely not impossible. Can you send me one such file to test with? Try using dd to chop off the first 1MB and check that that is still able to reproduce the issue. In fact, any flv file downloaded from youtube with youtube-dl -f5 fails her. mediainfo says: Video Format : Sorenson Spark Codec ID : 2 The first frame is displayed, then the screen is black and stderr is filing with [flv @ 0xc50bbce8]get_buffer() failed (stride changed) Error while decoding frame! Too many buffered pts This is not only for flv files, an avi coming TPB with: Video ID : 0 Format : MPEG-4 Visual Format profile : Advanced Simple@L5 Format settings, BVOP: 2 Format settings, QPel: No Format settings, GMC : No warppoints Format settings, Matrix : Default (H.263) Codec ID : DX50 Codec ID/Hint: DivX 5 Also fails the same way. Other type of flv files with: Video Format : VP6 Codec ID : 4 Fail differently, first second is displayed, then the display is garbled. Other flv files downloaded from arte.tv a while ago work, mediainfo says: Video Format : AVC Format/Info : Advanced Video Codec Format profile : Main@L3.1 Format settings, CABAC : Yes Format settings, ReFrames: 3 frames Codec ID : 7 Landry
Re: UPDATE: MPlayer 20141103
On Wed, Nov 05, 2014 at 10:35:31PM -0500, Brad Smith wrote: On Tue, Nov 04, 2014 at 08:36:10PM +0100, Landry Breuil wrote: On Tue, Nov 04, 2014 at 12:43:03AM +, Stuart Henderson wrote: On 2014/11/03 19:09, Brad Smith wrote: Here is an update to MPlayer 20141103. OK? This works for me on amd64 with a few files I threw at it, though as ever more tests especially from people with collections of uncommon file formats would be useful. i'm seeing regressions on powerpc, but i dont know if this is due to the fixed ffmpeg or a missing underlying dep or... Basically, some files now produce no display (only sound) whatever i try -vo gl or -vo xv, and some other (mostly flvs from youtube/internet) provide garbled display. And can you reproduce these same symptoms if you move the sample files over to another architecture? No issue with the same files and same ffmpeg/mplayer versions on amd64. Landry
Re: UPDATE: MPlayer 20141103
On Thu, Nov 06, 2014 at 09:28:45AM +0100, Landry Breuil wrote: On Wed, Nov 05, 2014 at 10:35:31PM -0500, Brad Smith wrote: On Tue, Nov 04, 2014 at 08:36:10PM +0100, Landry Breuil wrote: On Tue, Nov 04, 2014 at 12:43:03AM +, Stuart Henderson wrote: On 2014/11/03 19:09, Brad Smith wrote: Here is an update to MPlayer 20141103. OK? This works for me on amd64 with a few files I threw at it, though as ever more tests especially from people with collections of uncommon file formats would be useful. i'm seeing regressions on powerpc, but i dont know if this is due to the fixed ffmpeg or a missing underlying dep or... Basically, some files now produce no display (only sound) whatever i try -vo gl or -vo xv, and some other (mostly flvs from youtube/internet) provide garbled display. And can you reproduce these same symptoms if you move the sample files over to another architecture? No issue with the same files and same ffmpeg/mplayer versions on amd64. Somewhat surprising but definitely not impossible. Can you send me one such file to test with? Try using dd to chop off the first 1MB and check that that is still able to reproduce the issue. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: MPlayer 20141103
On Tue, Nov 04, 2014 at 08:36:10PM +0100, Landry Breuil wrote: On Tue, Nov 04, 2014 at 12:43:03AM +, Stuart Henderson wrote: On 2014/11/03 19:09, Brad Smith wrote: Here is an update to MPlayer 20141103. OK? This works for me on amd64 with a few files I threw at it, though as ever more tests especially from people with collections of uncommon file formats would be useful. i'm seeing regressions on powerpc, but i dont know if this is due to the fixed ffmpeg or a missing underlying dep or... Basically, some files now produce no display (only sound) whatever i try -vo gl or -vo xv, and some other (mostly flvs from youtube/internet) provide garbled display. And can you reproduce these same symptoms if you move the sample files over to another architecture? -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: MPlayer 20141103
On Tue, Nov 04, 2014 at 12:43:03AM +, Stuart Henderson wrote:
On 2014/11/03 19:09, Brad Smith wrote:
Here is an update to MPlayer 20141103.
OK?
This works for me on amd64 with a few files I threw at it,
though as ever more tests especially from people with collections
of uncommon file formats would be useful.
i'm seeing regressions on powerpc, but i dont know if this is due to the
fixed ffmpeg or a missing underlying dep or...
Basically, some files now produce no display (only sound) whatever i try
-vo gl or -vo xv, and some other (mostly flvs from youtube/internet)
provide garbled display.
Duration: 02:15:51.99, start: 0.00, bitrate: 721 kb/s
Stream #0:0: Video: mpeg4 (Advanced Simple Profile) (DX50 / 0x30355844),
yuv420p, 516x214 [SAR 1:1 DAR 258:107], 632 kb/s, 23.98 fps, 23.98 tbr, 23.98
tbn, 23.98 tbc
Stream #0:1: Audio: mp3 (U[0][0][0] / 0x0055), 48000 Hz, stereo, s16p, 80
kb/s
Selected video codec: [ffodivx] vfm: ffmpeg (FFmpeg MPEG-4)
That one plays fine with ffplay, no display with mplayer, which says
indefinitely:
[mpeg4 @ 0xaa58dce8]get_buffer() failed (stride changed)
Error while decoding frame!
Duration: 02:02:09.17, start: 0.00, bitrate: 801 kb/s
Stream #0:0: Video: mpeg4 (Advanced Simple Profile) (XVID / 0x44495658),
yuv420p, 640x272 [SAR 1:1 DAR 40:17], 658 kb/s, 24 fps, 24 tbr, 24 tbn, 24.01
tbc
Stream #0:1: Audio: mp3 (U[0][0][0] / 0x0055), 48000 Hz, stereo, s16p, 129
kb/s
[mpeg4 @ 0x8fbb8000] Video uses a non-standard and wasteful way to store
B-frames ('packed B-frames'). Consider using a tool like VirtualDub or
avidemux to fix it.
Selected video codec: [ffodivx] vfm: ffmpeg (FFmpeg MPEG-4)
That video plays fine with mplayer/ffplay
Duration: 00:25:57.56, start: 0.00, bitrate: 475 kb/s
Stream #0:0: Video: vp6f, yuv420p, 528x304, 412 kb/s, 25 fps, 25 tbr, 1k
tbn, 1k tbc
Stream #0:1: Audio: mp3, 22050 Hz, stereo, s16p, 65 kb/s
Selected video codec: [ffvp6f] vfm: ffmpeg (FFmpeg VP6 Flash)
That one produces a garbled display wit mplayer, plays fine with ffplay
Duration: 00:38:35.68, start: 0.00, bitrate: 481 kb/s
Stream #0:0: Video: vp6f, yuv420p, 320x240, 419 kb/s, 29.97 fps, 29.97 tbr,
1k tbn, 1k tbc
Stream #0:1: Audio: mp3, 22050 Hz, stereo, s16p, 65 kb/s
Selected video codec: [ffvp6f] vfm: ffmpeg (FFmpeg VP6 Flash)
That one plays fine with mplayer/ffplay
Duration: 00:11:05.20, start: 0.04, bitrate: 518 kb/s
Stream #0:0: Video: h264 (High), yuv420p, 646x364 [SAR 1:1 DAR 323:182],
400 kb/s, 25 fps, 25 tbr, 1k tbn, 50 tbc
Stream #0:1: Audio: aac, 44100 Hz, stereo, fltp, 96 kb/s
That one plays fine with mplayer/ffplay
I cant find a way to get more metadata info from working vs nonworking
files, all i'm sure is that with the previous mplayer/ffmpeg (20140412)
they all worked.
That's with:
libavformat version 56.4.101 (external)
libavcodec version 56.1.100 (external)
Landry
UPDATE: MPlayer 20141103
Here is an update to MPlayer 20141103.
OK?
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.242
diff -u -p -u -p -r1.242 Makefile
--- Makefile19 Oct 2014 23:14:24 - 1.242
+++ Makefile3 Nov 2014 06:47:58 -
@@ -7,7 +7,7 @@ ONLY_FOR_ARCHS =${GCC4_ARCHS}
COMMENT = movie player supporting many formats
-V =20140824
+V =20141103
FFMPEG_V = 20141010
SUBST_VARS += PREFIX CONFDIR
@@ -15,7 +15,6 @@ SUBST_VARS += PREFIX CONFDIR
# Distfiles must be hand-rolled, see README
N =mplayer
DISTNAME = mplayer-${V}
-REVISION = 0
EXTRACT_SUFX = .tar.xz
CATEGORIES = x11 multimedia
@@ -26,9 +25,9 @@ HOMEPAGE =http://www.mplayerhq.hu/
PERMIT_PACKAGE_CDROM = patents
PERMIT_PACKAGE_FTP = Yes
-WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
+WANTLIB = EGL GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
- crypto dv dvdnavmini dvdread enca fontconfig freetype \
+ crypto dv dvdnav dvdread enca fontconfig freetype \
fribidi jpeg m mng mp3lame ncurses png postproc pthread \
SDL sndio stdc++ swscale gif util x264=5 xvidcore z
@@ -112,8 +111,6 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-select \
--disable-libcdio \
--disable-libmpeg2-internal \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
--disable-gui \
--disable-ffmpeg_a # link FFmpeg .so (graphics/ffmpeg)
Index: distinfo
===
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 distinfo
--- distinfo3 Sep 2014 06:43:28 - 1.41
+++ distinfo3 Nov 2014 06:34:12 -
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20140824.tar.xz) = 45dPJ+Yy2FFI2ORJNFDt733EsdztgYUK2CIO7DaJFGg=
-SIZE (mplayer-20140824.tar.xz) = 5268352
+SHA256 (mplayer-20141103.tar.xz) = /qn2DuxpWV1ZKtvnet6cvU7SBSbw0L8Lt+Irx2jvHAg=
+SIZE (mplayer-20141103.tar.xz) = 5147172
Index: patches/patch-DOCS_man_en_mplayer_1
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-DOCS_man_en_mplayer_1
--- patches/patch-DOCS_man_en_mplayer_1 3 Sep 2014 06:43:28 - 1.11
+++ patches/patch-DOCS_man_en_mplayer_1 3 Nov 2014 06:35:00 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.11 2014/09/03 06:43:28 brad Exp $
DOCS/man/en/mplayer.1.orig Thu Aug 14 04:26:57 2014
-+++ DOCS/man/en/mplayer.1 Thu Aug 14 04:32:10 2014
+--- DOCS/man/en/mplayer.1.orig Mon Nov 3 01:29:02 2014
DOCS/man/en/mplayer.1 Mon Nov 3 01:34:51 2014
@@ -1546,7 +1546,7 @@ May be negative.
.
.TP
@@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v
.
.TP
.B \-channels number (also see \-af channels)
-@@ -12315,11 +12315,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
+@@ -12318,11 +12318,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
.PP
.B Play DTS-CD with passthrough:
.nf
Index: patches/patch-Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-Makefile,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 patch-Makefile
--- patches/patch-Makefile 10 Jan 2014 21:52:29 - 1.28
+++ patches/patch-Makefile 3 Nov 2014 06:34:58 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.28 2014/01/10 21:52:29 brad Exp $
Makefile.orig Mon Jan 6 17:02:58 2014
-+++ Makefile Mon Jan 6 17:22:43 2014
+--- Makefile.orig Mon Nov 3 01:28:57 2014
Makefile Mon Nov 3 01:34:51 2014
@@ -35,6 +35,7 @@ OS_FEATURE-$(VSSCANF)+= osdep/vsscanf.
# conditional source declarations
SRCS_AUDIO_INPUT-$(ALSA) += stream/ai_alsa.c
@@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile,v 1.28 2014/01/
SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes)
SRCS_COMMON-$(BITMAP_FONT) += sub/font_load.c
SRCS_COMMON-$(CDDA) += stream/stream_cdda.c\
-@@ -639,7 +640,8 @@ SRCS_MPLAYER = command.c\
+@@ -615,7 +616,8 @@ SRCS_MPLAYER = command.c\
libvo/vo_mpegpes.c \
libvo/vo_null.c \
sub/spuenc.c \
Index: patches/patch-configure
===
RCS file:
Re: UPDATE: MPlayer 20141103
On 2014/11/03 19:09, Brad Smith wrote: Here is an update to MPlayer 20141103. OK? This works for me on amd64 with a few files I threw at it, though as ever more tests especially from people with collections of uncommon file formats would be useful.
Re: UPDATE: MPlayer 20140814
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes: Brad Smith b...@comstyle.com writes: [...] Any other MPlayer users? Works fine for me. ok Thanks, -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: MPlayer 20140814
On 24/08/14 9:01 PM, Brad Smith wrote: On Sat, Aug 23, 2014 at 07:47:48PM +0200, Thomas Zander wrote: On 21 August 2014 09:52, Brad Smith b...@comstyle.com wrote: On 14/08/14 4:42 AM, Brad Smith wrote: Here is an update to a snapshot of MPlayer from 20140814. OK? Any MPlayer users? You might want to use an mplayer snapshot after r37257, this should fix an issue where PGS subtitles are not displayed due to a behavioral change in ffmpeg's pgs decoder. That's all that has been commited since the previous snap so I might as well. I take it you have some content using PGS subtitles? Any other MPlayer users? -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: MPlayer 20140814
Brad Smith b...@comstyle.com writes: On 24/08/14 9:01 PM, Brad Smith wrote: On Sat, Aug 23, 2014 at 07:47:48PM +0200, Thomas Zander wrote: On 21 August 2014 09:52, Brad Smith b...@comstyle.com wrote: On 14/08/14 4:42 AM, Brad Smith wrote: Here is an update to a snapshot of MPlayer from 20140814. OK? Any MPlayer users? You might want to use an mplayer snapshot after r37257, this should fix an issue where PGS subtitles are not displayed due to a behavioral change in ffmpeg's pgs decoder. That's all that has been commited since the previous snap so I might as well. I take it you have some content using PGS subtitles? Any other MPlayer users? Works fine for me. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: MPlayer 20140814
On Sat, Aug 23, 2014 at 07:47:48PM +0200, Thomas Zander wrote:
On 21 August 2014 09:52, Brad Smith b...@comstyle.com wrote:
On 14/08/14 4:42 AM, Brad Smith wrote:
Here is an update to a snapshot of MPlayer from 20140814.
OK?
Any MPlayer users?
You might want to use an mplayer snapshot after r37257, this should
fix an issue where PGS subtitles are not displayed due to a behavioral
change in ffmpeg's pgs decoder.
That's all that has been commited since the previous snap so I might
as well. I take it you have some content using PGS subtitles?
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.239
diff -u -p -u -p -r1.239 Makefile
--- Makefile14 Aug 2014 08:20:27 - 1.239
+++ Makefile25 Aug 2014 00:52:10 -
@@ -7,7 +7,7 @@ ONLY_FOR_ARCHS =${GCC4_ARCHS}
COMMENT = movie player supporting many formats
-V =20140412
+V =20140824
FFMPEG_V = 20140810
SUBST_VARS += PREFIX CONFDIR
@@ -15,7 +15,6 @@ SUBST_VARS += PREFIX CONFDIR
# Distfiles must be hand-rolled, see README
N =mplayer
DISTNAME = mplayer-${V}
-REVISION = 1
EXTRACT_SUFX = .tar.xz
CATEGORIES = x11 multimedia
@@ -26,7 +25,7 @@ HOMEPAGE =http://www.mplayerhq.hu/
PERMIT_PACKAGE_CDROM = patents
PERMIT_PACKAGE_FTP = Yes
-WANTLIB = EGL GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
+WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
crypto dv dvdnavmini dvdread enca fontconfig freetype \
fribidi jpeg m mng mp3lame ncurses png postproc pthread \
Index: distinfo
===
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 distinfo
--- distinfo16 May 2014 01:34:50 - 1.40
+++ distinfo25 Aug 2014 00:52:22 -
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20140412.tar.xz) = 4KUrtyu7WIw+f1Ud14cAR+GaCNpS5FcgKDehHJxHn/c=
-SIZE (mplayer-20140412.tar.xz) = 5262184
+SHA256 (mplayer-20140824.tar.xz) = 45dPJ+Yy2FFI2ORJNFDt733EsdztgYUK2CIO7DaJFGg=
+SIZE (mplayer-20140824.tar.xz) = 5268352
Index: patches/patch-DOCS_man_en_mplayer_1
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-DOCS_man_en_mplayer_1
--- patches/patch-DOCS_man_en_mplayer_1 16 May 2014 01:34:50 - 1.10
+++ patches/patch-DOCS_man_en_mplayer_1 14 Aug 2014 08:32:22 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.10 2014/05/16 01:34:50 brad Exp $
DOCS/man/en/mplayer.1.orig Wed Feb 26 23:29:38 2014
-+++ DOCS/man/en/mplayer.1 Wed Feb 26 23:31:29 2014
+--- DOCS/man/en/mplayer.1.orig Thu Aug 14 04:26:57 2014
DOCS/man/en/mplayer.1 Thu Aug 14 04:32:10 2014
@@ -1546,7 +1546,7 @@ May be negative.
.
.TP
@@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v
.
.TP
.B \-channels number (also see \-af channels)
-@@ -12313,11 +12313,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
+@@ -12315,11 +12315,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
.PP
.B Play DTS-CD with passthrough:
.nf
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.74
diff -u -p -u -p -r1.74 patch-configure
--- patches/patch-configure 16 May 2014 01:34:50 - 1.74
+++ patches/patch-configure 25 Aug 2014 00:53:15 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.74 2014/05/16 01:34:50 brad Exp $
configure.orig Sat Apr 12 17:12:35 2014
-+++ configure Sat Apr 12 17:15:59 2014
-@@ -1505,39 +1505,39 @@ echo configuration: $configuration $TMPLOG
+--- configure.orig Sun Aug 24 20:39:15 2014
configure Sun Aug 24 20:52:56 2014
+@@ -1513,39 +1513,39 @@ echo configuration: $configuration $TMPLOG
echo $TMPLOG
@@ -73,7 +73,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
list_subparts() {
test ! -e ffmpeg/libav${3} return 1
pattern=s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p
-@@ -2390,7 +2390,7 @@ case $host_arch in
+@@ -2400,7 +2400,7 @@ case $host_arch in
arch='sparc'
iproc='sparc'
if test $host_arch = sparc64 ; then
@@ -82,7 +82,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
-@@ -2724,7 +2724,7 @@ cat $TMPC EOF
+@@ -2736,7 +2736,7 @@ cat $TMPC EOF
int ff_extern;
EOF
cc_check -c || die Symbol mangling check
Re: UPDATE: MPlayer 20140814
On 21 August 2014 09:52, Brad Smith b...@comstyle.com wrote: On 14/08/14 4:42 AM, Brad Smith wrote: Here is an update to a snapshot of MPlayer from 20140814. OK? Any MPlayer users? You might want to use an mplayer snapshot after r37257, this should fix an issue where PGS subtitles are not displayed due to a behavioral change in ffmpeg's pgs decoder. Best regards Riggs
Re: UPDATE: MPlayer 20140814
On 14/08/14 4:42 AM, Brad Smith wrote:
Here is an update to a snapshot of MPlayer from 20140814.
OK?
Any MPlayer users?
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.239
diff -u -p -u -p -r1.239 Makefile
--- Makefile14 Aug 2014 08:20:27 - 1.239
+++ Makefile14 Aug 2014 08:37:14 -
@@ -7,7 +7,7 @@ ONLY_FOR_ARCHS =${GCC4_ARCHS}
COMMENT = movie player supporting many formats
-V =20140412
+V =20140814
FFMPEG_V =20140810
SUBST_VARS += PREFIX CONFDIR
@@ -15,7 +15,6 @@ SUBST_VARS += PREFIX CONFDIR
# Distfiles must be hand-rolled, see README
N = mplayer
DISTNAME =mplayer-${V}
-REVISION = 1
EXTRACT_SUFX =.tar.xz
CATEGORIES = x11 multimedia
@@ -26,7 +25,7 @@ HOMEPAGE =http://www.mplayerhq.hu/
PERMIT_PACKAGE_CDROM =patents
PERMIT_PACKAGE_FTP = Yes
-WANTLIB = EGL GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
+WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
crypto dv dvdnavmini dvdread enca fontconfig freetype \
fribidi jpeg m mng mp3lame ncurses png postproc pthread \
Index: distinfo
===
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 distinfo
--- distinfo16 May 2014 01:34:50 - 1.40
+++ distinfo14 Aug 2014 08:31:13 -
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20140412.tar.xz) = 4KUrtyu7WIw+f1Ud14cAR+GaCNpS5FcgKDehHJxHn/c=
-SIZE (mplayer-20140412.tar.xz) = 5262184
+SHA256 (mplayer-20140814.tar.xz) = xzmRZr5NKcAkCTkQ7BPor0QUyBwg+sxnbE7sMgq6V2s=
+SIZE (mplayer-20140814.tar.xz) = 5268128
Index: patches/patch-DOCS_man_en_mplayer_1
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-DOCS_man_en_mplayer_1
--- patches/patch-DOCS_man_en_mplayer_1 16 May 2014 01:34:50 - 1.10
+++ patches/patch-DOCS_man_en_mplayer_1 14 Aug 2014 08:32:22 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.10 2014/05/16 01:34:50 brad Exp $
DOCS/man/en/mplayer.1.orig Wed Feb 26 23:29:38 2014
-+++ DOCS/man/en/mplayer.1 Wed Feb 26 23:31:29 2014
+--- DOCS/man/en/mplayer.1.orig Thu Aug 14 04:26:57 2014
DOCS/man/en/mplayer.1 Thu Aug 14 04:32:10 2014
@@ -1546,7 +1546,7 @@ May be negative.
.
.TP
@@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v
.
.TP
.B \-channels number (also see \-af channels)
-@@ -12313,11 +12313,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
+@@ -12315,11 +12315,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
.PP
.B Play DTS-CD with passthrough:
.nf
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.74
diff -u -p -u -p -r1.74 patch-configure
--- patches/patch-configure 16 May 2014 01:34:50 - 1.74
+++ patches/patch-configure 14 Aug 2014 08:32:19 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.74 2014/05/16 01:34:50 brad Exp $
configure.orig Sat Apr 12 17:12:35 2014
-+++ configure Sat Apr 12 17:15:59 2014
-@@ -1505,39 +1505,39 @@ echo configuration: $configuration $TMPLOG
+--- configure.orig Thu Aug 14 04:26:50 2014
configure Thu Aug 14 04:32:10 2014
+@@ -1513,39 +1513,39 @@ echo configuration: $configuration $TMPLOG
echo $TMPLOG
@@ -73,7 +73,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
list_subparts() {
test ! -e ffmpeg/libav${3} return 1
pattern=s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p
-@@ -2390,7 +2390,7 @@ case $host_arch in
+@@ -2400,7 +2400,7 @@ case $host_arch in
arch='sparc'
iproc='sparc'
if test $host_arch = sparc64 ; then
@@ -82,7 +82,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
-@@ -2724,7 +2724,7 @@ cat $TMPC EOF
+@@ -2736,7 +2736,7 @@ cat $TMPC EOF
int ff_extern;
EOF
cc_check -c || die Symbol mangling check failed.
@@ -91,7 +91,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
extern_prefix=${sym%%ff_extern*}
def_extern_asm=#define EXTERN_ASM $extern_prefix
def_extern_prefix=#define EXTERN_PREFIX \$extern_prefix\
-@@ -2852,7 +2852,7 @@ elif test $relocatable = yes ; then
+@@ -2864,7 +2864,7 @@ elif test $relocatable = yes ; then
fi
echores $relocatable
@@ -100,7 +100,7 @@ $OpenBSD:
Re: UPDATE: MPlayer 20140814
On Thu, 21 Aug 2014 03:52:23 -0400, Brad Smith b...@comstyle.com wrote: Any MPlayer users? Compiles and works (for what I use) fine. Fwiw, $ uname -a OpenBSD ardoine.chown.me 5.6 GENERIC.MP#0 amd64 Cheers, -- Vigdis
UPDATE: MPlayer 20140814
Here is an update to a snapshot of MPlayer from 20140814.
OK?
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.239
diff -u -p -u -p -r1.239 Makefile
--- Makefile14 Aug 2014 08:20:27 - 1.239
+++ Makefile14 Aug 2014 08:37:14 -
@@ -7,7 +7,7 @@ ONLY_FOR_ARCHS =${GCC4_ARCHS}
COMMENT = movie player supporting many formats
-V =20140412
+V =20140814
FFMPEG_V = 20140810
SUBST_VARS += PREFIX CONFDIR
@@ -15,7 +15,6 @@ SUBST_VARS += PREFIX CONFDIR
# Distfiles must be hand-rolled, see README
N =mplayer
DISTNAME = mplayer-${V}
-REVISION = 1
EXTRACT_SUFX = .tar.xz
CATEGORIES = x11 multimedia
@@ -26,7 +25,7 @@ HOMEPAGE =http://www.mplayerhq.hu/
PERMIT_PACKAGE_CDROM = patents
PERMIT_PACKAGE_FTP = Yes
-WANTLIB = EGL GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
+WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
crypto dv dvdnavmini dvdread enca fontconfig freetype \
fribidi jpeg m mng mp3lame ncurses png postproc pthread \
Index: distinfo
===
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 distinfo
--- distinfo16 May 2014 01:34:50 - 1.40
+++ distinfo14 Aug 2014 08:31:13 -
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20140412.tar.xz) = 4KUrtyu7WIw+f1Ud14cAR+GaCNpS5FcgKDehHJxHn/c=
-SIZE (mplayer-20140412.tar.xz) = 5262184
+SHA256 (mplayer-20140814.tar.xz) = xzmRZr5NKcAkCTkQ7BPor0QUyBwg+sxnbE7sMgq6V2s=
+SIZE (mplayer-20140814.tar.xz) = 5268128
Index: patches/patch-DOCS_man_en_mplayer_1
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-DOCS_man_en_mplayer_1
--- patches/patch-DOCS_man_en_mplayer_1 16 May 2014 01:34:50 - 1.10
+++ patches/patch-DOCS_man_en_mplayer_1 14 Aug 2014 08:32:22 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.10 2014/05/16 01:34:50 brad Exp $
DOCS/man/en/mplayer.1.orig Wed Feb 26 23:29:38 2014
-+++ DOCS/man/en/mplayer.1 Wed Feb 26 23:31:29 2014
+--- DOCS/man/en/mplayer.1.orig Thu Aug 14 04:26:57 2014
DOCS/man/en/mplayer.1 Thu Aug 14 04:32:10 2014
@@ -1546,7 +1546,7 @@ May be negative.
.
.TP
@@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v
.
.TP
.B \-channels number (also see \-af channels)
-@@ -12313,11 +12313,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
+@@ -12315,11 +12315,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
.PP
.B Play DTS-CD with passthrough:
.nf
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.74
diff -u -p -u -p -r1.74 patch-configure
--- patches/patch-configure 16 May 2014 01:34:50 - 1.74
+++ patches/patch-configure 14 Aug 2014 08:32:19 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.74 2014/05/16 01:34:50 brad Exp $
configure.orig Sat Apr 12 17:12:35 2014
-+++ configure Sat Apr 12 17:15:59 2014
-@@ -1505,39 +1505,39 @@ echo configuration: $configuration $TMPLOG
+--- configure.orig Thu Aug 14 04:26:50 2014
configure Thu Aug 14 04:32:10 2014
+@@ -1513,39 +1513,39 @@ echo configuration: $configuration $TMPLOG
echo $TMPLOG
@@ -73,7 +73,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
list_subparts() {
test ! -e ffmpeg/libav${3} return 1
pattern=s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p
-@@ -2390,7 +2390,7 @@ case $host_arch in
+@@ -2400,7 +2400,7 @@ case $host_arch in
arch='sparc'
iproc='sparc'
if test $host_arch = sparc64 ; then
@@ -82,7 +82,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
-@@ -2724,7 +2724,7 @@ cat $TMPC EOF
+@@ -2736,7 +2736,7 @@ cat $TMPC EOF
int ff_extern;
EOF
cc_check -c || die Symbol mangling check failed.
@@ -91,7 +91,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
extern_prefix=${sym%%ff_extern*}
def_extern_asm=#define EXTERN_ASM $extern_prefix
def_extern_prefix=#define EXTERN_PREFIX \$extern_prefix\
-@@ -2852,7 +2852,7 @@ elif test $relocatable = yes ; then
+@@ -2864,7 +2864,7 @@ elif test $relocatable = yes ; then
fi
echores $relocatable
@@ -100,7 +100,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
# Checking assembler (_as) compatibility...
# Added workaround for older as that
Re: UPDATE: MPlayer
On Sun, Jun 08, 2014 at 11:39:36PM -0400, Brad Smith wrote:
Reduce the external dependencies for MPlayer by disabling
the Opus and Speex decoders in favour of using FFmpeg for
decoding; also fix the Vorbis handling. I'm not sure
exactly what was happening with the resulting binary on
ARM but the internal copy of Tremor was removed awhile
ago. Also there is no encoding support via libvorbis so
the comment is bogus.
Looking for any additional testing.
Missed the LIB_DEPENDS on arm for tremor.
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.237
diff -u -p -u -p -r1.237 Makefile
--- Makefile16 May 2014 01:34:50 - 1.237
+++ Makefile9 Jun 2014 20:28:00 -
@@ -15,6 +15,7 @@ SUBST_VARS += PREFIX CONFDIR
# Distfiles must be hand-rolled, see README
N =mplayer
DISTNAME = mplayer-${V}
+REVISION = 0
EXTRACT_SUFX = .tar.xz
CATEGORIES = x11 multimedia
@@ -28,9 +29,8 @@ PERMIT_PACKAGE_FTP = Yes
WANTLIB = EGL GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
crypto dv dvdnavmini dvdread enca fontconfig freetype \
- fribidi jpeg m mng mp3lame ncurses ogg=5 opus png postproc \
- pthread SDL sndio speex stdc++ swscale gif util x264=5 \
- xvidcore z
+ fribidi jpeg m mng mp3lame ncurses png postproc pthread \
+ SDL sndio stdc++ swscale gif util x264=5 xvidcore z
# we use a snapshot
MASTER_SITES = http://comstyle.com/source/
@@ -45,10 +45,7 @@ LIB_DEPENDS =graphics/png \
graphics/giflib \
graphics/ffmpeg=${FFMPEG_V} \
audio/cdparanoia=3.a9.8 \
- audio/speex \
- audio/libogg \
audio/lame \
- audio/opus \
multimedia/libbluray \
multimedia/libdv \
devel/fribidi \
@@ -153,17 +150,16 @@ CONFIGURE_ARGS += --disable-smb \
--disable-faad \
--disable-theora \
--disable-pulse \
- --disable-relocatable
+ --disable-relocatable \
+ --disable-speex \
+ --disable-libopus \
+ --disable-libvorbis
-# internal tremor, external tremor, external libvorbis all conflict
-# we choose libvorbis to enable encoding to vorbis
-CONFIGURE_ARGS += --disable-tremor
.if ${MACHINE_ARCH:Marm}
-# ... except on arm, which has no floating point hardware
-CONFIGURE_ARGS += --disable-libvorbis
+WANTLIB += ogg vorbisidec
+LIB_DEPENDS += audio/tremor
.else
-LIB_DEPENDS += audio/libvorbis
-WANTLIB += vorbisenc vorbis
+CONFIGURE_ARGS += --disable-tremor
.endif
CONFIGURE_ENV += LOCALBASE=${LOCALBASE} TMPDIR=${WRKBUILD}
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: MPlayer
On Sun, Jun 08, 2014 at 11:39:36PM -0400, Brad Smith wrote: Looking for any additional testing. Seems to be funtioning fine on i386 with typical h.264/aac in .mp4 containers.
Re: UPDATE: MPlayer
On i386, Speex and Opus have now both been tested, using .ogg containers. Both playback fine.
UPDATE: MPlayer
Reduce the external dependencies for MPlayer by disabling
the Opus and Speex decoders in favour of using FFmpeg for
decoding; also fix the Vorbis handling. I'm not sure
exactly what was happening with the resulting binary on
ARM but the internal copy of Tremor was removed awhile
ago. Also there is no encoding support via libvorbis so
the comment is bogus.
Looking for any additional testing.
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.237
diff -u -p -u -p -r1.237 Makefile
--- Makefile16 May 2014 01:34:50 - 1.237
+++ Makefile9 Jun 2014 01:20:34 -
@@ -15,6 +15,7 @@ SUBST_VARS += PREFIX CONFDIR
# Distfiles must be hand-rolled, see README
N =mplayer
DISTNAME = mplayer-${V}
+REVISION = 0
EXTRACT_SUFX = .tar.xz
CATEGORIES = x11 multimedia
@@ -28,9 +29,8 @@ PERMIT_PACKAGE_FTP = Yes
WANTLIB = EGL GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
crypto dv dvdnavmini dvdread enca fontconfig freetype \
- fribidi jpeg m mng mp3lame ncurses ogg=5 opus png postproc \
- pthread SDL sndio speex stdc++ swscale gif util x264=5 \
- xvidcore z
+ fribidi jpeg m mng mp3lame ncurses png postproc pthread \
+ SDL sndio stdc++ swscale gif util x264=5 xvidcore z
# we use a snapshot
MASTER_SITES = http://comstyle.com/source/
@@ -45,10 +45,7 @@ LIB_DEPENDS =graphics/png \
graphics/giflib \
graphics/ffmpeg=${FFMPEG_V} \
audio/cdparanoia=3.a9.8 \
- audio/speex \
- audio/libogg \
audio/lame \
- audio/opus \
multimedia/libbluray \
multimedia/libdv \
devel/fribidi \
@@ -153,17 +150,15 @@ CONFIGURE_ARGS += --disable-smb \
--disable-faad \
--disable-theora \
--disable-pulse \
- --disable-relocatable
+ --disable-relocatable \
+ --disable-speex \
+ --disable-libopus \
+ --disable-libvorbis
-# internal tremor, external tremor, external libvorbis all conflict
-# we choose libvorbis to enable encoding to vorbis
-CONFIGURE_ARGS += --disable-tremor
.if ${MACHINE_ARCH:Marm}
-# ... except on arm, which has no floating point hardware
-CONFIGURE_ARGS += --disable-libvorbis
+WANTLIB += ogg vorbisidec
.else
-LIB_DEPENDS += audio/libvorbis
-WANTLIB += vorbisenc vorbis
+CONFIGURE_ARGS += --disable-tremor
.endif
CONFIGURE_ENV += LOCALBASE=${LOCALBASE} TMPDIR=${WRKBUILD}
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: MPlayer 20140106
On 08/01/14 6:48 AM, Edd Barrett wrote:
Hi Brad,
I have installed your update and will be testing it over the next few
days. In the meantime some comments.
On Mon, Jan 06, 2014 at 07:52:23PM -0500, Brad Smith wrote:
Here is an update to MPlayer 20140106.
Any and all testing welcome.
@@ -76,14 +75,17 @@ CONFDIR = ${SYSCONFDIR}/mplayer
.if ${MACHINE_ARCH:Marm}
# uses ARM EABI
-MPLAYER_ARCH= generic
+MPLAYER_ARCH = generic
.else
-MPLAYER_ARCH= ${MACHINE_ARCH}
+MPLAYER_ARCH = ${MACHINE_ARCH}
.endif
This is a small nit, but it helps if formatting changes come as separate
diffs. This allows me to see easier what is a functional change and what
is a formatting tweak.
If there were more formatting changes I would separate the changes
but its two lines and you can quite clearly see what has changed which
is nothing.
@@ -96,7 +98,7 @@ CONFIGURE_ARGS += --target=${MPLAYER_AR
--confdir=${CONFDIR} \
--mandir=${LOCALBASE}/man \
--extra-cflags=-I${LOCALBASE}/include \
- --extra-ldflags=-L${LOCALBASE}/lib \
+ --extra-ldflags=-L${LOCALBASE}/lib -ffast-math \
--extra-libs-mplayer=-lrtunes -lcrypto
That seems fishy. -ffast-math is not a linker flag. It just defines
__FAST_MATH__. Perhaps it is not needed?
None of what you said is true.
# CONFIGURE_ARGS that disable internal stuff
@@ -146,7 +148,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-faac-lavc \
--disable-faad \
--disable-theora \
- --disable-pulse
+ --disable-pulse \
+ --disable-relocatable
Do we do this because PIE is default on OpenBSD?
Yes. It only does anything on x86 and OpenBSD already builds
PIE binaries by default.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: MPlayer 20140106
Hi Brad,
I have installed your update and will be testing it over the next few
days. In the meantime some comments.
On Mon, Jan 06, 2014 at 07:52:23PM -0500, Brad Smith wrote:
Here is an update to MPlayer 20140106.
Any and all testing welcome.
@@ -76,14 +75,17 @@ CONFDIR = ${SYSCONFDIR}/mplayer
.if ${MACHINE_ARCH:Marm}
# uses ARM EABI
-MPLAYER_ARCH=generic
+MPLAYER_ARCH = generic
.else
-MPLAYER_ARCH=${MACHINE_ARCH}
+MPLAYER_ARCH = ${MACHINE_ARCH}
.endif
This is a small nit, but it helps if formatting changes come as separate
diffs. This allows me to see easier what is a functional change and what
is a formatting tweak.
@@ -96,7 +98,7 @@ CONFIGURE_ARGS += --target=${MPLAYER_AR
--confdir=${CONFDIR} \
--mandir=${LOCALBASE}/man \
--extra-cflags=-I${LOCALBASE}/include \
- --extra-ldflags=-L${LOCALBASE}/lib \
+ --extra-ldflags=-L${LOCALBASE}/lib -ffast-math \
--extra-libs-mplayer=-lrtunes -lcrypto
That seems fishy. -ffast-math is not a linker flag. It just defines
__FAST_MATH__. Perhaps it is not needed?
# CONFIGURE_ARGS that disable internal stuff
@@ -146,7 +148,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-faac-lavc \
--disable-faad \
--disable-theora \
- --disable-pulse
+ --disable-pulse \
+ --disable-relocatable
Do we do this because PIE is default on OpenBSD?
-@@ -523,6 +523,7 @@ Audio output:
- --disable-nas disable NAS audio output [autodetect]
- --disable-sgiaudio disable SGI audio output [autodetect]
- --disable-sunaudio disable Sun audio output [autodetect]
-+ --disable-sndiodisable OpenBSD sndio audio output [autodetect]
- --disable-kai disable KAI audio output [autodetect]
- --disable-dart disable DART audio output [autodetect]
- --disable-win32waveout disable Windows waveout audio output [autodetect]
Nice that the sndio backend is finally upstream.
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
Re: UPDATE: MPlayer 20140106
On Jan 07 17:53:40, b...@comstyle.com wrote: On 07/01/14 9:14 AM, Jan Stary wrote: On Jan 06 19:52:23, b...@comstyle.com wrote: Here is an update to MPlayer 20140106. This is current/i386: Configuring for mplayer-20140106 Checking for cc version ... 4.2.1 Checking for working compiler ... yes Detected operating system: OpenBSD Detected host architecture: i386 Checking for cross compilation ... no Checking for host cc ... cc Checking for GCC CPU optimization abilities ... i386 Checking for byte order ... little-endian Checking for extern symbol prefix ... Checking for assembler support of -pipe option ... yes Checking for relocatable binary ... no Checking for assembler (as 2.15) ... ok Checking for PIC ... yes Checking for .align is a power of two ... no Checking for ebx availability ... no Checking for yasm ... Error: yasm not found, use --yasm='' if you really want to compile without Check config.log if you do not understand why it failed. *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2648 '/usr/ports/pobj/mplayer-20140106/.configure_done') *** Error 1 in /usr/ports/x11/mplayer (/usr/ports/infrastructure/mk/bsd.port.mk:2404 'all') I do have yasm-1.2.0 installed, which provides /usr/local/bin/yasm It is a build dependency so it has to be there. You left out the most important part which the error message points you towards. Sorry; here goes: Checking for yasm pextrd [eax], xmm0, 1 yasm -f elf -DPIC -o /usr/ports/pobj/mplayer-20140106/mplayer-20140106/mplayer-configure-9837-31972/tmp /usr/ports/pobj/mplayer-20140106/mplayer-20140106/mplayer-configure-9837-31972/tmp.S Bad system call (core dumped) pextrd [eax], xmm0, 1 yasm -f elf -DPIC -o /usr/ports/pobj/mplayer-20140106/mplayer-20140106/mplayer-configure-9837-31972/tmp /usr/ports/pobj/mplayer-20140106/mplayer-20140106/mplayer-configure-9837-31972/tmp.S Bad system call (core dumped) After a pkg_add -ui yasm, it builds fine. Sorry for the noise. Jan
Re: UPDATE: MPlayer 20140106
On Jan 06 19:52:23, b...@comstyle.com wrote: Here is an update to MPlayer 20140106. This is current/i386: Configuring for mplayer-20140106 Checking for cc version ... 4.2.1 Checking for working compiler ... yes Detected operating system: OpenBSD Detected host architecture: i386 Checking for cross compilation ... no Checking for host cc ... cc Checking for GCC CPU optimization abilities ... i386 Checking for byte order ... little-endian Checking for extern symbol prefix ... Checking for assembler support of -pipe option ... yes Checking for relocatable binary ... no Checking for assembler (as 2.15) ... ok Checking for PIC ... yes Checking for .align is a power of two ... no Checking for ebx availability ... no Checking for yasm ... Error: yasm not found, use --yasm='' if you really want to compile without Check config.log if you do not understand why it failed. *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2648 '/usr/ports/pobj/mplayer-20140106/.configure_done') *** Error 1 in /usr/ports/x11/mplayer (/usr/ports/infrastructure/mk/bsd.port.mk:2404 'all') I do have yasm-1.2.0 installed, which provides /usr/local/bin/yasm Jan
Re: UPDATE: MPlayer 20140106
On 07/01/14 9:14 AM, Jan Stary wrote: On Jan 06 19:52:23, b...@comstyle.com wrote: Here is an update to MPlayer 20140106. This is current/i386: Configuring for mplayer-20140106 Checking for cc version ... 4.2.1 Checking for working compiler ... yes Detected operating system: OpenBSD Detected host architecture: i386 Checking for cross compilation ... no Checking for host cc ... cc Checking for GCC CPU optimization abilities ... i386 Checking for byte order ... little-endian Checking for extern symbol prefix ... Checking for assembler support of -pipe option ... yes Checking for relocatable binary ... no Checking for assembler (as 2.15) ... ok Checking for PIC ... yes Checking for .align is a power of two ... no Checking for ebx availability ... no Checking for yasm ... Error: yasm not found, use --yasm='' if you really want to compile without Check config.log if you do not understand why it failed. *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2648 '/usr/ports/pobj/mplayer-20140106/.configure_done') *** Error 1 in /usr/ports/x11/mplayer (/usr/ports/infrastructure/mk/bsd.port.mk:2404 'all') I do have yasm-1.2.0 installed, which provides /usr/local/bin/yasm It is a build dependency so it has to be there. You left out the most important part which the error message points you towards. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
UPDATE: MPlayer 20140106
Here is an update to MPlayer 20140106.
Any and all testing welcome.
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.230
diff -u -p -u -p -r1.230 Makefile
--- Makefile2 Jan 2014 12:21:49 - 1.230
+++ Makefile7 Jan 2014 00:49:11 -
@@ -7,9 +7,8 @@ ONLY_FOR_ARCHS =${GCC4_ARCHS}
COMMENT = movie player supporting many formats
-V =20130819
+V =20140106
FFMPEG_V = 20131216
-REVISION = 2
SUBST_VARS += PREFIX CONFDIR
@@ -26,7 +25,7 @@ HOMEPAGE =http://www.mplayerhq.hu/
PERMIT_PACKAGE_CDROM = patents
PERMIT_PACKAGE_FTP = Yes
-WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
+WANTLIB = EGL GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
crypto dv dvdnavmini dvdread enca fontconfig freetype \
fribidi jpeg m mng mp3lame ncurses ogg=5 opus png postproc \
@@ -76,14 +75,17 @@ CONFDIR = ${SYSCONFDIR}/mplayer
.if ${MACHINE_ARCH:Marm}
# uses ARM EABI
-MPLAYER_ARCH= generic
+MPLAYER_ARCH = generic
.else
-MPLAYER_ARCH= ${MACHINE_ARCH}
+MPLAYER_ARCH = ${MACHINE_ARCH}
.endif
+# Add back fast math flag since we override CFLAGS
+CFLAGS += -ffast-math
+
# PIE doesn't leave sufficient registers
.if ${MACHINE_ARCH:Mi386}
-CFLAGS += -fomit-frame-pointer
+CFLAGS += -fomit-frame-pointer
.endif
USE_GMAKE =Yes
@@ -96,7 +98,7 @@ CONFIGURE_ARGS += --target=${MPLAYER_AR
--confdir=${CONFDIR} \
--mandir=${LOCALBASE}/man \
--extra-cflags=-I${LOCALBASE}/include \
- --extra-ldflags=-L${LOCALBASE}/lib \
+ --extra-ldflags=-L${LOCALBASE}/lib -ffast-math \
--extra-libs-mplayer=-lrtunes -lcrypto
# CONFIGURE_ARGS that disable internal stuff
@@ -146,7 +148,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-faac-lavc \
--disable-faad \
--disable-theora \
- --disable-pulse
+ --disable-pulse \
+ --disable-relocatable
# internal tremor, external tremor, external libvorbis all conflict
# we choose libvorbis to enable encoding to vorbis
@@ -212,7 +215,7 @@ EXAMPLEDIR =${PREFIX}/share/examples/mp
# copy in rtunes and sndio backends
post-extract:
- @cp ${FILESDIR}/ao_rtunes.c ${FILESDIR}/ao_sndio.c ${WRKSRC}/libao2
+ @cp ${FILESDIR}/ao_rtunes.c ${WRKSRC}/libao2
@cp ${FILESDIR}/ai_sndio.c ${WRKSRC}/stream
# link FFmpeg sources to where build expects
Index: distinfo
===
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 distinfo
--- distinfo6 Sep 2013 23:14:40 - 1.38
+++ distinfo6 Jan 2014 22:20:53 -
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20130819.tar.xz) = +sUhhiXfXp+jUAILtZqMlcHuUaQ5u7ARJd8CXwNLfCc=
-SIZE (mplayer-20130819.tar.xz) = 5270956
+SHA256 (mplayer-20140106.tar.xz) = cll7+pWtmcggOIGbFRhDZ46j4lyOt6cVpXFE7KNHGys=
+SIZE (mplayer-20140106.tar.xz) = 5277680
Index: files/ao_sndio.c
===
RCS file: files/ao_sndio.c
diff -N files/ao_sndio.c
--- files/ao_sndio.c17 Apr 2013 23:03:23 - 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,293 +0,0 @@
-/*
- * Copyright (c) 2008 Alexandre Ratchov a...@caoua.org
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include sys/types.h
-#include poll.h
-#include errno.h
-#include sndio.h
-
-#include config.h
-#include mp_msg.h
-#include mixer.h
-#include help_mp.h
-
-#include libaf/af_format.h
-
-#include audio_out.h
-#include audio_out_internal.h
-
-static ao_info_t info = {
- sndio audio output,
- sndio,
- Alexandre Ratchov a...@caoua.org,
-
-};
-
-LIBAO_EXTERN(sndio)
-
-static struct sio_hdl *hdl = NULL;
-struct pollfd *pfds;
-static struct sio_par par;
-static int delay, vol, havevol;
-#define SILENCE_NMAX 0x1000
-static char silence[SILENCE_NMAX];
-
UPDATE: MPlayer-20130819
Here is an update to MPlayer snapshot from 20130819.
Tested a bit on amd64. Looking for any additional testing or feedback.
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.223
diff -u -p -r1.223 Makefile
--- Makefile19 Aug 2013 14:40:21 - 1.223
+++ Makefile20 Aug 2013 07:50:46 -
@@ -7,9 +7,8 @@ ONLY_FOR_ARCHS =${GCC4_ARCHS}
COMMENT = movie player supporting many formats
-V =20130214
+V =20130819
FFMPEG_V = 20130718
-REVISION = 5
SUBST_VARS += PREFIX CONFDIR
Index: README
===
RCS file: /cvs/ports/x11/mplayer/README,v
retrieving revision 1.5
diff -u -p -r1.5 README
--- README 21 Jan 2013 16:23:05 - 1.5
+++ README 20 Aug 2013 07:50:46 -
@@ -27,7 +27,7 @@ codec libraries for the same codec.
There is an exception to this rule, which is where an external library
provides an encoder and decoder, and there is a decoder for the given
codec in FFmpeg, but no encoder; in such a case, go ahead and link the
-external library so that users can encode with mencoder.
+external library so that users can encode with Mencoder.
Be aware that some hardware lacks a floating point unit (ARM for
example). On these architectures, you should select integer decoders
@@ -35,7 +35,7 @@ where possible. Eg. Tremor instead of Vo
External FAAC linkage (and graphics/ffmpeg's external FAAC linkage)
was disabled due to conflicting licenses. Only the FFmpeg's
-internal ffaac encoder remains for use with encoding AAC in mencoder.
+internal ffaac encoder remains for use with encoding AAC in Mencoder.
https://bugs.launchpad.net/ubuntu/+source/faac/+bug/374900
Rolling a Distfile
@@ -54,5 +54,5 @@ Testing Mencoder
See here to know what you can contain it what:
http://en.wikipedia.org/wiki/Comparison_of_container_formats
-Make a h264/mp4 (although lavc containers are somewhat broken in mencoder):
+Make a H.264 / MP4 (although lavc containers are somewhat broken in Mencoder):
mencoder -ovc x264 -of lavf -lavfopts format=mp4 -nosound -o out.mp4 infile
Index: distinfo
===
RCS file: /cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.37
diff -u -p -r1.37 distinfo
--- distinfo13 Mar 2013 02:28:11 - 1.37
+++ distinfo20 Aug 2013 07:50:46 -
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20130214.tar.xz) = 1qcsmDzu9waXkTYh4KnvelDrsxQwbst99xUoZvXZz14=
-SIZE (mplayer-20130214.tar.xz) = 5262364
+SHA256 (mplayer-20130819.tar.xz) = +sUhhiXfXp+jUAILtZqMlcHuUaQ5u7ARJd8CXwNLfCc=
+SIZE (mplayer-20130819.tar.xz) = 5270956
Index: patches/patch-DOCS_man_en_mplayer_1
===
RCS file: /cvs/ports/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1,v
retrieving revision 1.7
diff -u -p -r1.7 patch-DOCS_man_en_mplayer_1
--- patches/patch-DOCS_man_en_mplayer_1 13 Mar 2013 02:28:11 - 1.7
+++ patches/patch-DOCS_man_en_mplayer_1 20 Aug 2013 07:50:46 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.7 2013/03/13 02:28:11 brad Exp $
DOCS/man/en/mplayer.1.orig Sun Jan 13 23:54:05 2013
-+++ DOCS/man/en/mplayer.1 Mon Jan 21 11:45:15 2013
-@@ -1505,7 +1505,7 @@ May be negative.
+--- DOCS/man/en/mplayer.1.orig Mon Aug 19 10:49:18 2013
DOCS/man/en/mplayer.1 Tue Aug 20 02:39:05 2013
+@@ -1541,7 +1541,7 @@ May be negative.
.
.TP
.B \-cdrom\-device path to device
@@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v
.
.TP
.B \-channels number (also see \-af channels)
-@@ -12240,11 +12240,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
+@@ -12298,11 +12298,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
.PP
.B Play DTS-CD with passthrough:
.nf
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/mplayer/patches/patch-Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 patch-Makefile
--- patches/patch-Makefile 19 Aug 2013 14:40:21 - 1.26
+++ patches/patch-Makefile 20 Aug 2013 07:50:46 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.26 2013/08/19 14:40:21 brad Exp $
Makefile.orig Thu Feb 14 14:46:11 2013
-+++ Makefile Tue Jun 4 22:13:48 2013
+--- Makefile.orig Mon Aug 19 10:49:12 2013
Makefile Tue Aug 20 02:49:57 2013
@@ -35,6 +35,7 @@ OS_FEATURE-$(VSSCANF)+= osdep/vsscanf.
# conditional source declarations
SRCS_AUDIO_INPUT-$(ALSA) += stream/ai_alsa.c
@@ -8,22 +8,22 @@ $OpenBSD: patch-Makefile,v 1.26 2013/08/
+SRCS_AUDIO_INPUT-$(SNDIO)+= stream/ai_sndio.c
SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes)
SRCS_COMMON-$(BITMAP_FONT) += sub/font_load.c
-
Re: UPDATE: MPlayer
On 01/15/13 10:32, Brad Smith wrote: On Mon, Jan 14, 2013 at 01:04:25AM -0500, Brad Smith wrote: Here is an update to a newer MPlayer snapshot. Lightly tested on amd64. An updated diff after the last commit to the Makefile.. Index: Makefile === RCS file: /cvs/ports/x11/mplayer/Makefile,v retrieving revision 1.212 diff -u -p -r1.212 Makefile --- Makefile 14 Jan 2013 17:02:15 - 1.212 +++ Makefile 14 Jan 2013 23:31:36 - Hi Brad, With the command line options -fs -vo sdl this updated version exits before playing anything with: MPlayer interrupted by signal 11 in module: decode video - MPlayer crashed by bad usage of CPU/FPU/RAM. Recompile MPlayer with --enable-debug and make a 'gdb' backtrace and disassembly. Details in DOCS/HTML/en/bugreports_what.html#bugreports_crash. - MPlayer crashed. This shouldn't happen. It can be a bug in the MPlayer code _or_ in your drivers _or_ in your gcc version. If you think it's MPlayer's fault, please read DOCS/HTML/en/bugreports.html and follow the instructions there. We can't and won't help unless you provide this information when reporting a possible bug. $ Parent process disappeared, exiting cache process. Maybe -fs is a depricated option (even though its still in the man page), cause it goes into fullscreen mode now, without specifying that option (from memory it didn't do that before). Apart from that, everything is working well with this update on amd64-current built yesterday. I tested it with avi, mp4, mkv and flv video files, and flac and mp3 audio files. Brett.
Re: UPDATE: MPlayer
On Wed, Jan 16, 2013 at 07:20:42PM +1100, Brett Mahar wrote: Maybe -fs is a depricated option (even though its still in the man page), cause it goes into fullscreen mode now, without specifying that option (from memory it didn't do that before). Apart from that, everything is working well with this update on amd64-current built yesterday. I tested it with avi, mp4, mkv and flv video files, and flac and mp3 audio files. Brett. For me MPlayer prints.. [VO_SDL] Info - please use -vm or -zoom to switch to the best resolution. The man page says that not all video output drivers support -fs. If I use the SDL output or the XVid output I don't get full screen by default. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: MPlayer
On 01/16/13 19:36, Brad Smith wrote: On Wed, Jan 16, 2013 at 07:20:42PM +1100, Brett Mahar wrote: Maybe -fs is a depricated option (even though its still in the man page), cause it goes into fullscreen mode now, without specifying that option (from memory it didn't do that before). Apart from that, everything is working well with this update on amd64-current built yesterday. I tested it with avi, mp4, mkv and flv video files, and flac and mp3 audio files. Brett. For me MPlayer prints.. [VO_SDL] Info - please use -vm or -zoom to switch to the best resolution. The man page says that not all video output drivers support -fs. If I use the SDL output or the XVid output I don't get full screen by default. Not that its a big deal, but I was just reporting that it used to take this argument before no problem, now it won't run with this argument supplied. Maybe it depends on the video card used or something, but it does go to fullscreen automatically for me now (with a Radeon HD5450), whereas my (slightly unreliable) memory tells me it didn't before. Anyway that is the only difference I noticed from the old ports version. It has always said [VO_SDL] Info - please use -vm or -zoom to switch to the best resolution but when tried in the past neither vm or zoom did anything noticable to the picture or changed the output resolution for me.
Re: UPDATE: MPlayer
On Wed, Jan 16, 2013 at 11:10:06PM +1100, Brett Mahar wrote: On 01/16/13 19:36, Brad Smith wrote: On Wed, Jan 16, 2013 at 07:20:42PM +1100, Brett Mahar wrote: Maybe -fs is a depricated option (even though its still in the man page), cause it goes into fullscreen mode now, without specifying that option (from memory it didn't do that before). Apart from that, everything is working well with this update on amd64-current built yesterday. I tested it with avi, mp4, mkv and flv video files, and flac and mp3 audio files. Brett. For me MPlayer prints.. [VO_SDL] Info - please use -vm or -zoom to switch to the best resolution. The man page says that not all video output drivers support -fs. If I use the SDL output or the XVid output I don't get full screen by default. Not that its a big deal, but I was just reporting that it used to take this argument before no problem, now it won't run with this argument supplied. OK, looking at the output it looks like this is a bug. I personally don't use MPlayer as it is notoriously buggy. Maybe it depends on the video card used or something, but it does go to fullscreen automatically for me now (with a Radeon HD5450), whereas my (slightly unreliable) memory tells me it didn't before. Strange. I have never seen that before with MPlayer. Anyway that is the only difference I noticed from the old ports version. It has always said [VO_SDL] Info - please use -vm or -zoom to switch to the best resolution but when tried in the past neither vm or zoom did anything noticable to the picture or changed the output resolution for me. Oh, ok. I usually don't use the SDL output as I have no requirement for it. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: MPlayer
On Wed, Jan 16, 2013 at 11:10:06PM +1100, Brett Mahar wrote: On 01/16/13 19:36, Brad Smith wrote: On Wed, Jan 16, 2013 at 07:20:42PM +1100, Brett Mahar wrote: Maybe -fs is a depricated option (even though its still in the man page), cause it goes into fullscreen mode now, without specifying that option (from memory it didn't do that before). Apart from that, everything is working well with this update on amd64-current built yesterday. I tested it with avi, mp4, mkv and flv video files, and flac and mp3 audio files. Brett. For me MPlayer prints.. [VO_SDL] Info - please use -vm or -zoom to switch to the best resolution. The man page says that not all video output drivers support -fs. If I use the SDL output or the XVid output I don't get full screen by default. Not that its a big deal, but I was just reporting that it used to take this argument before no problem, now it won't run with this argument supplied. Looking at their SVN repo this has been fixed since the snapshot I have when I started with this update. Anyway, I have decided to focus on trying to get a bug that has affected building FFmpeg/Libav/MPlayer on amd64 fixed in base first and then I'm going to come back to MPlayer and probably roll it to a much newer snapshot. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: MPlayer
OK, looking at the output it looks like this is a bug. I personally don't use MPlayer as it is notoriously buggy. What do you use/suggest instead - vlc? Oh, ok. I usually don't use the SDL output as I have no requirement for it. For me, -vo sdl is the only output that gives decent performance. The Radeon HD5450 doesn't support xv on openbsd, and x11 plays at about 5 frames per second. sdl is smooth but suffers from some screen tearing when there is lots of movement on the screen.
Re: UPDATE: MPlayer
On Mon, Jan 14, 2013 at 01:04:25AM -0500, Brad Smith wrote:
Here is an update to a newer MPlayer snapshot.
Lightly tested on amd64.
An updated diff after the last commit to the Makefile..
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.212
diff -u -p -r1.212 Makefile
--- Makefile14 Jan 2013 17:02:15 - 1.212
+++ Makefile14 Jan 2013 23:31:36 -
@@ -7,7 +7,7 @@ ONLY_FOR_ARCHS =${GCC4_ARCHS}
COMMENT = movie player supporting many formats
-V =20110309
+V =20120505
FFMPEG_V = 20121026
SUBST_VARS += PREFIX CONFDIR
@@ -15,7 +15,7 @@ SUBST_VARS += PREFIX CONFDIR
# Distfiles must be hand-rolled, see README
N =mplayer
DISTNAME = mplayer-${V}
-REVISION = 22
+EXTRACT_SUFX = .tar.xz
CATEGORIES = x11 multimedia
@@ -30,13 +30,12 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
crypto dv dvdnavmini dvdread enca fontconfig freetype \
- fribidi gsm jpeg lcms m mng mp3lame ncurses ogg=5 orc-0.4 \
- png postproc pthread SDL schroedinger-1.0=2.0 sndio speex \
- stdc++ swscale theoradec theoraenc ungif util vpx x264=5 \
+ fribidi jpeg m mng mp3lame ncurses ogg=5 png postproc \
+ pthread SDL sndio speex stdc++ swscale ungif util x264=5 \
xvidcore z
# we use a snapshot
-MASTER_SITES = http://theunixzoo.co.uk/distfiles/
+MASTER_SITES = http://comstyle.com/source/
MAINTAINER = Edd Barrett e...@openbsd.org
@@ -55,7 +54,6 @@ LIB_DEPENDS = graphics/png \
devel/fribidi \
graphics/libmng \
archivers/bzip2 \
- multimedia/schroedinger=1.0.10 \
multimedia/x264=20101023 \
devel/sdl=1.2.5 \
multimedia/libass \
@@ -148,7 +146,7 @@ WANTLIB += vorbisenc vorbis
CONFIGURE_ARGS += --disable-tremor-internal
.endif
-CONFIGURE_ENV += TMPDIR=${WRKBUILD}
+CONFIGURE_ENV += LOCALBASE=${LOCALBASE} TMPDIR=${WRKBUILD}
# binutils 2.15 does not do sse3 for i386/amd64
.if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
@@ -198,24 +196,20 @@ CONFIGURE_ARGS += --disable-jack
NO_REGRESS = Yes
+DOCDIR = ${PREFIX}/share/doc/mplayer
+EXAMPLEDIR = ${PREFIX}/share/examples/mplayer
+
# copy in rtunes and sndio backends
post-extract:
@cp ${FILESDIR}/ao_rtunes.c ${FILESDIR}/ao_sndio.c ${WRKSRC}/libao2
@cp ${FILESDIR}/ai_sndio.c ${WRKSRC}/stream
-# subst PREFIX in a patch, careful with update-patches!
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/DOCS/xml/configure
-
-post-build:
- @cd ${WRKSRC}/DOCS/xml ${MAKE_PROGRAM}
-
-DOCDIR = ${PREFIX}/share/doc/mplayer
-EXAMPLEDIR = ${PREFIX}/share/examples/mplayer
-
# link FFmpeg sources to where build expects
pre-patch:
ln -s ${WRKDIR}/graphics/ffmpeg/ffmpeg-git-${FFMPEG_V} ${WRKSRC}/ffmpeg
+
+post-build:
+ @cd ${WRKSRC} ${MAKE_PROGRAM} doc
# install docs
post-install:
Index: README
===
RCS file: /cvs/ports/x11/mplayer/README,v
retrieving revision 1.4
diff -u -p -r1.4 README
--- README 17 Aug 2011 15:12:15 - 1.4
+++ README 14 Jan 2013 23:31:36 -
@@ -46,7 +46,7 @@ cd mplayer-MMDD
./version.sh (this should create a version.h)
find . -name '.svn' | xargs rm -Rf
cd ..
-tar zcvf mplayer-MMDD.tar.gz mplayer-MMDD
+tar cvf - mplayer-MMDD | xz -c -8e mplayer-MMDD.tar.xz
Testing Mencoder
Index: distinfo
===
RCS file: /cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo29 Mar 2011 20:04:41 - 1.35
+++ distinfo14 Jan 2013 23:31:36 -
@@ -1,5 +1,2 @@
-MD5 (mplayer-20110309.tar.gz) = EU2sXltwhr4VhUplf8qsXw==
-RMD160 (mplayer-20110309.tar.gz) = QlDlgZxUyawqSdBWC871ys/QoRA=
-SHA1 (mplayer-20110309.tar.gz) = AMaoe0ip6hI2EyYdtOf6uHgcgio=
-SHA256 (mplayer-20110309.tar.gz) = yeswxU3WOlLg5FnCJQJL5hLLopvSp543ovqjPN4FGSI=
-SIZE (mplayer-20110309.tar.gz) = 6874760
+SHA256 (mplayer-20120505.tar.xz) = yxNsTDn75qrw17yRjqYCOAspZnxYFgowzZ5bbAGczb4=
+SIZE (mplayer-20120505.tar.xz) = 5362624
Index: patches/patch-DOCS_man_en_mplayer_1
===
RCS file: /cvs/ports/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1,v
retrieving revision 1.5
diff -u -p -r1.5 patch-DOCS_man_en_mplayer_1
--- patches/patch-DOCS_man_en_mplayer_1 29 Mar 2011 20:04:41 - 1.5
+++ patches/patch-DOCS_man_en_mplayer_1 14 Jan 2013
UPDATE: MPlayer
Here is an update to a newer MPlayer snapshot.
Lightly tested on amd64.
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.211
diff -u -p -r1.211 Makefile
--- Makefile14 Jan 2013 02:17:15 - 1.211
+++ Makefile14 Jan 2013 05:53:34 -
@@ -7,7 +7,7 @@ ONLY_FOR_ARCHS =${GCC4_ARCHS}
COMMENT = movie player supporting many formats
-V =20110309
+V =20120505
FFMPEG_V = 20121026
SUBST_VARS += PREFIX CONFDIR
@@ -15,7 +15,7 @@ SUBST_VARS += PREFIX CONFDIR
# Distfiles must be hand-rolled, see README
N =mplayer
DISTNAME = mplayer-${V}
-REVISION = 22
+EXTRACT_SUFX = .tar.xz
CATEGORIES = x11 multimedia
@@ -30,13 +30,12 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
crypto dv dvdnavmini dvdread enca fontconfig freetype \
- fribidi gsm jpeg lcms m mng mp3lame ncurses ogg=5 orc-0.4 \
- png postproc pthread SDL schroedinger-1.0=2.0 sndio speex \
- stdc++ swscale theoradec theoraenc ungif util vpx x264=5 \
+ fribidi jpeg m mng mp3lame ncurses ogg=5 png postproc \
+ pthread SDL sndio speex stdc++ swscale ungif util x264=5 \
xvidcore z
# we use a snapshot
-MASTER_SITES = http://theunixzoo.co.uk/distfiles/
+MASTER_SITES = http://comstyle.com/source/
MAINTAINER = Edd Barrett e...@openbsd.org
@@ -55,7 +54,6 @@ LIB_DEPENDS = graphics/png \
devel/fribidi \
graphics/libmng \
archivers/bzip2 \
- multimedia/schroedinger=1.0.10 \
multimedia/x264=20101023 \
devel/sdl=1.2.5 \
multimedia/libass \
@@ -66,8 +64,8 @@ BUILD_DEPENDS = net/livemedia \
audio/rtunes=0.8 \
textproc/docbook-xsl \
audio/ladspa
-# mplayer uses non-public interfaces to ffmpeg, so we still need
-# the ffmpeg source in the mplayer tree at build time.
+# MPlayer uses non-public interfaces to FFmpeg, so we still need
+# the FFmpeg source in the MPlayer tree at build time.
BUILD_DEPENDS +=graphics/ffmpeg:patch
.if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
@@ -78,7 +76,7 @@ CONFDIR = ${SYSCONFDIR}/mplayer
USE_GMAKE =Yes
USE_GROFF =Yes
-MAKE_ENV = V=1 # turn on verbose ffmpeg build
+MAKE_ENV = V=1 # turn on verbose FFmpeg build
CONFIGURE_STYLE = simple
# CONFIGURE_ARGS for misc stuff
@@ -102,7 +100,7 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-dvdread-internal \
--disable-libdvdcss-internal \
--disable-gui \
- --disable-ffmpeg_a # link ffmpeg .so (graphics/ffmpeg)
+ --disable-ffmpeg_a # link FFmpeg .so (graphics/ffmpeg)
# CONFIGURE_ARGS that enable internal stuff
CONFIGURE_ARGS += --enable-menu
@@ -148,7 +146,7 @@ WANTLIB += vorbisenc vorbis
CONFIGURE_ARGS += --disable-tremor-internal
.endif
-CONFIGURE_ENV += TMPDIR=${WRKBUILD}
+CONFIGURE_ENV += LOCALBASE=${LOCALBASE} TMPDIR=${WRKBUILD}
# binutils 2.15 does not do sse3 for i386/amd64
.if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
@@ -198,24 +196,20 @@ CONFIGURE_ARGS += --disable-jack
NO_REGRESS = Yes
+DOCDIR = ${PREFIX}/share/doc/mplayer
+EXAMPLEDIR = ${PREFIX}/share/examples/mplayer
+
# copy in rtunes and sndio backends
post-extract:
@cp ${FILESDIR}/ao_rtunes.c ${FILESDIR}/ao_sndio.c ${WRKSRC}/libao2
@cp ${FILESDIR}/ai_sndio.c ${WRKSRC}/stream
-# subst PREFIX in a patch, careful with update-patches!
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/DOCS/xml/configure
-
-post-build:
- @cd ${WRKSRC}/DOCS/xml ${MAKE_PROGRAM}
-
-DOCDIR = ${PREFIX}/share/doc/mplayer
-EXAMPLEDIR = ${PREFIX}/share/examples/mplayer
-
-# link ffmpeg sources to where build expects
+# link FFmpeg sources to where build expects
pre-patch:
ln -s ${WRKDIR}/graphics/ffmpeg/ffmpeg-git-${FFMPEG_V} ${WRKSRC}/ffmpeg
+
+post-build:
+ @cd ${WRKSRC} ${MAKE_PROGRAM} doc
# install docs
post-install:
Index: README
===
RCS file: /home/cvs/ports/x11/mplayer/README,v
retrieving revision 1.4
diff -u -p -r1.4 README
--- README 17 Aug 2011 15:12:15 - 1.4
+++ README 14 Jan 2013 05:03:33 -
@@ -46,7 +46,7 @@ cd mplayer-MMDD
./version.sh (this should create a version.h)
find . -name '.svn' | xargs rm -Rf
cd ..
-tar zcvf mplayer-MMDD.tar.gz mplayer-MMDD
+tar cvf - mplayer-MMDD | xz -c -8e mplayer-MMDD.tar.xz
Testing Mencoder
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On Wed, 23 Mar 2011, Edd Barrett wrote:
On Wed, Mar 23, 2011 at 09:47:18AM +, Edd Barrett wrote:
Ack aja, @pkgpath markers needed for both sdl and no_x11 flavours.
* Remove no_x11 (community decision)
* Add @pkgpath for sdl and no_x11 and tested update path
Again, lets put this in. OKs?
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.181
diff -u -p -u -r1.181 Makefile
--- Makefile 12 Feb 2011 10:49:36 - 1.181
+++ Makefile 23 Mar 2011 21:43:47 -
@@ -5,19 +5,18 @@ ONLY_FOR_ARCHS =alpha amd64 arm i386 mi
COMMENT =movie player supporting many formats
-V = 20101024
-V_DASHED = 2010-10-24
+V = 20110309
+FFMPEG_V = 20110306
SUBST_VARS +=PREFIX CONFDIR
+# Distfiles must be hand-rolled, see README
N = mplayer
-DISTNAME = mplayer-export-snapshot-${V}
+DISTNAME = mplayer-${V}
+
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
PKGNAME =${N}-${V}
-REVISION = 2
CATEGORIES = x11 multimedia
-EXTRACT_SUFX = .tar.bz2
-
-WRKDIST =${WRKDIR}/mplayer-export-${V_DASHED}
HOMEPAGE = http://www.mplayerhq.hu/
@@ -27,11 +26,12 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB =bz2 c cdda_interface cdda_paranoia crypto \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg=5 orc-0.4 png \
- pthread schroedinger-1.0=2.0 sndio speex stdc++ \
- theora ungif util vpx x264=5 xvidcore z
+WANTLIB =GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm avcodec avformat \
+ avutil bz2 c cdda_interface cdda_paranoia \
+ crypto dv faac fontconfig freetype fribidi gsm jpeg lcms \
+ m mng mp3lame ncurses ogg=5 orc-0.4 png postproc \
+ pthread SDL schroedinger-1.0=2.0 sndio speex stdc++ \
+ swscale theora ungif util x264=5 xvidcore z
# we use a snapshot
MASTER_SITES = http://theunixzoo.co.uk/distfiles/
@@ -40,9 +40,12 @@ MAINTAINER = Edd Barrett e...@openbsd.or
MODULES += converters/libiconv
+RUN_DEPENDS += devel/desktop-file-utils
+
Why is this needed?
LIB_DEPENDS =graphics/png \
graphics/jpeg \
graphics/libungif \
+ graphics/ffmpeg=20110306 \
audio/cdparanoia=3.a9.8 \
multimedia/libtheora \
audio/speex \
@@ -58,10 +61,9 @@ LIB_DEPENDS = graphics/png \
graphics/libmng \
archivers/bzip2 \
multimedia/schroedinger=1.0.10 \
- audio/faad \
audio/faac \
multimedia/x264=20101023 \
- multimedia/libvpx
+ devel/sdl=1.2.5
BUILD_DEPENDS = net/livemedia \
audio/rtunes=0.8 \
@@ -70,6 +72,10 @@ BUILD_DEPENDS =net/livemedia \
textproc/docbook \
textproc/docbook-xsl \
audio/ladspa
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
+BUILD_DEPENDS +=graphics/ffmpeg:patch
.if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
BUILD_DEPENDS += devel/yasm
@@ -98,15 +104,21 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-vidix \
--disable-select \
--disable-libcdio \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-faad-internal
+# seems stable dvdnav does not work with a new mplayer.
+# if they make a release in the future, maybe we can pull that in,
+# but for now we have to use the internal one.
+#--disable-dvdread-internal \
+#--disable-libdvdcss-internal \
# gui is not supported anymore and we have better ones in ports
-CONFIGURE_ARGS += --disable-gui
+CONFIGURE_ARGS += --disable-gui \
+ --disable-ffmpeg_a # link ffmpeg .so (graphics/ffmpeg)
# CONFIGURE_ARGS that enable internal stuff
CONFIGURE_ARGS += --enable-menu
+# CONFIGURE_ARGS that enable external stuff
+CONFIGURE_ARGS += --with-sdl-config=${LOCALBASE}/bin/sdl-config
+
# CONFIGURE_ARGS that disable external stuff
CONFIGURE_ARGS += --disable-smb \
--disable-liblzo \
@@ -122,7 +134,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-ggi \
--disable-libopenjpeg \
--disable-mpg123 \
- --disable-librtmp
+ --disable-librtmp \
+ --disable-faad
# internal tremor, external
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On Thu, Mar 24, 2011 at 07:05:33AM +0100, Antoine Jacoutot wrote:
Why is this needed?
It's not. Perhaps a legacy. Removed.
I think you are missing some markers. Like:
@pkgpath x11/mplayer,sdl
@pkgpath x11/mplayer,sdl,aa
I have done the recently seen flavors. As we decided on ICB, there are
way too many legacy flavors to enumerate each and every combination of
them all.
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.181
diff -u -p -u -r1.181 Makefile
--- Makefile12 Feb 2011 10:49:36 - 1.181
+++ Makefile24 Mar 2011 12:08:15 -
@@ -5,19 +5,18 @@ ONLY_FOR_ARCHS = alpha amd64 arm i386 mi
COMMENT = movie player supporting many formats
-V =20101024
-V_DASHED = 2010-10-24
+V =20110309
+FFMPEG_V = 20110306
SUBST_VARS += PREFIX CONFDIR
+# Distfiles must be hand-rolled, see README
N =mplayer
-DISTNAME = mplayer-export-snapshot-${V}
+DISTNAME = mplayer-${V}
+
+DISTFILES =${DISTNAME}${EXTRACT_SUFX}
PKGNAME = ${N}-${V}
-REVISION = 2
CATEGORIES = x11 multimedia
-EXTRACT_SUFX = .tar.bz2
-
-WRKDIST = ${WRKDIR}/mplayer-export-${V_DASHED}
HOMEPAGE = http://www.mplayerhq.hu/
@@ -27,11 +26,12 @@ PERMIT_PACKAGE_FTP =Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = bz2 c cdda_interface cdda_paranoia crypto \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg=5 orc-0.4 png \
- pthread schroedinger-1.0=2.0 sndio speex stdc++ \
- theora ungif util vpx x264=5 xvidcore z
+WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm avcodec avformat \
+ avutil bz2 c cdda_interface cdda_paranoia \
+ crypto dv faac fontconfig freetype fribidi gsm jpeg lcms \
+ m mng mp3lame ncurses ogg=5 orc-0.4 png postproc \
+ pthread SDL schroedinger-1.0=2.0 sndio speex stdc++ \
+ swscale theora ungif util x264=5 xvidcore z
# we use a snapshot
MASTER_SITES = http://theunixzoo.co.uk/distfiles/
@@ -43,6 +43,7 @@ MODULES +=converters/libiconv
LIB_DEPENDS = graphics/png \
graphics/jpeg \
graphics/libungif \
+ graphics/ffmpeg=20110306 \
audio/cdparanoia=3.a9.8 \
multimedia/libtheora \
audio/speex \
@@ -58,10 +59,9 @@ LIB_DEPENDS =graphics/png \
graphics/libmng \
archivers/bzip2 \
multimedia/schroedinger=1.0.10 \
- audio/faad \
audio/faac \
multimedia/x264=20101023 \
- multimedia/libvpx
+ devel/sdl=1.2.5
BUILD_DEPENDS =net/livemedia \
audio/rtunes=0.8 \
@@ -70,6 +70,10 @@ BUILD_DEPENDS = net/livemedia \
textproc/docbook \
textproc/docbook-xsl \
audio/ladspa
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
+BUILD_DEPENDS +=graphics/ffmpeg:patch
.if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
BUILD_DEPENDS += devel/yasm
@@ -98,15 +102,21 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-vidix \
--disable-select \
--disable-libcdio \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-faad-internal
+# seems stable dvdnav does not work with a new mplayer.
+# if they make a release in the future, maybe we can pull that in,
+# but for now we have to use the internal one.
+# --disable-dvdread-internal \
+# --disable-libdvdcss-internal \
# gui is not supported anymore and we have better ones in ports
-CONFIGURE_ARGS += --disable-gui
+CONFIGURE_ARGS += --disable-gui \
+ --disable-ffmpeg_a # link ffmpeg .so (graphics/ffmpeg)
# CONFIGURE_ARGS that enable internal stuff
CONFIGURE_ARGS += --enable-menu
+# CONFIGURE_ARGS that enable external stuff
+CONFIGURE_ARGS += --with-sdl-config=${LOCALBASE}/bin/sdl-config
+
# CONFIGURE_ARGS that disable external stuff
CONFIGURE_ARGS += --disable-smb \
--disable-liblzo \
@@ -122,7 +132,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-ggi \
--disable-libopenjpeg \
--disable-mpg123 \
- --disable-librtmp
+ --disable-librtmp \
+ --disable-faad
# internal tremor, external tremor, external libvorbis all conflict
# we choose libvorbis to enable
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On Thu, Mar 24, 2011 at 12:11:17PM +, Edd Barrett wrote:
On Thu, Mar 24, 2011 at 07:05:33AM +0100, Antoine Jacoutot wrote:
Why is this needed?
It's not. Perhaps a legacy. Removed.
I think you are missing some markers. Like:
@pkgpath x11/mplayer,sdl
@pkgpath x11/mplayer,sdl,aa
I have done the recently seen flavors. As we decided on ICB, there are
way too many legacy flavors to enumerate each and every combination of
them all.
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.181
diff -u -p -u -r1.181 Makefile
--- Makefile 12 Feb 2011 10:49:36 - 1.181
+++ Makefile 24 Mar 2011 12:08:15 -
@@ -5,19 +5,18 @@ ONLY_FOR_ARCHS =alpha amd64 arm i386 mi
COMMENT =movie player supporting many formats
-V = 20101024
-V_DASHED = 2010-10-24
+V = 20110309
+FFMPEG_V = 20110306
SUBST_VARS +=PREFIX CONFDIR
+# Distfiles must be hand-rolled, see README
N = mplayer
-DISTNAME = mplayer-export-snapshot-${V}
+DISTNAME = mplayer-${V}
+
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
i think you don't need that anymore since the extra ffmpeg distfile was
taken out
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
Comment is wrong, no ?
-MD5 (mplayer-export-snapshot-20101024.tar.bz2) = F797FlNAF1eu01Goo2VXNw==
-RMD160 (mplayer-export-snapshot-20101024.tar.bz2) =
S9533qXXp0k7Y5TXnXHbk4yfRBs=
-SHA1 (mplayer-export-snapshot-20101024.tar.bz2) =
iGBuBIpI6dKVOxdmJ4HKyatTHUM=
-SHA256 (mplayer-export-snapshot-20101024.tar.bz2) =
BbFJxSzFbQ2CpHSGr0b5UAGLJ0wu8VqHCMvBsvy5uJE=
-SIZE (mplayer-export-snapshot-20101024.tar.bz2) = 9998106
+MD5 (ffmpeg-git-20110306.tar.gz) = sfTm9NP2uKSM6gBhiuAfoA==
+MD5 (mplayer-20110309.tar.gz) = EU2sXltwhr4VhUplf8qsXw==
+RMD160 (ffmpeg-git-20110306.tar.gz) = ec7bfWXTeMQKDoHSTmnDQWZ/0Pk=
+RMD160 (mplayer-20110309.tar.gz) = QlDlgZxUyawqSdBWC871ys/QoRA=
+SHA1 (ffmpeg-git-20110306.tar.gz) = s6wHaPwZFMZRaaT+/LP+HiNaSCk=
+SHA1 (mplayer-20110309.tar.gz) = AMaoe0ip6hI2EyYdtOf6uHgcgio=
+SHA256 (ffmpeg-git-20110306.tar.gz) =
Av5pUZYm1q+shteP/tHYeHgF98bB3whT20zIyq1x5L8=
+SHA256 (mplayer-20110309.tar.gz) =
yeswxU3WOlLg5FnCJQJL5hLLopvSp543ovqjPN4FGSI=
+SIZE (ffmpeg-git-20110306.tar.gz) = 4865660
+SIZE (mplayer-20110309.tar.gz) = 6874760
Regen distinfo, since ffmpeg-git distfile is out.
+ ffmpeg's ogg demuxer is broken for ogg streams. If mplayer says cache
+ not filling when a song changes, you have been bitten by this bug.
+ You can try '-demuxer ogg' as a workaround (or try using ogg123 from
+ the vorbis-tools package).
That's a really annoying bug.. was it reported upstream, being worked
on, tracked somewhere in a bug report ? Have you checked other oses to
see if it happens/is fixed there ?
Landry
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
Hi,
Thanks for taking a look at this.
On Thu, Mar 24, 2011 at 02:25:37PM +0100, Landry Breuil wrote:
+DISTFILES =${DISTNAME}${EXTRACT_SUFX}
i think you don't need that anymore since the extra ffmpeg distfile was
taken out
Yup.
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
Comment is wrong, no ?
No. We still end up with the ffmpeg source code symlinked into the build dir.
See BUILD_DEPENDS.
-MD5 (mplayer-export-snapshot-20101024.tar.bz2) = F797FlNAF1eu01Goo2VXNw==
-RMD160 (mplayer-export-snapshot-20101024.tar.bz2) =
S9533qXXp0k7Y5TXnXHbk4yfRBs=
-SHA1 (mplayer-export-snapshot-20101024.tar.bz2) =
iGBuBIpI6dKVOxdmJ4HKyatTHUM=
-SHA256 (mplayer-export-snapshot-20101024.tar.bz2) =
BbFJxSzFbQ2CpHSGr0b5UAGLJ0wu8VqHCMvBsvy5uJE=
-SIZE (mplayer-export-snapshot-20101024.tar.bz2) = 9998106
+MD5 (ffmpeg-git-20110306.tar.gz) = sfTm9NP2uKSM6gBhiuAfoA==
+MD5 (mplayer-20110309.tar.gz) = EU2sXltwhr4VhUplf8qsXw==
+RMD160 (ffmpeg-git-20110306.tar.gz) = ec7bfWXTeMQKDoHSTmnDQWZ/0Pk=
+RMD160 (mplayer-20110309.tar.gz) = QlDlgZxUyawqSdBWC871ys/QoRA=
+SHA1 (ffmpeg-git-20110306.tar.gz) = s6wHaPwZFMZRaaT+/LP+HiNaSCk=
+SHA1 (mplayer-20110309.tar.gz) = AMaoe0ip6hI2EyYdtOf6uHgcgio=
+SHA256 (ffmpeg-git-20110306.tar.gz) =
Av5pUZYm1q+shteP/tHYeHgF98bB3whT20zIyq1x5L8=
+SHA256 (mplayer-20110309.tar.gz) =
yeswxU3WOlLg5FnCJQJL5hLLopvSp543ovqjPN4FGSI=
+SIZE (ffmpeg-git-20110306.tar.gz) = 4865660
+SIZE (mplayer-20110309.tar.gz) = 6874760
Regen distinfo, since ffmpeg-git distfile is out.
ack.
+ ffmpeg's ogg demuxer is broken for ogg streams. If mplayer says cache
+ not filling when a song changes, you have been bitten by this bug.
+ You can try '-demuxer ogg' as a workaround (or try using ogg123 from
+ the vorbis-tools package).
That's a really annoying bug.. was it reported upstream, being worked
on, tracked somewhere in a bug report ? Have you checked other oses to
see if it happens/is fixed there ?
I have reproduced it on windows even. I reported the bug ages ago:
https://roundup.ffmpeg.org/issue2337
I wish they would fix it.
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On Thu, Mar 24, 2011 at 04:45:26PM +, Edd Barrett wrote:
Hi,
Thanks for taking a look at this.
On Thu, Mar 24, 2011 at 02:25:37PM +0100, Landry Breuil wrote:
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
i think you don't need that anymore since the extra ffmpeg distfile was
taken out
Yup.
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
Comment is wrong, no ?
No. We still end up with the ffmpeg source code symlinked into the build dir.
See BUILD_DEPENDS.
the comment is still wrong. s/for some obscure reason/because mplayer uses
non-public interfaces from ffmpeg/.
-MD5 (mplayer-export-snapshot-20101024.tar.bz2) = F797FlNAF1eu01Goo2VXNw==
-RMD160 (mplayer-export-snapshot-20101024.tar.bz2) =
S9533qXXp0k7Y5TXnXHbk4yfRBs=
-SHA1 (mplayer-export-snapshot-20101024.tar.bz2) =
iGBuBIpI6dKVOxdmJ4HKyatTHUM=
-SHA256 (mplayer-export-snapshot-20101024.tar.bz2) =
BbFJxSzFbQ2CpHSGr0b5UAGLJ0wu8VqHCMvBsvy5uJE=
-SIZE (mplayer-export-snapshot-20101024.tar.bz2) = 9998106
+MD5 (ffmpeg-git-20110306.tar.gz) = sfTm9NP2uKSM6gBhiuAfoA==
+MD5 (mplayer-20110309.tar.gz) = EU2sXltwhr4VhUplf8qsXw==
+RMD160 (ffmpeg-git-20110306.tar.gz) = ec7bfWXTeMQKDoHSTmnDQWZ/0Pk=
+RMD160 (mplayer-20110309.tar.gz) = QlDlgZxUyawqSdBWC871ys/QoRA=
+SHA1 (ffmpeg-git-20110306.tar.gz) = s6wHaPwZFMZRaaT+/LP+HiNaSCk=
+SHA1 (mplayer-20110309.tar.gz) = AMaoe0ip6hI2EyYdtOf6uHgcgio=
+SHA256 (ffmpeg-git-20110306.tar.gz) =
Av5pUZYm1q+shteP/tHYeHgF98bB3whT20zIyq1x5L8=
+SHA256 (mplayer-20110309.tar.gz) =
yeswxU3WOlLg5FnCJQJL5hLLopvSp543ovqjPN4FGSI=
+SIZE (ffmpeg-git-20110306.tar.gz) = 4865660
+SIZE (mplayer-20110309.tar.gz) = 6874760
Regen distinfo, since ffmpeg-git distfile is out.
ack.
+ ffmpeg's ogg demuxer is broken for ogg streams. If mplayer says cache
+ not filling when a song changes, you have been bitten by this bug.
+ You can try '-demuxer ogg' as a workaround (or try using ogg123 from
+ the vorbis-tools package).
That's a really annoying bug.. was it reported upstream, being worked
on, tracked somewhere in a bug report ? Have you checked other oses to
see if it happens/is fixed there ?
I have reproduced it on windows even. I reported the bug ages ago:
https://roundup.ffmpeg.org/issue2337
I wish they would fix it.
looks like they consider this a wish list feature. this is also a
specific kind of ogg stream. streaming ogg via playlists seems to
work fine.
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On Wed, Mar 23, 2011 at 09:47:18AM +, Edd Barrett wrote:
Hi,
On Tue, Mar 22, 2011 at 9:29 PM, Brad b...@comstyle.com wrote:
ffmpeg has no no_x11 FLAVOR, so what happens to mplayer's no_x11 flavor?
Now that it is expected that all systems should have the X libs/headers
around the no_x11 FLAVORs should go. Although IMO that was a stupid move.
Well, so be it. That was not our decision to make. We will just fall
in line and remove the no_x11 flavour.
Ack aja, @pkgpath markers needed for both sdl and no_x11 flavours.
The next stage is to put in the new ffmpeg. I'm going to test vlc
builds with it first.
I built all ffmpeg-dependent ports. they all build (and I tested most
of them), but some need WANTLIB changes due to the removal of faad
from ffmpeg's LIB_DEPENDS.
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: audio/akode/Makefile
===
RCS file: /cvs/ports/audio/akode/Makefile,v
retrieving revision 1.26
diff -N -u -p audio/akode/Makefile
--- audio/akode/Makefile26 Nov 2010 07:07:56 - 1.26
+++ audio/akode/Makefile23 Mar 2011 20:54:22 -
@@ -3,7 +3,7 @@
COMMENT= decoding library for KDE Multimedia
DISTNAME= akode-2.0.2
-REVISION= 14
+REVISION= 15
SHARED_LIBS += akode2.1 # .2.0
@@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= bz2 c faac faad gsm m mp3lame ogg pthread orc-0.4 \
+WANTLIB= bz2 c faac gsm m mp3lame ogg pthread orc-0.4 \
samplerate schroedinger-1.0 sndio stdc++ theora x264 z \
FLAC=8 mad speex ltdl vorbis vorbisfile vorbisenc \
jack avcodec=14 avformat=13 avutil=7
Index: graphics/ffmpegthumbnailer/Makefile
===
RCS file: /cvs/ports/graphics/ffmpegthumbnailer/Makefile,v
retrieving revision 1.12
diff -N -u -p graphics/ffmpegthumbnailer/Makefile
--- graphics/ffmpegthumbnailer/Makefile 17 Nov 2010 08:05:13 - 1.12
+++ graphics/ffmpegthumbnailer/Makefile 23 Mar 2011 20:54:22 -
@@ -3,7 +3,7 @@
COMMENT= lightweight video thumbnailer for file managers
DISTNAME= ffmpegthumbnailer-2.0.2
-REVISION= 1
+REVISION= 2
CATEGORIES=graphics multimedia
MASTER_SITES= http://ffmpegthumbnailer.googlecode.com/files/
@@ -24,7 +24,7 @@ LIB_DEPENDS= graphics/ffmpeg=20100512 \
graphics/png \
graphics/jpeg
-WANTLIB= bz2 c faac faad gsm m mp3lame ogg pthread \
+WANTLIB= bz2 c faac gsm m mp3lame ogg pthread \
stdc++ theora vorbis vorbisenc x264 z \
orc-0.4 schroedinger-1.0 speex \
avcodec=14 avformat=13 avutil=7 swscale=2 \
Index: multimedia/dvdstyler/Makefile
===
RCS file: /cvs/ports/multimedia/dvdstyler/Makefile,v
retrieving revision 1.17
diff -N -u -p multimedia/dvdstyler/Makefile
--- multimedia/dvdstyler/Makefile 19 Nov 2010 07:23:12 - 1.17
+++ multimedia/dvdstyler/Makefile 23 Mar 2011 20:54:22 -
@@ -4,7 +4,7 @@ COMMENT=DVD authoring application
DISTNAME= DVDStyler-1.8.0.3
PKGNAME= ${DISTNAME:L}
-REVISION= 1
+REVISION= 2
CATEGORIES=multimedia
HOMEPAGE= http://www.dvdstyler.de/
@@ -24,7 +24,7 @@ WANTLIB= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor \
Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \
Xrender art_lgpl_2 atk-1.0 bonobo-2 \
bonobo-activation bonoboui-2 bz2 c cairo \
- dbus-1 exif expat faac faad fontconfig freetype \
+ dbus-1 exif expat faac fontconfig freetype \
gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 \
gio-2.0 glib-2.0 gmodule-2.0 gnome-2 \
gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2 \
Index: multimedia/gstreamer-0.10/plugins-ffmpeg/Makefile
===
RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-ffmpeg/Makefile,v
retrieving revision 1.18
diff -N -u -p multimedia/gstreamer-0.10/plugins-ffmpeg/Makefile
--- multimedia/gstreamer-0.10/plugins-ffmpeg/Makefile 18 Jan 2011 11:37:40
- 1.18
+++ multimedia/gstreamer-0.10/plugins-ffmpeg/Makefile 23 Mar 2011 20:54:22
-
@@ -5,7 +5,7 @@ COMMENT = ffmpeg element for GStreamer
V =0.10.11
DISTNAME = gst-ffmpeg-$V
PKGNAME = gstreamer-ffmpeg-$V
-REVISION = 0
+REVISION = 1
MASTER_SITES = ${MASTER_SITE_GST:=gst-ffmpeg/}
@@ -18,7 +18,7 @@ AUTOCONF_VERSION =2.64
MODULES += devel/gettext
-WANTLIB += bz2 faac faad glib-2.0 gmodule-2.0 gobject-2.0 gsm
+WANTLIB += bz2 faac glib-2.0 gmodule-2.0 gobject-2.0 gsm
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On Wed, Mar 23, 2011 at 09:47:18AM +, Edd Barrett wrote:
Ack aja, @pkgpath markers needed for both sdl and no_x11 flavours.
* Remove no_x11 (community decision)
* Add @pkgpath for sdl and no_x11 and tested update path
Again, lets put this in. OKs?
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.181
diff -u -p -u -r1.181 Makefile
--- Makefile12 Feb 2011 10:49:36 - 1.181
+++ Makefile23 Mar 2011 21:43:47 -
@@ -5,19 +5,18 @@ ONLY_FOR_ARCHS = alpha amd64 arm i386 mi
COMMENT = movie player supporting many formats
-V =20101024
-V_DASHED = 2010-10-24
+V =20110309
+FFMPEG_V = 20110306
SUBST_VARS += PREFIX CONFDIR
+# Distfiles must be hand-rolled, see README
N =mplayer
-DISTNAME = mplayer-export-snapshot-${V}
+DISTNAME = mplayer-${V}
+
+DISTFILES =${DISTNAME}${EXTRACT_SUFX}
PKGNAME = ${N}-${V}
-REVISION = 2
CATEGORIES = x11 multimedia
-EXTRACT_SUFX = .tar.bz2
-
-WRKDIST = ${WRKDIR}/mplayer-export-${V_DASHED}
HOMEPAGE = http://www.mplayerhq.hu/
@@ -27,11 +26,12 @@ PERMIT_PACKAGE_FTP =Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = bz2 c cdda_interface cdda_paranoia crypto \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg=5 orc-0.4 png \
- pthread schroedinger-1.0=2.0 sndio speex stdc++ \
- theora ungif util vpx x264=5 xvidcore z
+WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm avcodec avformat \
+ avutil bz2 c cdda_interface cdda_paranoia \
+ crypto dv faac fontconfig freetype fribidi gsm jpeg lcms \
+ m mng mp3lame ncurses ogg=5 orc-0.4 png postproc \
+ pthread SDL schroedinger-1.0=2.0 sndio speex stdc++ \
+ swscale theora ungif util x264=5 xvidcore z
# we use a snapshot
MASTER_SITES = http://theunixzoo.co.uk/distfiles/
@@ -40,9 +40,12 @@ MAINTAINER = Edd Barrett e...@openbsd.or
MODULES += converters/libiconv
+RUN_DEPENDS += devel/desktop-file-utils
+
LIB_DEPENDS = graphics/png \
graphics/jpeg \
graphics/libungif \
+ graphics/ffmpeg=20110306 \
audio/cdparanoia=3.a9.8 \
multimedia/libtheora \
audio/speex \
@@ -58,10 +61,9 @@ LIB_DEPENDS =graphics/png \
graphics/libmng \
archivers/bzip2 \
multimedia/schroedinger=1.0.10 \
- audio/faad \
audio/faac \
multimedia/x264=20101023 \
- multimedia/libvpx
+ devel/sdl=1.2.5
BUILD_DEPENDS =net/livemedia \
audio/rtunes=0.8 \
@@ -70,6 +72,10 @@ BUILD_DEPENDS = net/livemedia \
textproc/docbook \
textproc/docbook-xsl \
audio/ladspa
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
+BUILD_DEPENDS +=graphics/ffmpeg:patch
.if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
BUILD_DEPENDS += devel/yasm
@@ -98,15 +104,21 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-vidix \
--disable-select \
--disable-libcdio \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-faad-internal
+# seems stable dvdnav does not work with a new mplayer.
+# if they make a release in the future, maybe we can pull that in,
+# but for now we have to use the internal one.
+# --disable-dvdread-internal \
+# --disable-libdvdcss-internal \
# gui is not supported anymore and we have better ones in ports
-CONFIGURE_ARGS += --disable-gui
+CONFIGURE_ARGS += --disable-gui \
+ --disable-ffmpeg_a # link ffmpeg .so (graphics/ffmpeg)
# CONFIGURE_ARGS that enable internal stuff
CONFIGURE_ARGS += --enable-menu
+# CONFIGURE_ARGS that enable external stuff
+CONFIGURE_ARGS += --with-sdl-config=${LOCALBASE}/bin/sdl-config
+
# CONFIGURE_ARGS that disable external stuff
CONFIGURE_ARGS += --disable-smb \
--disable-liblzo \
@@ -122,7 +134,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-ggi \
--disable-libopenjpeg \
--disable-mpg123 \
- --disable-librtmp
+ --disable-librtmp \
+ --disable-faad
# internal tremor, external tremor, external libvorbis all conflict
# we choose libvorbis to enable encoding to vorbis
@@ -162,42
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On Tue, 22 Mar 2011, Edd Barrett wrote:
On Wed, Mar 16, 2011 at 05:15:35PM +, Edd Barrett wrote:
On Wed, Mar 16, 2011 at 01:13:01PM +, Edd Barrett wrote:
On Wed, Mar 16, 2011 at 12:55:27PM +, Stuart Henderson wrote:
Build dependencies that are not the default package
or
install target will be processed in a subdirectory
of the
working directory, specifically, in
${WRKDIR}/directory.
^ sweet!
Works like a beauty. Cheers for the pointer.
As Jake quite rightly noticed, ffmpeg need SDL, so there is no point in having
an SDL flavor for mplayer if it is to use dynamic ffmpeg. Below is the diff to
remove the sdl flavor, but this begs the question:
I don't see the PLIST markers.
ffmpeg has no no_x11 FLAVOR, so what happens to mplayer's no_x11 flavor?
Can ffmpeg be built without x11? Maybe brad knows?
Anyway, for now. zzz.
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.181
diff -u -p -u -r1.181 Makefile
--- Makefile 12 Feb 2011 10:49:36 - 1.181
+++ Makefile 22 Mar 2011 01:32:51 -
@@ -5,19 +5,18 @@ ONLY_FOR_ARCHS =alpha amd64 arm i386 mi
COMMENT =movie player supporting many formats
-V = 20101024
-V_DASHED = 2010-10-24
+V = 20110309
+FFMPEG_V = 20110306
SUBST_VARS +=PREFIX CONFDIR
+# Distfiles must be hand-rolled, see README
N = mplayer
-DISTNAME = mplayer-export-snapshot-${V}
+DISTNAME = mplayer-${V}
+
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
PKGNAME =${N}-${V}
-REVISION = 2
CATEGORIES = x11 multimedia
-EXTRACT_SUFX = .tar.bz2
-
-WRKDIST =${WRKDIR}/mplayer-export-${V_DASHED}
HOMEPAGE = http://www.mplayerhq.hu/
@@ -27,11 +26,11 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB =bz2 c cdda_interface cdda_paranoia crypto \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg=5 orc-0.4 png \
- pthread schroedinger-1.0=2.0 sndio speex stdc++ \
- theora ungif util vpx x264=5 xvidcore z
+WANTLIB =avcodec avformat avutil bz2 c cdda_interface cdda_paranoia \
+ crypto dv faac fribidi gsm jpeg lcms \
+ m mng mp3lame ncurses ogg=5 orc-0.4 png postproc \
+ pthread SDL schroedinger-1.0=2.0 sndio speex stdc++ \
+ swscale theora ungif util x264=5 xvidcore z
# we use a snapshot
MASTER_SITES = http://theunixzoo.co.uk/distfiles/
@@ -43,6 +42,7 @@ MODULES += converters/libiconv
LIB_DEPENDS =graphics/png \
graphics/jpeg \
graphics/libungif \
+ graphics/ffmpeg=20110306 \
audio/cdparanoia=3.a9.8 \
multimedia/libtheora \
audio/speex \
@@ -58,10 +58,9 @@ LIB_DEPENDS = graphics/png \
graphics/libmng \
archivers/bzip2 \
multimedia/schroedinger=1.0.10 \
- audio/faad \
audio/faac \
multimedia/x264=20101023 \
- multimedia/libvpx
+ devel/sdl=1.2.5
BUILD_DEPENDS = net/livemedia \
audio/rtunes=0.8 \
@@ -70,6 +69,10 @@ BUILD_DEPENDS =net/livemedia \
textproc/docbook \
textproc/docbook-xsl \
audio/ladspa
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
+BUILD_DEPENDS +=graphics/ffmpeg:patch
.if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
BUILD_DEPENDS += devel/yasm
@@ -98,15 +101,21 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-vidix \
--disable-select \
--disable-libcdio \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-faad-internal
+# seems stable dvdnav does not work with a new mplayer.
+# if they make a release in the future, maybe we can pull that in,
+# but for now we have to use the internal one.
+#--disable-dvdread-internal \
+#--disable-libdvdcss-internal \
# gui is not supported anymore and we have better ones in ports
-CONFIGURE_ARGS += --disable-gui
+CONFIGURE_ARGS += --disable-gui \
+ --disable-ffmpeg_a # link ffmpeg .so (graphics/ffmpeg)
# CONFIGURE_ARGS that enable internal stuff
CONFIGURE_ARGS += --enable-menu
+# CONFIGURE_ARGS that enable external stuff unconditionally
+CONFIGURE_ARGS +=
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On 21/03/11 9:53 PM, Edd Barrett wrote:
On Wed, Mar 16, 2011 at 05:15:35PM +, Edd Barrett wrote:
On Wed, Mar 16, 2011 at 01:13:01PM +, Edd Barrett wrote:
On Wed, Mar 16, 2011 at 12:55:27PM +, Stuart Henderson wrote:
Build dependencies that are not the default package or
install target will be processed in a subdirectory of the
working directory, specifically, in ${WRKDIR}/directory.
^ sweet!
Works like a beauty. Cheers for the pointer.
As Jake quite rightly noticed, ffmpeg need SDL, so there is no point in having
an SDL flavor for mplayer if it is to use dynamic ffmpeg. Below is the diff to
remove the sdl flavor, but this begs the question:
ffmpeg has no no_x11 FLAVOR, so what happens to mplayer's no_x11 flavor?
Now that it is expected that all systems should have the X libs/headers
around the no_x11 FLAVORs should go. Although IMO that was a stupid move.
Can ffmpeg be built without x11? Maybe brad knows?
No. SDL is required for ffplay.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On Wed, Mar 16, 2011 at 05:15:35PM +, Edd Barrett wrote:
On Wed, Mar 16, 2011 at 01:13:01PM +, Edd Barrett wrote:
On Wed, Mar 16, 2011 at 12:55:27PM +, Stuart Henderson wrote:
Build dependencies that are not the default package or
install target will be processed in a subdirectory of
the
working directory, specifically, in
${WRKDIR}/directory.
^ sweet!
Works like a beauty. Cheers for the pointer.
As Jake quite rightly noticed, ffmpeg need SDL, so there is no point in having
an SDL flavor for mplayer if it is to use dynamic ffmpeg. Below is the diff to
remove the sdl flavor, but this begs the question:
ffmpeg has no no_x11 FLAVOR, so what happens to mplayer's no_x11 flavor?
Can ffmpeg be built without x11? Maybe brad knows?
Anyway, for now. zzz.
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.181
diff -u -p -u -r1.181 Makefile
--- Makefile12 Feb 2011 10:49:36 - 1.181
+++ Makefile22 Mar 2011 01:32:51 -
@@ -5,19 +5,18 @@ ONLY_FOR_ARCHS = alpha amd64 arm i386 mi
COMMENT = movie player supporting many formats
-V =20101024
-V_DASHED = 2010-10-24
+V =20110309
+FFMPEG_V = 20110306
SUBST_VARS += PREFIX CONFDIR
+# Distfiles must be hand-rolled, see README
N =mplayer
-DISTNAME = mplayer-export-snapshot-${V}
+DISTNAME = mplayer-${V}
+
+DISTFILES =${DISTNAME}${EXTRACT_SUFX}
PKGNAME = ${N}-${V}
-REVISION = 2
CATEGORIES = x11 multimedia
-EXTRACT_SUFX = .tar.bz2
-
-WRKDIST = ${WRKDIR}/mplayer-export-${V_DASHED}
HOMEPAGE = http://www.mplayerhq.hu/
@@ -27,11 +26,11 @@ PERMIT_PACKAGE_FTP =Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = bz2 c cdda_interface cdda_paranoia crypto \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg=5 orc-0.4 png \
- pthread schroedinger-1.0=2.0 sndio speex stdc++ \
- theora ungif util vpx x264=5 xvidcore z
+WANTLIB = avcodec avformat avutil bz2 c cdda_interface cdda_paranoia \
+ crypto dv faac fribidi gsm jpeg lcms \
+ m mng mp3lame ncurses ogg=5 orc-0.4 png postproc \
+ pthread SDL schroedinger-1.0=2.0 sndio speex stdc++ \
+ swscale theora ungif util x264=5 xvidcore z
# we use a snapshot
MASTER_SITES = http://theunixzoo.co.uk/distfiles/
@@ -43,6 +42,7 @@ MODULES +=converters/libiconv
LIB_DEPENDS = graphics/png \
graphics/jpeg \
graphics/libungif \
+ graphics/ffmpeg=20110306 \
audio/cdparanoia=3.a9.8 \
multimedia/libtheora \
audio/speex \
@@ -58,10 +58,9 @@ LIB_DEPENDS =graphics/png \
graphics/libmng \
archivers/bzip2 \
multimedia/schroedinger=1.0.10 \
- audio/faad \
audio/faac \
multimedia/x264=20101023 \
- multimedia/libvpx
+ devel/sdl=1.2.5
BUILD_DEPENDS =net/livemedia \
audio/rtunes=0.8 \
@@ -70,6 +69,10 @@ BUILD_DEPENDS = net/livemedia \
textproc/docbook \
textproc/docbook-xsl \
audio/ladspa
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
+BUILD_DEPENDS +=graphics/ffmpeg:patch
.if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
BUILD_DEPENDS += devel/yasm
@@ -98,15 +101,21 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-vidix \
--disable-select \
--disable-libcdio \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-faad-internal
+# seems stable dvdnav does not work with a new mplayer.
+# if they make a release in the future, maybe we can pull that in,
+# but for now we have to use the internal one.
+# --disable-dvdread-internal \
+# --disable-libdvdcss-internal \
# gui is not supported anymore and we have better ones in ports
-CONFIGURE_ARGS += --disable-gui
+CONFIGURE_ARGS += --disable-gui \
+ --disable-ffmpeg_a # link ffmpeg .so (graphics/ffmpeg)
# CONFIGURE_ARGS that enable internal stuff
CONFIGURE_ARGS += --enable-menu
+# CONFIGURE_ARGS that enable external stuff unconditionally
+CONFIGURE_ARGS += --with-sdl-config=${LOCALBASE}/bin/sdl-config
+
# CONFIGURE_ARGS that disable external stuff
CONFIGURE_ARGS +=
Re: UPDATE: mplayer 20110303
Brad b...@comstyle.com wrote: Btw, are there any other reasons to delay this update? The issue naddy pointed out needs to be investigated and resolved first.. http://marc.info/?l=openbsd-portsm=129943663419002w=2 That is resolved in Edd's latest port revision, because lavcac3enc is not supported at all when building with shared ffmpeg. I don't consider this a critical feature. I for one have little use for it in practice. It's just something I picked to test because I thought other people wouldn't. -- Christian naddy Weisgerber na...@mips.inka.de
Re: UPDATE: mplayer 20110303
On Tue, Mar 15, 2011 at 02:10:06PM +0100, David Coppa wrote: On Sun, 06 Mar 2011, Edd Barrett wrote: On Sun, Mar 06, 2011 at 06:35:06PM +, Christian Weisgerber wrote: Edd Barrett vex...@gmail.com wrote: An update to mplayer. For the archives, this is what I have so far -- with README formatting done and a small (hopefully to grow) paragraph on mencoder test cases. I think there is going to be an attempt to dynamically link ffmpeg, however it needs to be brought up to date first. Hi, Since As a general rule, we prefer to use FFMPEG implementations, but only if they are good quality, I think we can safely drop LIVE555 support here, as ffmpeg supports more streams than live555. This was also suggested by a mplayer dev here: http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1715 I've tested it on my machine and it works fine... Here's a diff over your latest diff. Ok? Myself, Jake and Brad have been bouncing about emails for a version of mplayer that dynamically links ffmpeg, I am going to post these on separate threads to ports, as they are nearing completion (hopefully). In the meanwhile, you guys decide what to do with live555 ;) -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: UPDATE: mplayer 20110303
On Wed, Mar 16, 2011 at 11:19 AM, Edd Barrett vex...@gmail.com wrote: Myself, Jake and Brad have been bouncing about emails for a version of mplayer that dynamically links ffmpeg, I am going to post these on separate threads to ports, as they are nearing completion (hopefully). Great news. Thnx for your work, guys David
UPDATE: mplayer (with dynamic ffmpeg linking)
Hi,
Again, a joint effort by myself, Jake and Brad; here is an mplayer update which
dynamically links all of the various ffmpeg libraries instead of statically
building one inside of mplayer.
I am interested to know if naddy is still having issues with AC3 encoding with
this.
What shall we do with live555 guys? Can someone see if the ffmpeg decoder is
enough?
This is tested on amd64 and i386.
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.181
diff -u -p -u -r1.181 Makefile
--- Makefile12 Feb 2011 10:49:36 - 1.181
+++ Makefile9 Mar 2011 18:50:44 -
@@ -5,19 +5,22 @@ ONLY_FOR_ARCHS = alpha amd64 arm i386 mi
COMMENT = movie player supporting many formats
-V =20101024
-V_DASHED = 2010-10-24
+V =20110309
+FFMPEG_V = 20110306
SUBST_VARS += PREFIX CONFDIR
+# Distfiles must be hand-rolled, see README
N =mplayer
-DISTNAME = mplayer-export-snapshot-${V}
+DISTNAME = mplayer-${V}
+
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
+ ffmpeg-git-${FFMPEG_V}${EXTRACT_SUFX}
PKGNAME = ${N}-${V}
-REVISION = 2
CATEGORIES = x11 multimedia
-EXTRACT_SUFX = .tar.bz2
-
-WRKDIST = ${WRKDIR}/mplayer-export-${V_DASHED}
HOMEPAGE = http://www.mplayerhq.hu/
@@ -27,11 +30,11 @@ PERMIT_PACKAGE_FTP =Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = bz2 c cdda_interface cdda_paranoia crypto \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg=5 orc-0.4 png \
+WANTLIB = avcodec avformat avutil bz2 c cdda_interface cdda_paranoia \
+ crypto dv faac fribidi gsm jpeg lcms \
+ m mng mp3lame ncurses ogg=5 orc-0.4 png postproc \
pthread schroedinger-1.0=2.0 sndio speex stdc++ \
- theora ungif util vpx x264=5 xvidcore z
+ swscale theora ungif util x264=5 xvidcore z
# we use a snapshot
MASTER_SITES = http://theunixzoo.co.uk/distfiles/
@@ -43,6 +46,7 @@ MODULES +=converters/libiconv
LIB_DEPENDS = graphics/png \
graphics/jpeg \
graphics/libungif \
+ graphics/ffmpeg=20110306 \
audio/cdparanoia=3.a9.8 \
multimedia/libtheora \
audio/speex \
@@ -58,10 +62,8 @@ LIB_DEPENDS =graphics/png \
graphics/libmng \
archivers/bzip2 \
multimedia/schroedinger=1.0.10 \
- audio/faad \
audio/faac \
- multimedia/x264=20101023 \
- multimedia/libvpx
+ multimedia/x264=20101023
BUILD_DEPENDS =net/livemedia \
audio/rtunes=0.8 \
@@ -98,11 +100,14 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-vidix \
--disable-select \
--disable-libcdio \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-faad-internal
+# seems stable dvdnav does not work with a new mplayer.
+# if they make a release in the future, maybe we can pull that in,
+# but for now we have to use the internal one.
+# --disable-dvdread-internal \
+# --disable-libdvdcss-internal \
# gui is not supported anymore and we have better ones in ports
-CONFIGURE_ARGS += --disable-gui
+CONFIGURE_ARGS += --disable-gui \
+ --disable-ffmpeg_a # link ffmpeg .so (graphics/ffmpeg)
# CONFIGURE_ARGS that enable internal stuff
CONFIGURE_ARGS += --enable-menu
@@ -122,7 +127,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-ggi \
--disable-libopenjpeg \
--disable-mpg123 \
- --disable-librtmp
+ --disable-librtmp \
+ --disable-faad
# internal tremor, external tremor, external libvorbis all conflict
# we choose libvorbis to enable encoding to vorbis
@@ -220,17 +226,15 @@ post-extract:
pre-configure:
${SUBST_CMD} ${WRKSRC}/DOCS/xml/configure
-
-# Put a version.h in place so svn is not a BUILD_DEPEND
-# (see version.sh for how this was supposed to work).
-post-configure:
- cp ${FILESDIR}/version.h ${WRKDIST}/version.h
-
post-build:
@cd ${WRKSRC}/DOCS/xml ${MAKE_PROGRAM}
DOCDIR = ${PREFIX}/share/doc/mplayer
EXAMPLEDIR = ${PREFIX}/share/examples/mplayer
+
+# link ffmpeg sources to where build expects
+pre-patch:
+ ln -s
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On 2011/03/16 10:29, Edd Barrett wrote:
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
+ ffmpeg-git-${FFMPEG_V}${EXTRACT_SUFX}
I'm not keen on this, how about BUILD_DEPENDS=graphics/ffmpeg:patch?
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On Wed, Mar 16, 2011 at 11:41:54AM +, Stuart Henderson wrote:
On 2011/03/16 10:29, Edd Barrett wrote:
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
+ ffmpeg-git-${FFMPEG_V}${EXTRACT_SUFX}
I'm not keen on this, how about BUILD_DEPENDS=graphics/ffmpeg:patch?
Definitely, it's the way to go for such cases.
Landry
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On Wed, Mar 16, 2011 at 11:41:54AM +, Stuart Henderson wrote:
On 2011/03/16 10:29, Edd Barrett wrote:
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
+ ffmpeg-git-${FFMPEG_V}${EXTRACT_SUFX}
I'm not keen on this, how about BUILD_DEPENDS=graphics/ffmpeg:patch?
Can you expand upon this, I am not sure what you mean.
You need libav* inside the mplayer source tree even if you are planning to
link ffmpeg dynamically.
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On 2011/03/16 11:53, Edd Barrett wrote:
On Wed, Mar 16, 2011 at 11:41:54AM +, Stuart Henderson wrote:
On 2011/03/16 10:29, Edd Barrett wrote:
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
+ ffmpeg-git-${FFMPEG_V}${EXTRACT_SUFX}
I'm not keen on this, how about BUILD_DEPENDS=graphics/ffmpeg:patch?
Can you expand upon this, I am not sure what you mean.
You need libav* inside the mplayer source tree even if you are planning to
link ffmpeg dynamically.
BUILD_DEPENDS
List of other ports the current port needs to build
correctly. Each item has the form
`[pkgspec:]directory[,-subpackage][,flavor ...][:target]'.
`target' defaults to `install' if it is not specified.
`legacy' used to be a file to check. The ports tree now
uses `pkgspec' instead, as a package that must be installed
prior to the build. `directory' is set relative to
${PORTSDIR}. `subpackage' is an optional subpackage name,
to install instead of the default main package name.
`flavor ...' is a comma separated list of flavors. By
default, the dependency will build the default flavor.
Build dependencies are checked at the beginning of the
extract stage.
Build dependencies that are not the default package or
install target will be processed in a subdirectory of the
working directory, specifically, in ${WRKDIR}/directory.
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On Wed, Mar 16, 2011 at 12:55:27PM +, Stuart Henderson wrote:
Build dependencies that are not the default package or
install target will be processed in a subdirectory of the
working directory, specifically, in ${WRKDIR}/directory.
^ sweet!
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
Re: UPDATE: mplayer (with dynamic ffmpeg linking)
On Wed, Mar 16, 2011 at 01:13:01PM +, Edd Barrett wrote:
On Wed, Mar 16, 2011 at 12:55:27PM +, Stuart Henderson wrote:
Build dependencies that are not the default package or
install target will be processed in a subdirectory of the
working directory, specifically, in ${WRKDIR}/directory.
^ sweet!
Works like a beauty. Cheers for the pointer.
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.181
diff -u -p -u -r1.181 Makefile
--- Makefile12 Feb 2011 10:49:36 - 1.181
+++ Makefile16 Mar 2011 17:08:21 -
@@ -5,19 +5,18 @@ ONLY_FOR_ARCHS = alpha amd64 arm i386 mi
COMMENT = movie player supporting many formats
-V =20101024
-V_DASHED = 2010-10-24
+V =20110309
+FFMPEG_V = 20110306
SUBST_VARS += PREFIX CONFDIR
+# Distfiles must be hand-rolled, see README
N =mplayer
-DISTNAME = mplayer-export-snapshot-${V}
+DISTNAME = mplayer-${V}
+
+DISTFILES =${DISTNAME}${EXTRACT_SUFX}
PKGNAME = ${N}-${V}
-REVISION = 2
CATEGORIES = x11 multimedia
-EXTRACT_SUFX = .tar.bz2
-
-WRKDIST = ${WRKDIR}/mplayer-export-${V_DASHED}
HOMEPAGE = http://www.mplayerhq.hu/
@@ -27,11 +26,11 @@ PERMIT_PACKAGE_FTP =Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = bz2 c cdda_interface cdda_paranoia crypto \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg=5 orc-0.4 png \
+WANTLIB = avcodec avformat avutil bz2 c cdda_interface cdda_paranoia \
+ crypto dv faac fribidi gsm jpeg lcms \
+ m mng mp3lame ncurses ogg=5 orc-0.4 png postproc \
pthread schroedinger-1.0=2.0 sndio speex stdc++ \
- theora ungif util vpx x264=5 xvidcore z
+ swscale theora ungif util x264=5 xvidcore z
# we use a snapshot
MASTER_SITES = http://theunixzoo.co.uk/distfiles/
@@ -43,6 +42,7 @@ MODULES +=converters/libiconv
LIB_DEPENDS = graphics/png \
graphics/jpeg \
graphics/libungif \
+ graphics/ffmpeg=20110306 \
audio/cdparanoia=3.a9.8 \
multimedia/libtheora \
audio/speex \
@@ -58,10 +58,8 @@ LIB_DEPENDS =graphics/png \
graphics/libmng \
archivers/bzip2 \
multimedia/schroedinger=1.0.10 \
- audio/faad \
audio/faac \
- multimedia/x264=20101023 \
- multimedia/libvpx
+ multimedia/x264=20101023
BUILD_DEPENDS =net/livemedia \
audio/rtunes=0.8 \
@@ -70,6 +68,10 @@ BUILD_DEPENDS = net/livemedia \
textproc/docbook \
textproc/docbook-xsl \
audio/ladspa
+# To do dynamic ffmpeg linking, you also need the ffmpeg sources inside
+# the build tree for some obscure reason. This should retrieve the same
+# distfile as graphics/ffmpeg.
+BUILD_DEPENDS +=graphics/ffmpeg:patch
.if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
BUILD_DEPENDS += devel/yasm
@@ -98,11 +100,14 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-vidix \
--disable-select \
--disable-libcdio \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-faad-internal
+# seems stable dvdnav does not work with a new mplayer.
+# if they make a release in the future, maybe we can pull that in,
+# but for now we have to use the internal one.
+# --disable-dvdread-internal \
+# --disable-libdvdcss-internal \
# gui is not supported anymore and we have better ones in ports
-CONFIGURE_ARGS += --disable-gui
+CONFIGURE_ARGS += --disable-gui \
+ --disable-ffmpeg_a # link ffmpeg .so (graphics/ffmpeg)
# CONFIGURE_ARGS that enable internal stuff
CONFIGURE_ARGS += --enable-menu
@@ -122,7 +127,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-ggi \
--disable-libopenjpeg \
--disable-mpg123 \
- --disable-librtmp
+ --disable-librtmp \
+ --disable-faad
# internal tremor, external tremor, external libvorbis all conflict
# we choose libvorbis to enable encoding to vorbis
@@ -220,17 +226,15 @@ post-extract:
pre-configure:
${SUBST_CMD} ${WRKSRC}/DOCS/xml/configure
-
-# Put a version.h in place so svn is not a BUILD_DEPEND
-# (see version.sh for how this was supposed to work).
-post-configure:
- cp ${FILESDIR}/version.h ${WRKDIST}/version.h
-
post-build:
@cd
Re: UPDATE: mplayer 20110303
On Tue, Mar 15, 2011 at 2:16 PM, David Coppa dco...@gmail.com wrote: On Mon, Mar 7, 2011 at 5:36 PM, Christian Weisgerber na...@mips.inka.de wrote: Edd Barrett vex...@gmail.com wrote: Tested on amd64 with smplayer and gnome-mplayer (not the version just posted). Also tested basic functionality on sparc64. Yes, various audio formats (MP3, AAC, Vorbis, FLAC, Shorten) play fine on sparc64. My Blade 100 is headless and really too slow to play video over the network, but Xvid is decoded correctly and works with generous frame dropping. Btw, are there any other reasons to delay this update? It's OK for me so far, with my usual mplayer usage cases... Also, this version of mplayer fixed a problem I was having with gnome-mplayer... Then, another reason to have my ok :) :) I'll try the mplayer with dynamic ffmpeg linking asap ciao, david
Re: UPDATE: mplayer 20110303
On 15/03/11 9:16 AM, David Coppa wrote: On Mon, Mar 7, 2011 at 5:36 PM, Christian Weisgerberna...@mips.inka.de wrote: Edd Barrettvex...@gmail.com wrote: Tested on amd64 with smplayer and gnome-mplayer (not the version just posted). Also tested basic functionality on sparc64. Yes, various audio formats (MP3, AAC, Vorbis, FLAC, Shorten) play fine on sparc64. My Blade 100 is headless and really too slow to play video over the network, but Xvid is decoded correctly and works with generous frame dropping. Btw, are there any other reasons to delay this update? It's OK for me so far, with my usual mplayer usage cases... cheers David The issue naddy pointed out needs to be investigated and resolved first.. http://marc.info/?l=openbsd-portsm=129943663419002w=2 Also once libvpx/xvidcore goes in I'll look at finishing off FFmpeg and then once that's in MPlayer could possibly go in once the above issue is resolved. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: mplayer 20110303
On Mon, Mar 7, 2011 at 5:36 PM, Christian Weisgerber na...@mips.inka.de wrote: Edd Barrett vex...@gmail.com wrote: Tested on amd64 with smplayer and gnome-mplayer (not the version just posted). Also tested basic functionality on sparc64. Yes, various audio formats (MP3, AAC, Vorbis, FLAC, Shorten) play fine on sparc64. My Blade 100 is headless and really too slow to play video over the network, but Xvid is decoded correctly and works with generous frame dropping. Btw, are there any other reasons to delay this update? It's OK for me so far, with my usual mplayer usage cases... cheers David
Re: UPDATE: mplayer 20110303
On Sun, 06 Mar 2011, Edd Barrett wrote: On Sun, Mar 06, 2011 at 06:35:06PM +, Christian Weisgerber wrote: Edd Barrett vex...@gmail.com wrote: An update to mplayer. For the archives, this is what I have so far -- with README formatting done and a small (hopefully to grow) paragraph on mencoder test cases. I think there is going to be an attempt to dynamically link ffmpeg, however it needs to be brought up to date first. Hi, Since As a general rule, we prefer to use FFMPEG implementations, but only if they are good quality, I think we can safely drop LIVE555 support here, as ffmpeg supports more streams than live555. This was also suggested by a mplayer dev here: http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1715 I've tested it on my machine and it works fine... $ mplayer ffmpeg://rtsp://64.202.98.91:554/gs.sdp MPlayer SVN-r33017-snapshot-4.2.1 (C) 2000-2011 MPlayer Team Playing ffmpeg://rtsp://64.202.98.91:554/gs.sdp. Invalid seek to negative position! libavformat file format detected. [rtsp @ 0x805800c0] Estimating duration from bitrate, this may be inaccurate [lavf] stream 0: audio (aac), -aid 0 Clip info: title: Groove Salad from SomaFM [aacPlus] comment: Downtempo Ambient Groove == Opening audio decoder: [ffmpeg] FFmpeg/libavcodec audio decoders AUDIO: 44100 Hz, 2 ch, s16le, 0.0 kbit/0.00% (ratio: 0-176400) Selected audio codec: [ffaac] afm: ffmpeg (FFmpeg AAC (MPEG-2/MPEG-4 Audio)) == AO: [sndio] 44100Hz 2ch s16le (2 bytes per sample) Video: no video Starting playback... A: 0.0 (00.0) of 0.0 (unknown) 93.4% Here's a diff over your latest diff. Ok? --- Makefile.orig +++ Makefile @@ -58,8 +58,7 @@ multimedia/x264=20101023 \ multimedia/libvpx -BUILD_DEPENDS =net/livemedia \ - audio/rtunes=0.8 \ +BUILD_DEPENDS =audio/rtunes=0.8 \ textproc/libxml \ textproc/libxslt \ textproc/docbook \ @@ -120,7 +119,8 @@ --disable-libopenjpeg \ --disable-mpg123 \ --disable-librtmp \ - --disable-faad + --disable-faad \ + --disable-live # internal tremor, external tremor, external libvorbis all conflict # we choose libvorbis to enable encoding to vorbis
Re: UPDATE: mplayer 20110303
On Tue, Mar 15, 2011 at 02:10:06PM +0100, David Coppa wrote: On Sun, 06 Mar 2011, Edd Barrett wrote: On Sun, Mar 06, 2011 at 06:35:06PM +, Christian Weisgerber wrote: Edd Barrett vex...@gmail.com wrote: An update to mplayer. For the archives, this is what I have so far -- with README formatting done and a small (hopefully to grow) paragraph on mencoder test cases. I think there is going to be an attempt to dynamically link ffmpeg, however it needs to be brought up to date first. Hi, Since As a general rule, we prefer to use FFMPEG implementations, but only if they are good quality, I think we can safely drop LIVE555 support here, as ffmpeg supports more streams than live555. This was also suggested by a mplayer dev here: http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1715 Make sure that the tv-over-ip service provided by free isp in france still works.. in the past i've found it picky as to live555 usage. anyone can test that ? Landry
Re: UPDATE: mplayer 20110303
On Tue, Mar 15, 2011 at 3:24 PM, Landry Breuil lan...@rhaalovely.net wrote: Make sure that the tv-over-ip service provided by free isp in france still works.. in the past i've found it picky as to live555 usage. anyone can test that ? Last time I've heard from Antoine about that, it was not working with ffmpeg but it was even worse with live555 (segfault). ciao david
Re: UPDATE: mplayer 20110303
On Tue, Mar 15, 2011 at 03:30:39PM +0100, David Coppa wrote: On Tue, Mar 15, 2011 at 3:24 PM, Landry Breuil lan...@rhaalovely.net wrote: Make sure that the tv-over-ip service provided by free isp in france still works.. in the past i've found it picky as to live555 usage. anyone can test that ? Last time I've heard from Antoine about that, it was not working with ffmpeg but it was even worse with live555 (segfault). As I'm running -outdated, I'll not comment on mplayer-20110303 but mplayer-20101024p2 works fine for me on free.fr's tv-over-ip $ cat ~/.mplayer/config softvol-max=500 prefer-ipv4=yes zoom=yes fs=yes vf=kerndeint hardframedrop=yes cache=8192 $ cat ~/bin/fplay #!/bin/sh # this script takes channel_number as single argument mixerctl outputs.master=200 #url=`ftp -o - http://mafreebox.freebox.fr/freeboxtv/playlist.m3u 2/dev/null |grep -A 1 ,$1 |grep 'flavour=ld'` url=`ftp -o - http://mafreebox.freebox.fr/freeboxtv/playlist.m3u 2/dev/null |grep -A 1 ,$1 |grep 'flavour=sd'` #url=`ftp -o - http://mafreebox.freebox.fr/freeboxtv/playlist.m3u 2/dev/null |grep -A 1 ,$1 |grep 'flavour=hd'` echo URL: $url mplayer $url
Re: UPDATE: mplayer 20110303
On Sun, Mar 06, 2011 at 01:34:15PM +, Edd Barrett wrote:
On Sun, Mar 06, 2011 at 07:59:39AM +0100, Antoine Jacoutot wrote:
On Sun, 6 Mar 2011, Edd Barrett wrote:
On Sat, Mar 05, 2011 at 09:13:02PM +, Edd Barrett wrote:
Yah, attached an old diff.
README: Add $Id$ and fix typo:
We don't use $Id$. Please use the usual OpenBSD tag.
Heh, must have been tired when I hacked this...
Also add an empty line between the tag and the title of the readme
otherwise it becomes unreadable when expended. Thanks.
OK
I am seriously considering the worth of mencoder in our mplayer package.
It seems unmaintained, buggy and adds dependencies to the package. It
seems the open source world is just using ffmpeg directly now.
Does anyone actually use mencoder? If you are, can ffmepg do a better
job? Should we disable mencoder?
CCing people who might have an opinion.
New diff after I have had some feedback on the above.
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
I use mencoder, but maybe this job can be done with other tools. I use it
to smallify videos that my machine here at work can't play.
$ cat ~/bin/machklein
mencoder $1 -ovc lavc -oac mp3lame -vf scale=640:400 -o ${1}.klein.avi
But no big deal, just FYI.
Alf
Re: UPDATE: mplayer 20110303
Edd Barrett vex...@gmail.com wrote: Tested on amd64 with smplayer and gnome-mplayer (not the version just posted). Also tested basic functionality on sparc64. Yes, various audio formats (MP3, AAC, Vorbis, FLAC, Shorten) play fine on sparc64. My Blade 100 is headless and really too slow to play video over the network, but Xvid is decoded correctly and works with generous frame dropping. -- Christian naddy Weisgerber na...@mips.inka.de
Re: UPDATE: mplayer 20110303
On Sun, 6 Mar 2011, Edd Barrett wrote: On Sun, Mar 06, 2011 at 07:59:39AM +0100, Antoine Jacoutot wrote: On Sun, 6 Mar 2011, Edd Barrett wrote: On Sat, Mar 05, 2011 at 09:13:02PM +, Edd Barrett wrote: Yah, attached an old diff. README: Add $Id$ and fix typo: We don't use $Id$. Please use the usual OpenBSD tag. Heh, must have been tired when I hacked this... Also add an empty line between the tag and the title of the readme otherwise it becomes unreadable when expended. Thanks. OK I am seriously considering the worth of mencoder in our mplayer package. It seems unmaintained, buggy and adds dependencies to the package. It seems the open source world is just using ffmpeg directly now. Does anyone actually use mencoder? If you are, can ffmepg do a better job? Should we disable mencoder? CCing people who might have an opinion. This would require an audit of depending ports because iirc some ports depend on mplayer because they need mencoder (multimedia/devede for example). -- Antoine
Re: UPDATE: mplayer 20110303
On Sun, Mar 06, 2011 at 07:59:39AM +0100, Antoine Jacoutot wrote: On Sun, 6 Mar 2011, Edd Barrett wrote: On Sat, Mar 05, 2011 at 09:13:02PM +, Edd Barrett wrote: Yah, attached an old diff. README: Add $Id$ and fix typo: We don't use $Id$. Please use the usual OpenBSD tag. Heh, must have been tired when I hacked this... Also add an empty line between the tag and the title of the readme otherwise it becomes unreadable when expended. Thanks. OK I am seriously considering the worth of mencoder in our mplayer package. It seems unmaintained, buggy and adds dependencies to the package. It seems the open source world is just using ffmpeg directly now. Does anyone actually use mencoder? If you are, can ffmepg do a better job? Should we disable mencoder? CCing people who might have an opinion. New diff after I have had some feedback on the above. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: UPDATE: mplayer 20110303
On Sun, Mar 06, 2011 at 03:30:04PM +0100, Antoine Jacoutot wrote: Does anyone actually use mencoder? If you are, can ffmepg do a better job? Should we disable mencoder? CCing people who might have an opinion. This would require an audit of depending ports because iirc some ports depend on mplayer because they need mencoder (multimedia/devede for example). I had an email from someone regarding devede not so long ago actually, so it looks like mencoder stays. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: UPDATE: mplayer 20110303
On Sun, Mar 06, 2011 at 01:34:15PM +, Edd Barrett wrote: On Sun, Mar 06, 2011 at 07:59:39AM +0100, Antoine Jacoutot wrote: On Sun, 6 Mar 2011, Edd Barrett wrote: On Sat, Mar 05, 2011 at 09:13:02PM +, Edd Barrett wrote: Yah, attached an old diff. README: Add $Id$ and fix typo: We don't use $Id$. Please use the usual OpenBSD tag. Heh, must have been tired when I hacked this... Also add an empty line between the tag and the title of the readme otherwise it becomes unreadable when expended. Thanks. OK I am seriously considering the worth of mencoder in our mplayer package. the no_x11 flavor is specifically for people using mencoder on web servers ... resizing graphics on the fly or some such. It seems unmaintained, buggy and adds dependencies to the package. It seems the open source world is just using ffmpeg directly now. Does anyone actually use mencoder? If you are, can ffmepg do a better job? Should we disable mencoder? CCing people who might have an opinion. New diff after I have had some feedback on the above. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk -- jake...@sdf.lonestar.org SDF Public Access UNIX System - http://sdf.lonestar.org
Re: UPDATE: mplayer 20110303
Edd Barrett vex...@gmail.com wrote: An update to mplayer. Try out all of your media and let me know how it goes. The usual stuff (playing DVDs, Xvid, H.264, MP3, AAC, Ogg Vorbis) all works on amd64. Also fine: AC3 and DTS pass-through over S/PDIF, deinterlacing with YADIF. New bugs: Encoding multichannel audio to AC3 at runtime is broken. --- $ mplayer -channels 6 -af lavcac3enc=1 /home/naddy/Sintel.2010.720p.SURROUND.x264-VODO.mp4 MPlayer SVN-r33017-snapshot-4.2.1 (C) 2000-2011 MPlayer Team Playing /home/naddy/Sintel.2010.720p.SURROUND.x264-VODO.mp4. libavformat file format detected. [lavf] stream 0: video (h264), -vid 0 [lavf] stream 1: audio (aac), -aid 0, -alang eng VIDEO: [H264] 1280x544 24bpp 24.000 fps 1615.8 kbps (197.2 kbyte/s) Clip info: major_brand: isom minor_version: 512 compatible_brands: isomiso2avc1mp41 creation_time: 1970-01-01 00:00:00 title: Sintel encoder: Lavf52.78.5 copyright: (c) Copyright 2010 Blender Foundation, all rights reserved description: Sintel open movie project Load subtitles in /home/naddy/ == Opening video decoder: [ffmpeg] FFmpeg's libavcodec codec family Selected video codec: [ffh264] vfm: ffmpeg (FFmpeg H.264) == == Opening audio decoder: [ffmpeg] FFmpeg/libavcodec audio decoders AUDIO: 48000 Hz, 6 ch, s16le, 440.8 kbit/9.56% (ratio: 55094-576000) Selected audio codec: [ffaac] afm: ffmpeg (FFmpeg AAC (MPEG-2/MPEG-4 Audio)) == [ac3_fixed @ 0xc2c6c0]Specified sample_fmt is not supported. AO: [sndio] 48000Hz 2ch ac3le (2 bytes per sample) Starting playback... MPlayer interrupted by signal 11 in module: decode_audio - MPlayer crashed by bad usage of CPU/FPU/RAM. Recompile MPlayer with --enable-debug and make a 'gdb' backtrace and disassembly. Details in DOCS/HTML/en/bugreports_what.html#bugreports_crash. - MPlayer crashed. This shouldn't happen. It can be a bug in the MPlayer code _or_ in your drivers _or_ in your gcc version. If you think it's MPlayer's fault, please read DOCS/HTML/en/bugreports.html and follow the instructions there. We can't and won't help unless you provide this information when reporting a possible bug. --- -- Christian naddy Weisgerber na...@mips.inka.de
Re: UPDATE: mplayer 20110303
On Sun, Mar 06, 2011 at 06:35:06PM +, Christian Weisgerber wrote:
Edd Barrett vex...@gmail.com wrote:
An update to mplayer.
For the archives, this is what I have so far -- with README formatting done and
a small (hopefully to grow) paragraph on mencoder test cases.
I think there is going to be an attempt to dynamically link ffmpeg, however it
needs to be brought up to date first.
Index: Makefile
===
RCS file: /cvs/openbsd/ports/x11/mplayer/Makefile,v
retrieving revision 1.181
diff -u -p -r1.181 Makefile
--- Makefile12 Feb 2011 10:49:36 - 1.181
+++ Makefile5 Mar 2011 20:47:40 -
@@ -5,19 +5,15 @@ ONLY_FOR_ARCHS = alpha amd64 arm i386 mi
COMMENT = movie player supporting many formats
-V =20101024
-V_DASHED = 2010-10-24
+V =20110303
SUBST_VARS += PREFIX CONFDIR
+# Distfiles must be hand-rolled, see README
N =mplayer
-DISTNAME = mplayer-export-snapshot-${V}
+DISTNAME = mplayer-${V}
PKGNAME = ${N}-${V}
-REVISION = 2
CATEGORIES = x11 multimedia
-EXTRACT_SUFX = .tar.bz2
-
-WRKDIST = ${WRKDIR}/mplayer-export-${V_DASHED}
HOMEPAGE = http://www.mplayerhq.hu/
@@ -28,8 +24,8 @@ PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = bz2 c cdda_interface cdda_paranoia crypto \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg=5 orc-0.4 png \
+ dv faac fribidi jpeg lcms \
+ m mng mp3lame ncurses ogg=5 orc-0.4 png \
pthread schroedinger-1.0=2.0 sndio speex stdc++ \
theora ungif util vpx x264=5 xvidcore z
@@ -58,7 +54,6 @@ LIB_DEPENDS = graphics/png \
graphics/libmng \
archivers/bzip2 \
multimedia/schroedinger=1.0.10 \
- audio/faad \
audio/faac \
multimedia/x264=20101023 \
multimedia/libvpx
@@ -97,10 +92,12 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-sunaudio \
--disable-vidix \
--disable-select \
- --disable-libcdio \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-faad-internal
+ --disable-libcdio
+# seems stable dvdnav does not work with a new mplayer.
+# if they make a release in the future, maybe we can pull that in,
+# but for now we have to use the internal one.
+# --disable-dvdread-internal \
+# --disable-libdvdcss-internal \
# gui is not supported anymore and we have better ones in ports
CONFIGURE_ARGS += --disable-gui
@@ -122,7 +119,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-ggi \
--disable-libopenjpeg \
--disable-mpg123 \
- --disable-librtmp
+ --disable-librtmp \
+ --disable-faad
# internal tremor, external tremor, external libvorbis all conflict
# we choose libvorbis to enable encoding to vorbis
@@ -219,12 +217,6 @@ post-extract:
# subst PREFIX in a patch, careful with update-patches!
pre-configure:
${SUBST_CMD} ${WRKSRC}/DOCS/xml/configure
-
-
-# Put a version.h in place so svn is not a BUILD_DEPEND
-# (see version.sh for how this was supposed to work).
-post-configure:
- cp ${FILESDIR}/version.h ${WRKDIST}/version.h
post-build:
@cd ${WRKSRC}/DOCS/xml ${MAKE_PROGRAM}
Index: README
===
RCS file: README
diff -N README
--- /dev/null 1 Jan 1970 00:00:00 -
+++ README 6 Mar 2011 22:48:57 -
@@ -0,0 +1,59 @@
+$OpenBSD$
+
+Porting notes for MPlayer
+=
+
+In addition to the comments in Makefile, porters should also read these
+notes:
+
+Selecting Codec Implementations
+---
+
+As a general rule, we prefer to use FFMPEG implementations, but only if
+they are good quality. If this is the case, try not to pull in external
+codec libraries for the same codec.
+
+There is an exception to this rule, which is where an external library
+provides an encoder and decoder, and there is a decoder for the given
+codec in FFMPEG, but no encoder; in such a case, go ahead and link the
+external library so that users can encode with mencoder.
+
+Be aware that some hardware lacks a floating point unit (ARM for
+example). On these architectures, you should select integer decoders
+where possible. Eg. Tremor instead of Vorbis.
+
+FFMPEG OGG Demuxer Bug
+--
+
+The pkg/README details a bug in the FFMPEG Ogg demuxer; You can test the
+existence of this bug with this URL:
+http://icecast.version6.net:/okul.ogg
+
+When a
Re: UPDATE: mplayer 20110303
On Sat, Mar 05, 2011 at 03:09:08PM +, Edd Barrett wrote: So here's an updated diff, disable external libfaad, as the internal ffmpeg one is of good quality and default. The updated diff also fixes the build on i386. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: UPDATE: mplayer 20110303
On Fri, Mar 04, 2011 at 04:11:50PM -0500, Brad wrote:
Try out all of your media and let me know how it goes.
As I pointed out in your other update attempt thread.. you missed
adding --disable-faad and removing the faad LIB_DEPENDS.
I tend to agree with Brad here.
So here's an updated diff, disable external libfaad, as the internal ffmpeg one
is of good quality and default.
I added some more notes in README about how we choose codec
implementations. CCing naddy as he taught me about this stuff at p2k10.
Can we find some testers for weird arches? I keep meaning to put myself on
want.html for an arm machine; does anyone have one spare?
Index: Makefile
===
RCS file: /cvs/openbsd/ports/x11/mplayer/Makefile,v
retrieving revision 1.181
diff -u -p -u -r1.181 Makefile
--- Makefile12 Feb 2011 10:49:36 - 1.181
+++ Makefile5 Mar 2011 14:47:09 -
@@ -5,19 +5,15 @@ ONLY_FOR_ARCHS = alpha amd64 arm i386 mi
COMMENT = movie player supporting many formats
-V =20101024
-V_DASHED = 2010-10-24
+V =20110303
SUBST_VARS += PREFIX CONFDIR
+# Distfiles must be hand-rolled, see README
N =mplayer
-DISTNAME = mplayer-export-snapshot-${V}
+DISTNAME = mplayer-${V}
PKGNAME = ${N}-${V}
-REVISION = 2
CATEGORIES = x11 multimedia
-EXTRACT_SUFX = .tar.bz2
-
-WRKDIST = ${WRKDIR}/mplayer-export-${V_DASHED}
HOMEPAGE = http://www.mplayerhq.hu/
@@ -28,8 +24,8 @@ PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = bz2 c cdda_interface cdda_paranoia crypto \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg=5 orc-0.4 png \
+ dv faac fribidi jpeg lcms \
+ m mng mp3lame ncurses ogg=5 orc-0.4 png \
pthread schroedinger-1.0=2.0 sndio speex stdc++ \
theora ungif util vpx x264=5 xvidcore z
@@ -58,7 +54,6 @@ LIB_DEPENDS = graphics/png \
graphics/libmng \
archivers/bzip2 \
multimedia/schroedinger=1.0.10 \
- audio/faad \
audio/faac \
multimedia/x264=20101023 \
multimedia/libvpx
@@ -97,10 +92,12 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-sunaudio \
--disable-vidix \
--disable-select \
- --disable-libcdio \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-faad-internal
+ --disable-libcdio
+# seems stable dvdnav does not work with a new mplayer.
+# if they make a release in the future, maybe we can pull that in,
+# but for now we have to use the internal one.
+# --disable-dvdread-internal \
+# --disable-libdvdcss-internal \
# gui is not supported anymore and we have better ones in ports
CONFIGURE_ARGS += --disable-gui
@@ -219,12 +216,6 @@ post-extract:
# subst PREFIX in a patch, careful with update-patches!
pre-configure:
${SUBST_CMD} ${WRKSRC}/DOCS/xml/configure
-
-
-# Put a version.h in place so svn is not a BUILD_DEPEND
-# (see version.sh for how this was supposed to work).
-post-configure:
- cp ${FILESDIR}/version.h ${WRKDIST}/version.h
post-build:
@cd ${WRKSRC}/DOCS/xml ${MAKE_PROGRAM}
Index: README
===
RCS file: README
diff -N README
--- /dev/null 1 Jan 1970 00:00:00 -
+++ README 5 Mar 2011 14:51:50 -
@@ -0,0 +1,48 @@
+Porting notes for MPlayer
+=
+
+In addition to the comments in Makefile, porters should also read these
+notes:
+
+Selecting Codec Implementations
+---
+
+As a general rule, we prefer to use FFMPEG implementations, but only if
+they are good quality. If this is the case, try not to pull in external
+codec libraries for the same codec.
+
+There is an exception to this rule, which is where an external library
+provides an ecoder and decoder, and there is a decoder for the given
+codec in FFMPEG, but no encoder; in such a case, go ahead and link the
+external library so that users can encode with mencoder.
+
+Be aware that some hardware lacks a floating point unit (ARM for
+example). On these architectures, you should select integer decoders
+where possible. Eg. Tremor instead of Vorbis.
+
+FFMPEG OGG Demuxer Bug
+--
+
+The pkg/README details a bug in the FFMPEG Ogg demuxer; You can test the
+existence of this bug with this URL:
+http://icecast.version6.net:/okul.ogg
+
+When a song ends, mplayer will stall saying it cannot fill the cache.
+
+Rolling a Distfile
+--
+
+MPlayer used to include the ffmpeg
Re: UPDATE: mplayer 20110303
On Sat, Mar 05, 2011 at 03:09:08PM +, Edd Barrett wrote: As I pointed out in your other update attempt thread.. you missed adding --disable-faad and removing the faad LIB_DEPENDS. I tend to agree with Brad here. So here's an updated diff, disable external libfaad, as the internal ffmpeg one is of good quality and default. --disable-faad is still missing in your diff. Ciao, Kili
Re: UPDATE: mplayer 20110303
On Sat, Mar 05, 2011 at 09:13:02PM +, Edd Barrett wrote:
Yah, attached an old diff.
README: Add $Id$ and fix typo:
Index: Makefile
===
RCS file: /cvs/openbsd/ports/x11/mplayer/Makefile,v
retrieving revision 1.181
diff -u -p -r1.181 Makefile
--- Makefile12 Feb 2011 10:49:36 - 1.181
+++ Makefile5 Mar 2011 20:47:40 -
@@ -5,19 +5,15 @@ ONLY_FOR_ARCHS = alpha amd64 arm i386 mi
COMMENT = movie player supporting many formats
-V =20101024
-V_DASHED = 2010-10-24
+V =20110303
SUBST_VARS += PREFIX CONFDIR
+# Distfiles must be hand-rolled, see README
N =mplayer
-DISTNAME = mplayer-export-snapshot-${V}
+DISTNAME = mplayer-${V}
PKGNAME = ${N}-${V}
-REVISION = 2
CATEGORIES = x11 multimedia
-EXTRACT_SUFX = .tar.bz2
-
-WRKDIST = ${WRKDIR}/mplayer-export-${V_DASHED}
HOMEPAGE = http://www.mplayerhq.hu/
@@ -28,8 +24,8 @@ PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = bz2 c cdda_interface cdda_paranoia crypto \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg=5 orc-0.4 png \
+ dv faac fribidi jpeg lcms \
+ m mng mp3lame ncurses ogg=5 orc-0.4 png \
pthread schroedinger-1.0=2.0 sndio speex stdc++ \
theora ungif util vpx x264=5 xvidcore z
@@ -58,7 +54,6 @@ LIB_DEPENDS = graphics/png \
graphics/libmng \
archivers/bzip2 \
multimedia/schroedinger=1.0.10 \
- audio/faad \
audio/faac \
multimedia/x264=20101023 \
multimedia/libvpx
@@ -97,10 +92,12 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-sunaudio \
--disable-vidix \
--disable-select \
- --disable-libcdio \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-faad-internal
+ --disable-libcdio
+# seems stable dvdnav does not work with a new mplayer.
+# if they make a release in the future, maybe we can pull that in,
+# but for now we have to use the internal one.
+# --disable-dvdread-internal \
+# --disable-libdvdcss-internal \
# gui is not supported anymore and we have better ones in ports
CONFIGURE_ARGS += --disable-gui
@@ -122,7 +119,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-ggi \
--disable-libopenjpeg \
--disable-mpg123 \
- --disable-librtmp
+ --disable-librtmp \
+ --disable-faad
# internal tremor, external tremor, external libvorbis all conflict
# we choose libvorbis to enable encoding to vorbis
@@ -219,12 +217,6 @@ post-extract:
# subst PREFIX in a patch, careful with update-patches!
pre-configure:
${SUBST_CMD} ${WRKSRC}/DOCS/xml/configure
-
-
-# Put a version.h in place so svn is not a BUILD_DEPEND
-# (see version.sh for how this was supposed to work).
-post-configure:
- cp ${FILESDIR}/version.h ${WRKDIST}/version.h
post-build:
@cd ${WRKSRC}/DOCS/xml ${MAKE_PROGRAM}
Index: README
===
RCS file: README
diff -N README
--- /dev/null 1 Jan 1970 00:00:00 -
+++ README 6 Mar 2011 02:39:38 -
@@ -0,0 +1,49 @@
+$Id$
+Porting notes for MPlayer
+=
+
+In addition to the comments in Makefile, porters should also read these
+notes:
+
+Selecting Codec Implementations
+---
+
+As a general rule, we prefer to use FFMPEG implementations, but only if
+they are good quality. If this is the case, try not to pull in external
+codec libraries for the same codec.
+
+There is an exception to this rule, which is where an external library
+provides an encoder and decoder, and there is a decoder for the given
+codec in FFMPEG, but no encoder; in such a case, go ahead and link the
+external library so that users can encode with mencoder.
+
+Be aware that some hardware lacks a floating point unit (ARM for
+example). On these architectures, you should select integer decoders
+where possible. Eg. Tremor instead of Vorbis.
+
+FFMPEG OGG Demuxer Bug
+--
+
+The pkg/README details a bug in the FFMPEG Ogg demuxer; You can test the
+existence of this bug with this URL:
+http://icecast.version6.net:/okul.ogg
+
+When a song ends, mplayer will stall saying it cannot fill the cache.
+
+Rolling a Distfile
+--
+
+MPlayer used to include the ffmpeg source, however, now the configure
+script checks it out from git, which we don't want to do. Moving targets
+will break and we don't want
Re: UPDATE: mplayer 20110303
On Sun, 6 Mar 2011, Edd Barrett wrote:
On Sat, Mar 05, 2011 at 09:13:02PM +, Edd Barrett wrote:
Yah, attached an old diff.
README: Add $Id$ and fix typo:
We don't use $Id$. Please use the usual OpenBSD tag.
Also add an empty line between the tag and the title of the readme
otherwise it becomes unreadable when expended. Thanks.
Index: Makefile
===
RCS file: /cvs/openbsd/ports/x11/mplayer/Makefile,v
retrieving revision 1.181
diff -u -p -r1.181 Makefile
--- Makefile 12 Feb 2011 10:49:36 - 1.181
+++ Makefile 5 Mar 2011 20:47:40 -
@@ -5,19 +5,15 @@ ONLY_FOR_ARCHS =alpha amd64 arm i386 mi
COMMENT =movie player supporting many formats
-V = 20101024
-V_DASHED = 2010-10-24
+V = 20110303
SUBST_VARS +=PREFIX CONFDIR
+# Distfiles must be hand-rolled, see README
N = mplayer
-DISTNAME = mplayer-export-snapshot-${V}
+DISTNAME = mplayer-${V}
PKGNAME =${N}-${V}
-REVISION = 2
CATEGORIES = x11 multimedia
-EXTRACT_SUFX = .tar.bz2
-
-WRKDIST =${WRKDIR}/mplayer-export-${V_DASHED}
HOMEPAGE = http://www.mplayerhq.hu/
@@ -28,8 +24,8 @@ PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB =bz2 c cdda_interface cdda_paranoia crypto \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg=5 orc-0.4 png \
+ dv faac fribidi jpeg lcms \
+ m mng mp3lame ncurses ogg=5 orc-0.4 png \
pthread schroedinger-1.0=2.0 sndio speex stdc++ \
theora ungif util vpx x264=5 xvidcore z
@@ -58,7 +54,6 @@ LIB_DEPENDS = graphics/png \
graphics/libmng \
archivers/bzip2 \
multimedia/schroedinger=1.0.10 \
- audio/faad \
audio/faac \
multimedia/x264=20101023 \
multimedia/libvpx
@@ -97,10 +92,12 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-sunaudio \
--disable-vidix \
--disable-select \
- --disable-libcdio \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-faad-internal
+ --disable-libcdio
+# seems stable dvdnav does not work with a new mplayer.
+# if they make a release in the future, maybe we can pull that in,
+# but for now we have to use the internal one.
+#--disable-dvdread-internal \
+#--disable-libdvdcss-internal \
# gui is not supported anymore and we have better ones in ports
CONFIGURE_ARGS += --disable-gui
@@ -122,7 +119,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-ggi \
--disable-libopenjpeg \
--disable-mpg123 \
- --disable-librtmp
+ --disable-librtmp \
+ --disable-faad
# internal tremor, external tremor, external libvorbis all conflict
# we choose libvorbis to enable encoding to vorbis
@@ -219,12 +217,6 @@ post-extract:
# subst PREFIX in a patch, careful with update-patches!
pre-configure:
${SUBST_CMD} ${WRKSRC}/DOCS/xml/configure
-
-
-# Put a version.h in place so svn is not a BUILD_DEPEND
-# (see version.sh for how this was supposed to work).
-post-configure:
- cp ${FILESDIR}/version.h ${WRKDIST}/version.h
post-build:
@cd ${WRKSRC}/DOCS/xml ${MAKE_PROGRAM}
Index: README
===
RCS file: README
diff -N README
--- /dev/null 1 Jan 1970 00:00:00 -
+++ README6 Mar 2011 02:39:38 -
@@ -0,0 +1,49 @@
+$Id$
+Porting notes for MPlayer
+=
+
+In addition to the comments in Makefile, porters should also read these
+notes:
+
+Selecting Codec Implementations
+---
+
+As a general rule, we prefer to use FFMPEG implementations, but only if
+they are good quality. If this is the case, try not to pull in external
+codec libraries for the same codec.
+
+There is an exception to this rule, which is where an external library
+provides an encoder and decoder, and there is a decoder for the given
+codec in FFMPEG, but no encoder; in such a case, go ahead and link the
+external library so that users can encode with mencoder.
+
+Be aware that some hardware lacks a floating point unit (ARM for
+example). On these architectures, you should select integer decoders
+where possible. Eg. Tremor instead of Vorbis.
+
+FFMPEG OGG Demuxer Bug
+--
+
+The pkg/README details a bug in the FFMPEG Ogg demuxer; You can test the
+existence of this bug with this URL:
+http://icecast.version6.net:/okul.ogg
+
+When a song ends,
Re: UPDATE: mplayer 20110303
On Fri, 4 Mar 2011, Edd Barrett wrote:
Hi,
An update to mplayer.
Tested on amd64 with smplayer and gnome-mplayer (not the version just posted).
Also tested basic functionality on sparc64.
Please read comments in the Makefile and README regarding specifically:
libdvdread, libdvdcss, distfile rolling etc.
The ffmpeg vorbis decoder changed significantly and now works unpatched,
however, unfortunatley the ogg streaming bug still exists.
Try out all of your media and let me know how it goes.
Are you certain the porters guide belong in a README meant for users?
I don't really have an opinion, but I want to raise the question, do we
consider these pkg-readmes as user/admin material or developer?
Index: Makefile
===
RCS file: /cvs/openbsd/ports/x11/mplayer/Makefile,v
retrieving revision 1.181
diff -u -p -u -r1.181 Makefile
--- Makefile 12 Feb 2011 10:49:36 - 1.181
+++ Makefile 4 Mar 2011 15:47:58 -
@@ -5,19 +5,15 @@ ONLY_FOR_ARCHS =alpha amd64 arm i386 mi
COMMENT =movie player supporting many formats
-V = 20101024
-V_DASHED = 2010-10-24
+V = 20110303
SUBST_VARS +=PREFIX CONFDIR
+# Distfiles must be hand-rolled, see README
N = mplayer
-DISTNAME = mplayer-export-snapshot-${V}
+DISTNAME = mplayer-${V}
PKGNAME =${N}-${V}
-REVISION = 2
CATEGORIES = x11 multimedia
-EXTRACT_SUFX = .tar.bz2
-
-WRKDIST =${WRKDIR}/mplayer-export-${V_DASHED}
HOMEPAGE = http://www.mplayerhq.hu/
@@ -28,8 +24,8 @@ PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB =bz2 c cdda_interface cdda_paranoia crypto \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg=5 orc-0.4 png \
+ dv faac faad fribidi jpeg lcms \
+ m mng mp3lame ncurses ogg=5 orc-0.4 png \
pthread schroedinger-1.0=2.0 sndio speex stdc++ \
theora ungif util vpx x264=5 xvidcore z
@@ -97,10 +93,12 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-sunaudio \
--disable-vidix \
--disable-select \
- --disable-libcdio \
- --disable-dvdread-internal \
- --disable-libdvdcss-internal \
- --disable-faad-internal
+ --disable-libcdio
+# seems stable dvdnav does not work with a new mplayer.
+# if they make a release in the future, maybe we can pull that in,
+# but for now we have to use the internal one.
+#--disable-dvdread-internal \
+#--disable-libdvdcss-internal \
# gui is not supported anymore and we have better ones in ports
CONFIGURE_ARGS += --disable-gui
@@ -219,12 +217,6 @@ post-extract:
# subst PREFIX in a patch, careful with update-patches!
pre-configure:
${SUBST_CMD} ${WRKSRC}/DOCS/xml/configure
-
-
-# Put a version.h in place so svn is not a BUILD_DEPEND
-# (see version.sh for how this was supposed to work).
-post-configure:
- cp ${FILESDIR}/version.h ${WRKDIST}/version.h
post-build:
@cd ${WRKSRC}/DOCS/xml ${MAKE_PROGRAM}
Index: README
===
RCS file: README
diff -N README
--- /dev/null 1 Jan 1970 00:00:00 -
+++ README3 Mar 2011 17:35:50 -
@@ -0,0 +1,28 @@
+Porting notes for MPlayer
+=
+
+In addition to the comments in Makefile, porters should also read these
notes:
+
+FFMPEG OGG Demuxer Bug
+--
+
+You can test the existence of the ffmpeg OGG demuxer bug with this URL:
+http://icecast.version6.net:/okul.ogg
+
+Rolling a Distfile
+--
+
+MPlayer used to include the ffmpeg source, now the configure script
+checks it out from git, which we don't want to do. Moving targets will
+break and we don't want git as a BUILD_DEPEND.
+
+Therefore we do this:
+
+svn checkout svn://svn.mplayerhq.hu/mplayer/trunk mplayer-MMDD
+cd mplayer-MMDD
+echo X-snapshot snapshot_version (where X is the svn revision)
+git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg
+find . -name '.svn' | xargs rm -Rf
+find . -name '.git' | xargs rm -Rf
+cd ..
+tar zcvf mplayer-MMDD.tar.gz mplayer-MMDD
Index: distinfo
===
RCS file: /cvs/openbsd/ports/x11/mplayer/distinfo,v
retrieving revision 1.34
diff -u -p -u -r1.34 distinfo
--- distinfo 8 Nov 2010 21:25:44 - 1.34
+++ distinfo 3 Mar 2011 14:37:23 -
@@ -1,5 +1,5 @@
-MD5 (mplayer-export-snapshot-20101024.tar.bz2) = F797FlNAF1eu01Goo2VXNw==
-RMD160 (mplayer-export-snapshot-20101024.tar.bz2) =
S9533qXXp0k7Y5TXnXHbk4yfRBs=
Re: UPDATE: mplayer 20110303
On Fri, 4 Mar 2011, Edd Barrett wrote: To clarify, there are two READMEs involved: * x11/mplayer/pkg/README - user docs. make it into the package. * x11/mplayer/README - notes for me and others working on the port. This is the way I did print/texlive2010 too. I can change this if you like, perhaps the comments for developers should all be in comments in the Makefile? However, I don't think it is that important. Perhaps we should introduce the convention of using the name README.porters? No no, what you did is fine. I missed the fact it wasn't a pkg-readmes. -- Antoine
Re: UPDATE: mplayer 20110303
On Fri, Mar 04, 2011 at 06:41:00PM +0100, Antoine Jacoutot wrote: On Fri, 4 Mar 2011, Edd Barrett wrote: Hi, An update to mplayer. Tested on amd64 with smplayer and gnome-mplayer (not the version just posted). Also tested basic functionality on sparc64. Please read comments in the Makefile and README regarding specifically: libdvdread, libdvdcss, distfile rolling etc. The ffmpeg vorbis decoder changed significantly and now works unpatched, however, unfortunatley the ogg streaming bug still exists. Try out all of your media and let me know how it goes. Are you certain the porters guide belong in a README meant for users? I don't really have an opinion, but I want to raise the question, do we consider these pkg-readmes as user/admin material or developer? To clarify, there are two READMEs involved: * x11/mplayer/pkg/README - user docs. make it into the package. * x11/mplayer/README - notes for me and others working on the port. This is the way I did print/texlive2010 too. I can change this if you like, perhaps the comments for developers should all be in comments in the Makefile? However, I don't think it is that important. Perhaps we should introduce the convention of using the name README.porters? -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: UPDATE: mplayer 20110303
On Fri, Mar 04, 2011 at 07:10:30PM +0100, Antoine Jacoutot wrote: On Fri, 4 Mar 2011, Edd Barrett wrote: To clarify, there are two READMEs involved: * x11/mplayer/pkg/README - user docs. make it into the package. * x11/mplayer/README - notes for me and others working on the port. This is the way I did print/texlive2010 too. I can change this if you like, perhaps the comments for developers should all be in comments in the Makefile? However, I don't think it is that important. Perhaps we should introduce the convention of using the name README.porters? No no, what you did is fine. I missed the fact it wasn't a pkg-readmes. OK cool. The build fails on i386 because we ran out of registers. Will find time to fix that sometime tomorrow probably. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: UPDATE: mplayer 20110303
On 04/03/11 11:07 AM, Edd Barrett wrote: Hi, An update to mplayer. Tested on amd64 with smplayer and gnome-mplayer (not the version just posted). Also tested basic functionality on sparc64. Please read comments in the Makefile and README regarding specifically: libdvdread, libdvdcss, distfile rolling etc. The ffmpeg vorbis decoder changed significantly and now works unpatched, however, unfortunatley the ogg streaming bug still exists. Try out all of your media and let me know how it goes. As I pointed out in your other update attempt thread.. you missed adding --disable-faad and removing the faad LIB_DEPENDS. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: mplayer
On Sun, Oct 31, 2010 at 11:40:38PM +, Christian Weisgerber wrote: Jacob Meuser jake...@sdf.lonestar.org wrote: CONFIGURE_ARGS+= --disable-mp3lib --enable-mpg123 LIB_DEPENDS+= ::audio/mpg123 WANTLIB+= mpg123 doesn't that produce a symbol mismatch warning between libmp3lame and libmpg123? I don't see this on amd64. I need to recheck this, as I did see this at p2k10. I was noticing that at p2k10, which is why --disable-mpg123 is being used. We should try to keep the external dependencies at a minimum. We have four MP3 decoders, in order of default preference: mp3 mp3lib internalfloating point mpg123 mpg123 externalfloating point/integer ffmp3float ffmpeg internalfloating point ffmp3 ffmpeg internalinteger With the exception of ffmp3float, which doesn't work at all with sndio, any of these will do. The only restriction is that you want an integer decoder on arm machines, ergo: non-arm arm mp3 on off mpg123 off off ffmp3float off off ffmp3 on on The above comment should go into the Makefile for reference. It is annoying that he have to revisit this same mess every frigging time mplayer is updated. Tell me about it. To add to this, I have found that mencoder is not really maintained anymore. This leads me to think that we should disable it and tell user's to use ffmpeg for encoding. But I bet someone is using mencoder... -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: UPDATE: mplayer
On Mon, Nov 01, 2010 at 09:44:27AM +, Edd Barrett wrote: To add to this, I have found that mencoder is not really maintained anymore. The state of mencoder is: muxing to anything other than mpeg or avi is fubar. I think we can leave it enabled but write something to that effect in pkg/README. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: UPDATE: mplayer
Christian Weisgerber na...@mips.inka.de wrote:
Can you send a new diff with these fixes you have been sending:
- vorbis/tremor stuff with exceptions for arm + configure patch updated
- mp3lib as above
After mulling over the issue, I decided against bringing in libmpg123
and in favor of knocking out the ffmp3float decoder.
More tweaks.
* Make the sndio backend behave like the other ones: on encountering
a format it can't handle, such as floating point, set audio to a
standard format (S16NE) and mplayer will automatically insert a
conversion filter. This allows ffmp3float to work and mirrors the
behavior on other platforms.
* There are in fact configure script options to disable individual
components of the included FFmpeg. Use them to knock out common or
obvious floating point decoders on arm where a fall-back to an integer
decoder is available.
I'm sorry, the space of possible configurations for this program is
enormous, and we are stumbling around...
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.174
diff -u -p -r1.174 Makefile
--- Makefile24 Oct 2010 21:15:33 - 1.174
+++ Makefile1 Nov 2010 11:20:46 -
@@ -1,19 +1,18 @@
# $OpenBSD: Makefile,v 1.174 2010/10/24 21:15:33 ajacoutot Exp $
# May not be hard to add more.
-ONLY_FOR_ARCHS=amd64 i386 powerpc sparc64 arm mips64 mips64el
+ONLY_FOR_ARCHS=amd64 arm i386 mips64 mips64el powerpc sparc64
COMMENT= movie player supporting many formats
-V= 20100308
-V_DASHED= 2010-03-08
+V= 20101024
+V_DASHED= 2010-10-24
SUBST_VARS+= PREFIX CONFDIR
N= mplayer
DISTNAME= mplayer-export-snapshot-${V}
PKGNAME= ${N}-${V}
-REVISION= 5
CATEGORIES=x11 multimedia
EXTRACT_SUFX= .tar.bz2
@@ -26,19 +25,18 @@ PERMIT_PACKAGE_CDROM= patents
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= a52 bz2 c cdda_interface cdda_paranoia crypto dca \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg.=5 orc-0.4 png \
- pthread schroedinger-1.0 sndio speex stdc++ theora \
- ungif util x264.=3 xvidcore z
+
+WANTLIB= bz2 c cdda_interface cdda_paranoia crypto \
+ dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
+ m mng mp3lame mpcdec ncurses ogg.=5 orc-0.4 png \
+ pthread schroedinger-1.0 sndio speex stdc++ theora \
+ ungif util vpx x264.=5 xvidcore z
# we use a snapshot
MASTER_SITES= http://theunixzoo.co.uk/distfiles/
MAINTAINER=Edd Barrett e...@openbsd.org
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-
MODULES+= converters/libiconv
LIB_DEPENDS= ::graphics/png \
@@ -57,13 +55,12 @@ LIB_DEPENDS=::graphics/png \
::devel/fribidi \
::graphics/lcms \
::graphics/libmng \
- ::audio/libdca \
::archivers/bzip2 \
::multimedia/schroedinger \
::audio/faad \
::audio/faac \
- ::audio/liba52 \
- ::multimedia/x264
+ :x264-=20101023:multimedia/x264 \
+ ::multimedia/libvpx
BUILD_DEPENDS= ::net/livemedia \
:rtunes-=0.8:audio/rtunes \
@@ -81,37 +78,60 @@ CONFDIR=${SYSCONFDIR}/mplayer
USE_GMAKE= Yes
USE_GROFF =Yes
+MAKE_ENV= V=1 # turn on verbose ffmpeg build
CONFIGURE_STYLE=simple
+
+# CONFIGURE_ARGS for misc stuff
+CONFIGURE_ARGS+=--confdir=${CONFDIR} \
+ --mandir=${LOCALBASE}/man \
+ --extra-cflags=-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng \
+ --extra-ldflags=-L${LOCALBASE}/lib \
+ --extra-libs-mplayer=-lrtunes -lcrypto
+
+# CONFIGURE_ARGS that disable internal stuff
CONFIGURE_ARGS+=--disable-alsa \
--disable-arts \
--disable-esd \
--disable-ossaudio \
- --disable-nas \
- --disable-liblzo \
- --disable-caca \
--disable-vidix \
- --disable-smb \
--disable-select \
- --disable-langinfo \
- --disable-openal \
- --disable-libvorbis \
- --disable-tremor \
- --disable-mad \
--disable-libcdio \
- --disable-toolame \
--disable-dvdread-internal \
--disable-libdvdcss-internal \
- --disable-faad-internal \
- --disable-gui \
+ --disable-faad-internal
+# gui is not supported
Re: UPDATE: mplayer
On Mon, Nov 01, 2010 at 11:29:25AM +, Christian Weisgerber wrote:
Christian Weisgerber na...@mips.inka.de wrote:
Can you send a new diff with these fixes you have been sending:
- vorbis/tremor stuff with exceptions for arm + configure patch updated
- mp3lib as above
After mulling over the issue, I decided against bringing in libmpg123
and in favor of knocking out the ffmp3float decoder.
More tweaks.
* Make the sndio backend behave like the other ones: on encountering
a format it can't handle, such as floating point, set audio to a
standard format (S16NE) and mplayer will automatically insert a
conversion filter. This allows ffmp3float to work and mirrors the
behavior on other platforms.
* There are in fact configure script options to disable individual
components of the included FFmpeg. Use them to knock out common or
obvious floating point decoders on arm where a fall-back to an integer
decoder is available.
Good finds.
I'm sorry, the space of possible configurations for this program is
enormous, and we are stumbling around...
Yep, insanity.
To add to the above improvements:
* add a note in README about broken mencoder muxers.
* add '-OpenBSD' to version sting as suggested in mplayer's binary packaging
guidelines.
How close is this to ready? Are your arm bits tested? x264 testing/polishing is
almost complete.
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.174
diff -u -p -u -r1.174 Makefile
--- Makefile24 Oct 2010 21:15:33 - 1.174
+++ Makefile2 Nov 2010 00:07:56 -
@@ -1,19 +1,18 @@
# $OpenBSD: Makefile,v 1.174 2010/10/24 21:15:33 ajacoutot Exp $
# May not be hard to add more.
-ONLY_FOR_ARCHS=amd64 i386 powerpc sparc64 arm mips64 mips64el
+ONLY_FOR_ARCHS=amd64 arm i386 mips64 mips64el powerpc sparc64
COMMENT= movie player supporting many formats
-V= 20100308
-V_DASHED= 2010-03-08
+V= 20101024
+V_DASHED= 2010-10-24
SUBST_VARS+= PREFIX CONFDIR
N= mplayer
DISTNAME= mplayer-export-snapshot-${V}
PKGNAME= ${N}-${V}
-REVISION= 5
CATEGORIES=x11 multimedia
EXTRACT_SUFX= .tar.bz2
@@ -26,19 +25,18 @@ PERMIT_PACKAGE_CDROM= patents
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= a52 bz2 c cdda_interface cdda_paranoia crypto dca \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg.=5 orc-0.4 png \
- pthread schroedinger-1.0 sndio speex stdc++ theora \
- ungif util x264.=3 xvidcore z
+
+WANTLIB= bz2 c cdda_interface cdda_paranoia crypto \
+ dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
+ m mng mp3lame mpcdec ncurses ogg.=5 orc-0.4 png \
+ pthread schroedinger-1.0 sndio speex stdc++ theora \
+ ungif util vpx x264.=5 xvidcore z
# we use a snapshot
MASTER_SITES= http://theunixzoo.co.uk/distfiles/
MAINTAINER=Edd Barrett e...@openbsd.org
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-
MODULES+= converters/libiconv
LIB_DEPENDS= ::graphics/png \
@@ -57,13 +55,12 @@ LIB_DEPENDS=::graphics/png \
::devel/fribidi \
::graphics/lcms \
::graphics/libmng \
- ::audio/libdca \
::archivers/bzip2 \
::multimedia/schroedinger \
::audio/faad \
::audio/faac \
- ::audio/liba52 \
- ::multimedia/x264
+ :x264-=20101023:multimedia/x264 \
+ ::multimedia/libvpx
BUILD_DEPENDS= ::net/livemedia \
:rtunes-=0.8:audio/rtunes \
@@ -81,37 +78,60 @@ CONFDIR=${SYSCONFDIR}/mplayer
USE_GMAKE= Yes
USE_GROFF =Yes
+MAKE_ENV= V=1 # turn on verbose ffmpeg build
CONFIGURE_STYLE=simple
+
+# CONFIGURE_ARGS for misc stuff
+CONFIGURE_ARGS+=--confdir=${CONFDIR} \
+ --mandir=${LOCALBASE}/man \
+ --extra-cflags=-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng \
+ --extra-ldflags=-L${LOCALBASE}/lib \
+ --extra-libs-mplayer=-lrtunes -lcrypto
+
+# CONFIGURE_ARGS that disable internal stuff
CONFIGURE_ARGS+=--disable-alsa \
--disable-arts \
--disable-esd \
--disable-ossaudio \
- --disable-nas \
- --disable-liblzo \
- --disable-caca \
--disable-vidix \
- --disable-smb \
--disable-select \
- --disable-langinfo \
- --disable-openal \
-
Re: UPDATE: mplayer
Christian Weisgerber na...@mips.inka.de wrote: Ogg Vorbis streaming is broken. Try this: http://icecast.version6.net:/okul.ogg This appears to be a bug in FFmpeg's demuxer (lavf). A workaround is to use mplayer -demuxer ogg. This doesn't quite cooperate with the default ffvorbis decoder, causing an error and fallback to the next decoder in line (currently tremor). Not pretty, but not a problem. -- Christian naddy Weisgerber na...@mips.inka.de
Re: UPDATE: mplayer
Edd Barrett vex...@gmail.com wrote:
.if ${MACHINE_ARCH:Marm}
CONFIGURE_ARGS+=--disable-mp3lib
+# again old binutils...
CONFIGURE_ARGS+=--target=generic-openbsd
.endif
Has anybody tested on arm?
If I disable mp3lib on other archs, mplayer now falls back to the
ffmp3float decoder (which doesn't work anywhere with sndio, since
it wants to output floating point samples) instead of the expected
ffmp3.
--
Christian naddy Weisgerber na...@mips.inka.de
Re: UPDATE: mplayer
Christian Weisgerber na...@mips.inka.de wrote: Has anybody tested on arm? If I disable mp3lib on other archs, mplayer now falls back to the ffmp3float decoder (which doesn't work anywhere with sndio, since it wants to output floating point samples) instead of the expected ffmp3. The easiest way to untangle this mess may be to disable the built-in mp3lib and use external mpg123 as the preferred MP3 decoder. libmpg123 is already built as an integer decoder on arm. CONFIGURE_ARGS+= --disable-mp3lib --enable-mpg123 LIB_DEPENDS+= ::audio/mpg123 WANTLIB+= mpg123 -- Christian naddy Weisgerber na...@mips.inka.de
Re: UPDATE: mplayer
On Sun, Oct 31, 2010 at 03:00:15PM +, Christian Weisgerber wrote: Christian Weisgerber na...@mips.inka.de wrote: Has anybody tested on arm? If I disable mp3lib on other archs, mplayer now falls back to the ffmp3float decoder (which doesn't work anywhere with sndio, since it wants to output floating point samples) instead of the expected ffmp3. The easiest way to untangle this mess may be to disable the built-in mp3lib and use external mpg123 as the preferred MP3 decoder. libmpg123 is already built as an integer decoder on arm. CONFIGURE_ARGS+= --disable-mp3lib --enable-mpg123 LIB_DEPENDS+= ::audio/mpg123 WANTLIB+= mpg123 Can you send a new diff with these fixes you have been sending: - vorbis/tremor stuff with exceptions for arm + configure patch updated - mp3lib as above I have been in contact with mplayer devs and they have reprodoced the ogg demuxer problem. I reported the bug upstream: https://roundup.ffmpeg.org/issue2337 -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: UPDATE: mplayer
Edd Barrett vex...@gmail.com wrote:
Can you send a new diff with these fixes you have been sending:
- vorbis/tremor stuff with exceptions for arm + configure patch updated
- mp3lib as above
After mulling over the issue, I decided against bringing in libmpg123
and in favor of knocking out the ffmp3float decoder.
Changes from the previous diff:
* Use libvorbis instead of internal tremor (except on arm).
* Disable ffmp3float.
* Disable external liba52. This is entirely superseded by ffac3 now.
Preferred codecs on non-arm:
* MP3:mp3lib
* Vorbis: ffvorbis, fall-back to vorbis
On arm:
* MP3:ffmp3
* Vorbis: ffvorbis, fall-back to tremor
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.174
diff -u -p -r1.174 Makefile
--- Makefile24 Oct 2010 21:15:33 - 1.174
+++ Makefile31 Oct 2010 20:21:21 -
@@ -1,19 +1,18 @@
# $OpenBSD: Makefile,v 1.174 2010/10/24 21:15:33 ajacoutot Exp $
# May not be hard to add more.
-ONLY_FOR_ARCHS=amd64 i386 powerpc sparc64 arm mips64 mips64el
+ONLY_FOR_ARCHS=amd64 arm i386 mips64 mips64el powerpc sparc64
COMMENT= movie player supporting many formats
-V= 20100308
-V_DASHED= 2010-03-08
+V= 20101024
+V_DASHED= 2010-10-24
SUBST_VARS+= PREFIX CONFDIR
N= mplayer
DISTNAME= mplayer-export-snapshot-${V}
PKGNAME= ${N}-${V}
-REVISION= 5
CATEGORIES=x11 multimedia
EXTRACT_SUFX= .tar.bz2
@@ -26,19 +25,18 @@ PERMIT_PACKAGE_CDROM= patents
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= a52 bz2 c cdda_interface cdda_paranoia crypto dca \
- dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
- m mng mp3lame mpcdec ncurses ogg.=5 orc-0.4 png \
- pthread schroedinger-1.0 sndio speex stdc++ theora \
- ungif util x264.=3 xvidcore z
+
+WANTLIB= bz2 c cdda_interface cdda_paranoia crypto \
+ dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
+ m mng mp3lame mpcdec ncurses ogg.=5 orc-0.4 png \
+ pthread schroedinger-1.0 sndio speex stdc++ theora \
+ ungif util vpx x264.=5 xvidcore z
# we use a snapshot
MASTER_SITES= http://theunixzoo.co.uk/distfiles/
MAINTAINER=Edd Barrett e...@openbsd.org
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-
MODULES+= converters/libiconv
LIB_DEPENDS= ::graphics/png \
@@ -57,13 +55,12 @@ LIB_DEPENDS=::graphics/png \
::devel/fribidi \
::graphics/lcms \
::graphics/libmng \
- ::audio/libdca \
::archivers/bzip2 \
::multimedia/schroedinger \
::audio/faad \
::audio/faac \
- ::audio/liba52 \
- ::multimedia/x264
+ :x264-=20101023:multimedia/x264 \
+ ::multimedia/libvpx
BUILD_DEPENDS= ::net/livemedia \
:rtunes-=0.8:audio/rtunes \
@@ -81,37 +78,60 @@ CONFDIR=${SYSCONFDIR}/mplayer
USE_GMAKE= Yes
USE_GROFF =Yes
+MAKE_ENV= V=1 # turn on verbose ffmpeg build
CONFIGURE_STYLE=simple
+
+# CONFIGURE_ARGS for misc stuff
+CONFIGURE_ARGS+=--confdir=${CONFDIR} \
+ --mandir=${LOCALBASE}/man \
+ --extra-cflags=-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng \
+ --extra-ldflags=-L${LOCALBASE}/lib \
+ --extra-libs-mplayer=-lrtunes -lcrypto
+
+# CONFIGURE_ARGS that disable internal stuff
CONFIGURE_ARGS+=--disable-alsa \
--disable-arts \
--disable-esd \
--disable-ossaudio \
- --disable-nas \
- --disable-liblzo \
- --disable-caca \
--disable-vidix \
- --disable-smb \
--disable-select \
- --disable-langinfo \
- --disable-openal \
- --disable-libvorbis \
- --disable-tremor \
- --disable-mad \
--disable-libcdio \
- --disable-toolame \
--disable-dvdread-internal \
--disable-libdvdcss-internal \
- --disable-faad-internal \
- --disable-gui \
+ --disable-faad-internal
+# gui is not supported anymore and we have better ones in ports
+CONFIGURE_ARGS+=--disable-gui
+
+# CONFIGURE_ARGS that enable internal stuff
+CONFIGURE_ARGS+=--enable-menu
+
+# CONFIGURE_ARGS that disable external stuff
+CONFIGURE_ARGS+=--disable-smb \
+ --disable-liblzo \
+ --disable-nas \
+ --disable-caca \
+
Re: UPDATE: mplayer
On Sun, Oct 31, 2010 at 03:00:15PM +, Christian Weisgerber wrote: Christian Weisgerber na...@mips.inka.de wrote: Has anybody tested on arm? If I disable mp3lib on other archs, mplayer now falls back to the ffmp3float decoder (which doesn't work anywhere with sndio, since it wants to output floating point samples) instead of the expected ffmp3. The easiest way to untangle this mess may be to disable the built-in mp3lib and use external mpg123 as the preferred MP3 decoder. libmpg123 is already built as an integer decoder on arm. CONFIGURE_ARGS+= --disable-mp3lib --enable-mpg123 LIB_DEPENDS+= ::audio/mpg123 WANTLIB+= mpg123 doesn't that produce a symbol mismatch warning between libmp3lame and libmpg123? I was noticing that at p2k10, which is why --disable-mpg123 is being used. -- Christian naddy Weisgerber na...@mips.inka.de -- jake...@sdf.lonestar.org SDF Public Access UNIX System - http://sdf.lonestar.org
Re: UPDATE: mplayer
Jacob Meuser jake...@sdf.lonestar.org wrote: CONFIGURE_ARGS+= --disable-mp3lib --enable-mpg123 LIB_DEPENDS+= ::audio/mpg123 WANTLIB+= mpg123 doesn't that produce a symbol mismatch warning between libmp3lame and libmpg123? I don't see this on amd64. I was noticing that at p2k10, which is why --disable-mpg123 is being used. We should try to keep the external dependencies at a minimum. We have four MP3 decoders, in order of default preference: mp3 mp3lib internalfloating point mpg123 mpg123 externalfloating point/integer ffmp3float ffmpeg internalfloating point ffmp3 ffmpeg internalinteger With the exception of ffmp3float, which doesn't work at all with sndio, any of these will do. The only restriction is that you want an integer decoder on arm machines, ergo: non-arm arm mp3 on off mpg123 off off ffmp3float off off ffmp3 on on I guess we could disable mp3 everywhere, but then ffmp3 is a bit chatty (see song30.mp3 and song32.mp3) and the mplayer people still think that mp3 is somewhat preferable. It is annoying that he have to revisit this same mess every frigging time mplayer is updated. -- Christian naddy Weisgerber na...@mips.inka.de
