mplayer: bump version to snapshot 20210729

2026-05-06 06:58:57 +02:00 · 2022-02-22 17:21:13 +01:00
parent 82f0a2f8f3
commit 1791655bca
2 changed files with 59 additions and 82 deletions
--- a/media-video/mplayer/mplayer-1.4.0_20210729.recipe
+++ b/media-video/mplayer/mplayer-1.4.0_20210729.recipe
@@ -22,11 +22,11 @@ DVD subtitles (SPU streams, VOBsub and Closed Captions) are supported as well."
 HOMEPAGE="http://www.mplayerhq.hu/"
 COPYRIGHT="2001-2019 The MPlayer Team"
 LICENSE="GNU LGPL v2.1"
-REVISION="13"
-SOURCE_URI="http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.4.tar.xz"
-CHECKSUM_SHA256="82596ed558478d28248c7bc3828eb09e6948c099bbd76bb7ee745a0e3275b548"
-SOURCE_DIR="MPlayer-1.4"
-PATCHES="mplayer_x86-$portVersion.patchset"
+REVISION="1"
+SOURCE_URI="https://anduin.linuxfromscratch.org/BLFS/mplayer/mplayer-export-2021-07-29.tar.bz2"
+CHECKSUM_SHA256="fc15102b81440dcd297258f3b2afefe6930ce8791985d0ca8c38555e56bf07b1"
+SOURCE_DIR="mplayer-export-2021-07-29"
+PATCHES="mplayer-1.4.0_20210729.patchset"
 ADDITIONAL_FILES="mplayer.rdef.in"

 ARCHITECTURES="all !x86_gcc2"
@@ -89,6 +89,7 @@ REQUIRES="
 	lib:libsmbclient$secondaryArchSuffix
 	lib:libspeex$secondaryArchSuffix
 #	lib:libssl$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
 	lib:libswscale$secondaryArchSuffix
 	lib:libswresample$secondaryArchSuffix
 	lib:libtheoradec$secondaryArchSuffix
@@ -103,9 +104,9 @@ REQUIRES="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libavcodec$secondaryArchSuffix
-	devel:libavformat$secondaryArchSuffix
-	devel:libavutil$secondaryArchSuffix
+	devel:libavcodec$secondaryArchSuffix >= 59
+	devel:libavformat$secondaryArchSuffix >= 59
+	devel:libavutil$secondaryArchSuffix >= 57
 	devel:liba52$secondaryArchSuffix
 	devel:libbz2$secondaryArchSuffix
 	devel:libcaca$secondaryArchSuffix
@@ -147,8 +148,8 @@ BUILD_REQUIRES="
 	devel:libsmbclient$secondaryArchSuffix
 	devel:libspeex$secondaryArchSuffix
 #	devel:libssl$secondaryArchSuffix
-	devel:libswscale$secondaryArchSuffix
-	devel:libswresample$secondaryArchSuffix
+	devel:libswresample$secondaryArchSuffix >= 4
+	devel:libswscale$secondaryArchSuffix >= 6
 	devel:libtheoradec$secondaryArchSuffix
 	devel:libtwolame$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
@@ -201,7 +202,8 @@ INSTALL()

 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	#local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local MINOR="0"
 	sed \
 		-e "s|@MAJOR@|$MAJOR|" \
 		-e "s|@MIDDLE@|$MIDDLE|" \
--- a/media-video/mplayer/patches/mplayer-1.4.0_20210729.patchset
+++ b/media-video/mplayer/patches/mplayer-1.4.0_20210729.patchset
@@ -1,37 +1,14 @@
-From fa11c15302e76a470d9ae76c6983e74cceafb61f Mon Sep 17 00:00:00 2001
+From fdc110ed7092d15c47daa7ef14415d6ca4d729f6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Mon, 22 Apr 2019 11:38:50 +0200
-Subject: [PATCH] Haiku
+Subject: Haiku

---
- Makefile               |   3 +
- configure              |  42 +++++-
- libao2/ao_haiku.cpp    | 195 ++++++++++++++++++++++++++
- libao2/audio_out.c     |   7 +
- libvo/haiku_common.cpp | 304 +++++++++++++++++++++++++++++++++++++++++
- libvo/haiku_common.h   |  69 ++++++++++
- libvo/haiku_view.cpp   | 171 +++++++++++++++++++++++
- libvo/haiku_view.h     |  36 +++++
- libvo/haiku_window.cpp | 125 +++++++++++++++++
- libvo/haiku_window.h   |  31 +++++
- libvo/video_out.c      |   4 +
- libvo/vo_haiku.cpp     | 201 +++++++++++++++++++++++++++
- path.c                 |  18 +++
- 13 files changed, 1203 insertions(+), 3 deletions(-)
- create mode 100644 libao2/ao_haiku.cpp
- create mode 100644 libvo/haiku_common.cpp
- create mode 100644 libvo/haiku_common.h
- create mode 100644 libvo/haiku_view.cpp
- create mode 100644 libvo/haiku_view.h
- create mode 100644 libvo/haiku_window.cpp
- create mode 100644 libvo/haiku_window.h
- create mode 100644 libvo/vo_haiku.cpp

 diff --git a/Makefile b/Makefile
-index efa871d..aec5a2f 100644
+index 94ef503..e5c4b3a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -544,6 +544,9 @@ SRCS_MPLAYER-$(S3FB)          += libvo/vo_s3fb.c
+@@ -546,6 +546,9 @@ SRCS_MPLAYER-$(S3FB)          += libvo/vo_s3fb.c
 SRCS_MPLAYER-$(SDL)           += libao2/ao_sdl.c                        \
                                  libvo/vo_sdl.c                         \
                                  libvo/sdl_common.c
@@ -42,18 +19,25 @@ index efa871d..aec5a2f 100644
 SRCS_MPLAYER-$(SNDIO)         += libao2/ao_sndio.c
 SRCS_MPLAYER-$(SUNAUDIO)      += libao2/ao_sun.c
 diff --git a/configure b/configure
-index d1aa8cd..52aa9b5 100755
+index abb3643..b71c6c1 100755
 --- a/configure
 +++ b/configure
-@@ -228,6 +228,7 @@ qnx()       { issystem "QNX"; }
- sunos()     { issystem "SunOS"; }
+@@ -233,12 +233,13 @@ sunos()     { issystem "SunOS"; }
 wine()      { issystem "Wine"; }
 win32()     { cygwin || mingw32 || wine; }
+ msvc()      { test "$cc_vendor" = "msvc"; }
 +haiku()      { issystem "Haiku"; }
-
+ 
 # arch test boolean functions
 # x86/x86pc is used by QNX
-@@ -469,6 +470,7 @@ Video output:
+ x86_32() {
+   case "$host_arch" in
+-    i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) return 0 ;;
+    i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686|BePC) return 0 ;;
+     *) return 1 ;;
+   esac
+ }
+@@ -484,6 +485,7 @@ Video output:
   --enable-vesa            enable VESA video output [autodetect]
   --enable-svga            enable SVGAlib video output [autodetect]
   --enable-sdl             enable SDL video output [autodetect]
@@ -61,7 +45,7 @@ index d1aa8cd..52aa9b5 100755
   --enable-kva             enable KVA video output [autodetect]
   --enable-aa              enable AAlib video output [autodetect]
   --enable-caca            enable CACA  video output [autodetect]
-@@ -682,6 +684,7 @@ _xvmc=no  #auto when complete
+@@ -702,6 +704,7 @@ _xvmc=no  #auto when complete
 _vda=auto
 _vdpau=auto
 _sdl=auto
@@ -69,7 +53,7 @@ index d1aa8cd..52aa9b5 100755
 _kva=auto
 _direct3d=auto
 _directx=auto
-@@ -1033,6 +1036,8 @@ for ac_option do
+@@ -1058,6 +1061,8 @@ for ac_option do
   --disable-vdpau)      _vdpau=no       ;;
   --enable-sdl)         _sdl=yes        ;;
   --disable-sdl)        _sdl=no         ;;
@@ -78,7 +62,7 @@ index d1aa8cd..52aa9b5 100755
   --enable-kva)         _kva=yes        ;;
   --disable-kva)        _kva=no         ;;
   --enable-direct3d)    _direct3d=yes   ;;
-@@ -1676,7 +1681,7 @@ else
+@@ -1768,7 +1773,7 @@ else
       cc_name=$cc_name_tmp
       echocheck "$_cc version"
       cc_vendor=gnu
@@ -87,16 +71,7 @@ index d1aa8cd..52aa9b5 100755
       case $cc_version in
         2.96*)
           cc_fail=yes
-@@ -1746,7 +1751,7 @@ if test -z "$_target" ; then
-   # host's CPU/instruction set
-   set_host_arch() {
-   case "$1" in
-      x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
-+      x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;;
-       ia64) host_arch=ia64 ;;
-       macppc|ppc*|Power*) host_arch=ppc ;;
-       alpha) host_arch=alpha ;;
-@@ -1785,6 +1790,7 @@ else # if test -z "$_target"
+@@ -1877,6 +1882,7 @@ else # if test -z "$_target"
       amigaos) system_name=AmigaOS ;;
       mingw32*) system_name=MINGW32 ;;
       wine) system_name=Wine ;;
@@ -104,10 +79,10 @@ index d1aa8cd..52aa9b5 100755
     esac
   done
   # We need to convert underscores so that values like k6-2 and pentium-mmx can be passed
-@@ -1863,6 +1869,11 @@ if wine ; then
-   extra_cflags="-fno-pic -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ -DWINE_NOWINSOCK $extra_cflags"
+@@ -1956,6 +1962,11 @@ if wine ; then
+   libs_mplayer="$libs_mplayer -lshell32"
 fi
-
+ 
 +if haiku ; then
 +  extra_ldflags="$extra_ldflags -lbe -lmedia -lsupc++"
 +  extra_cflags="-fno-pic $extra_cflags"
@@ -116,10 +91,10 @@ index d1aa8cd..52aa9b5 100755
 if darwin && test "$cc_vendor" != "clang" ; then
   extra_cflags="-falign-loops=16 -shared-libgcc $extra_cflags"
 fi
-@@ -5894,6 +5905,29 @@ fi
+@@ -6098,6 +6109,29 @@ fi
 echores "$_v4l2"
-
-
+ 
+ 
 +echocheck "Haiku"
 +if test "$_haiku" = auto || test "$_haiku" = yes ; then
 +  cat > $TMPC << EOF
@@ -143,10 +118,10 @@ index d1aa8cd..52aa9b5 100755
 +fi
 +echores "$_haiku"
 +
-
+ 
 #########
 # AUDIO #
-@@ -8059,7 +8093,7 @@ fi
+@@ -8358,7 +8392,7 @@ fi
 # (FIXME: 'echocheck "dynamic linking"' above and modify here accordingly)
 ld_dl_dynamic=''
 freebsd || netbsd || openbsd || dragonfly || bsdos && ld_dl_dynamic='-rdynamic'
@@ -154,8 +129,8 @@ index d1aa8cd..52aa9b5 100755
 +if test "$_real" = yes || test "$_xanim" = yes && ! win32 && ! qnx && ! darwin && ! os2 && ! sunos && ! haiku; then
   ld_dl_dynamic='-rdynamic'
 fi
-
-@@ -8552,6 +8586,7 @@ RADIO_CAPTURE=$_radio_capture
+ 
+@@ -8861,6 +8895,7 @@ RADIO_CAPTURE=$_radio_capture
 REAL_CODECS = $_real
 S3FB = $_s3fb
 SDL = $_sdl
@@ -163,7 +138,7 @@ index d1aa8cd..52aa9b5 100755
 SDL_IMAGE = $sdl_image
 SPEEX = $_speex
 STREAM_CACHE = $_stream_cache
-@@ -9153,6 +9188,7 @@ $def_quartz
+@@ -9458,6 +9493,7 @@ $def_quartz
 $def_s3fb
 $def_sdl
 $def_sdl_sdl_h
@@ -373,7 +348,7 @@ index 0000000..e50f1dc
 +	return (float)(buffered + ao_data.buffersize)/(float)ao_data.bps;
 +}
 diff --git a/libao2/audio_out.c b/libao2/audio_out.c
-index 197a63b..7f7baff 100644
+index 1b4caf1..890d663 100644
 --- a/libao2/audio_out.c
 +++ b/libao2/audio_out.c
@@ -43,6 +43,7 @@ extern const ao_functions_t audio_out_alsa;
@@ -384,7 +359,7 @@ index 197a63b..7f7baff 100644
 extern const ao_functions_t audio_out_sun;
 extern const ao_functions_t audio_out_sgi;
 extern const ao_functions_t audio_out_win32;
-@@ -108,6 +109,12 @@ const ao_functions_t* const audio_out_drivers[] =
+@@ -107,6 +108,12 @@ const ao_functions_t* const audio_out_drivers[] =
 #ifdef CONFIG_SDL
         &audio_out_sdl,
 #endif
@@ -399,7 +374,7 @@ index 197a63b..7f7baff 100644
 #endif
 diff --git a/libvo/haiku_common.cpp b/libvo/haiku_common.cpp
 new file mode 100644
-index 0000000..1ea5f96
+index 0000000..17aea4e
 --- /dev/null
 +++ b/libvo/haiku_common.cpp
@@ -0,0 +1,304 @@
@@ -709,7 +684,7 @@ index 0000000..1ea5f96
 +}
 diff --git a/libvo/haiku_common.h b/libvo/haiku_common.h
 new file mode 100644
-index 0000000..53e21ef
+index 0000000..e745b30
 --- /dev/null
 +++ b/libvo/haiku_common.h
@@ -0,0 +1,69 @@
@@ -784,7 +759,7 @@ index 0000000..53e21ef
 +
 diff --git a/libvo/haiku_view.cpp b/libvo/haiku_view.cpp
 new file mode 100644
-index 0000000..e491de4
+index 0000000..4840eb5
 --- /dev/null
 +++ b/libvo/haiku_view.cpp
@@ -0,0 +1,171 @@
@@ -961,7 +936,7 @@ index 0000000..e491de4
 +
 diff --git a/libvo/haiku_view.h b/libvo/haiku_view.h
 new file mode 100644
-index 0000000..21103eb
+index 0000000..0f7ed82
 --- /dev/null
 +++ b/libvo/haiku_view.h
@@ -0,0 +1,36 @@
@@ -1003,7 +978,7 @@ index 0000000..21103eb
 +#endif
 diff --git a/libvo/haiku_window.cpp b/libvo/haiku_window.cpp
 new file mode 100644
-index 0000000..2f4c8bf
+index 0000000..0165aa4
 --- /dev/null
 +++ b/libvo/haiku_window.cpp
@@ -0,0 +1,125 @@
@@ -1134,7 +1109,7 @@ index 0000000..2f4c8bf
 +}
 diff --git a/libvo/haiku_window.h b/libvo/haiku_window.h
 new file mode 100644
-index 0000000..34513df
+index 0000000..fefe6d2
 --- /dev/null
 +++ b/libvo/haiku_window.h
@@ -0,0 +1,31 @@
@@ -1170,7 +1145,7 @@ index 0000000..34513df
 +
 +
 diff --git a/libvo/video_out.c b/libvo/video_out.c
-index bcf5174..c797ae8 100644
+index 0bb4520..b108e28 100644
 --- a/libvo/video_out.c
 +++ b/libvo/video_out.c
@@ -109,6 +109,7 @@ extern const vo_functions_t video_out_gl_tiled;
@@ -1181,7 +1156,7 @@ index bcf5174..c797ae8 100644
 extern const vo_functions_t video_out_3dfx;
 extern const vo_functions_t video_out_tdfxfb;
 extern const vo_functions_t video_out_s3fb;
-@@ -211,6 +212,9 @@ const vo_functions_t* const video_out_drivers[] =
+@@ -215,6 +216,9 @@ const vo_functions_t* const video_out_drivers[] =
 #ifdef CONFIG_SDL
         &video_out_sdl,
 #endif
@@ -1193,7 +1168,7 @@ index bcf5174..c797ae8 100644
 #endif
 diff --git a/libvo/vo_haiku.cpp b/libvo/vo_haiku.cpp
 new file mode 100644
-index 0000000..614c8ff
+index 0000000..21b9ed8
 --- /dev/null
 +++ b/libvo/vo_haiku.cpp
@@ -0,0 +1,201 @@
@@ -1405,14 +1380,14 @@ index e6287d2..e5c4cd9 100644
@@ -42,6 +42,11 @@
 #include <sys/cygwin.h>
 #endif
-
+ 
 +#ifdef __HAIKU__
 +#include <FindDirectory.h>
 +#include <fs_info.h>
 +#endif
 +
 #include "osdep/osdep.h"
-
+ 
 char *get_path(const char *filename){
@@ -51,6 +56,13 @@ char *get_path(const char *filename){
 	char *buff;
@@ -1441,6 +1416,6 @@ index e6287d2..e5c4cd9 100644
 	len = strlen(homedir) + strlen(config_dir) + 1;
 	if (filename == NULL) {
 		if ((buff = malloc(len)) == NULL)
--
-2.21.0
+-- 
+2.30.2