Skip to contentSkip to conversation

e2tools: Fix build with automake 1.17

PATCH In review Khem Raj 2 participants 11 messages Aug 30, 2024 – Aug 31, 2024 1 message not in the archive

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/8 e2tools: Fix build with automake 1.17

Replace the do_configure hack with aid to configure detection logic via commandline

---
 .../recipes-utils/e2tools/e2tools_git.bb      | 44 ++++---------------
 ...Disable-portability-warning-as-error.patch | 34 ++++++++++++++
 2 files changed, 43 insertions(+), 35 deletions(-)
 create mode 100644 meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch
meta-filesystems/recipes-utils/e2tools/e2tools_git.bb +9 -35
index a0d194cae0..459c7058e1 100644
@@ -15,6 +15,7 @@ PV = "0.1.0+git"
 
 SRC_URI = " \
            git://github.com/e2tools/e2tools;protocol=https;branch=master \
+           file://0001-Disable-portability-warning-as-error.patch \
            file://run-ptest \
 "
 
@@ -24,41 +25,14 @@ S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig ptest
 
-do_configure:prepend() {
-    git -C "${WORKDIR}/git" reset --hard HEAD
-
-    # To install ptest for this package, special configuration needs to be
-    # done before do_configure(). So, do_configure_ptest() which is scheduled
-    # after do_configure() cannot be used.
-
-    # We only do special configuration if we are installing ptest for this
-    # package.
-    if [ "${@d.getVar('PTEST_ENABLED')}" -eq "1" ]; then
-        # Since we guarantee run-time dependency when installing the ptest for
-        # this package, we do not need the check macros under section "checks
-        # for programs" in "configure.ac". Plus, these check macros set the
-        # ouput variables to incorrect values as these checks are performed on
-        # the host environment. Still, we need these variables outputted from
-        # these check macros. So, we insert the following lines to manually
-        # set these output variables to the correct value in "configure.ac".
-
-        # Note that HAVE_DD_COMMAND and HAVE_MKE2FS_COMMAND are only ever used
-        # in tests/Makefile-files which determines whether to include the test
-        # cases. As for output variables CHMOD, DD, and MKE2FS, they only
-        # point to the programs which test cases need to run. Since these
-        # commands are guaranteed to be present due to RDEPENDS and are
-        # guaranteed to be accessible under PATH environment variable on the
-        # target, we only need to specify the name of these programs.
-
-        perl -i -0777 -pe 's/(^dnl\s*=+\s*^dnl\s*Checks for compiler flags\s*^dnl\s*=+)/
-AC_SUBST([CHMOD], 'chmod')
-AC_SUBST([DD], 'dd')
-AC_SUBST([MKE2FS], 'mke2fs')
-AM_CONDITIONAL([HAVE_DD_COMMAND], [true])
-AM_CONDITIONAL([HAVE_MKE2FS_COMMAND], [true])
-\1/ms' "${WORKDIR}/git/configure.ac"
-    fi
-}
+# Otherwise these tools will be detected from build host and
+# assumptions will go wrong, Fun of cross compiling
+EXTRA_OECONF += "\
+                ac_cv_path_MKE2FS=${base_sbindir}/mke2fs \
+                ac_cv_path_CHMOD=${base_bindir}/chmod \
+                ac_cv_path_DD=${base_bindir}/dd \
+                ac_cv_path_GREP=${base_bindir}/grep \
+                "
 
 do_install_ptest() {
     rm -rf "${D}${PTEST_PATH}/*"
meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch new file +34 -0
new file mode 100644
index 0000000000..dec793f373
@@ -0,0 +1,34 @@
+From e0aaedea30483bf5b9bb085e12fff79144fa1174 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Thu, 29 Aug 2024 11:12:57 -0700
+Subject: [PATCH] Disable portability warning as error
+
+With latest automake 1.17 its warning about escape hash
+mark [1] and since configure.ac uses -werror to call automake
+this becomes an error and reconfigure fails.
+
+escape hash mark is non-portable as discussed here [2]
+
+Fow now let it be a warning, it should be fixed in a portable way
+
+[1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=7610
+[2] https://lists.gnu.org/archive/html/automake/2011-08/msg00023.html
+
+Upstream-Status: Submitted [https://github.com/e2tools/e2tools/pull/31]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index dd32c4d..9f37591 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,6 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([
+ -Wall
+ -Werror
++-Wno-portability
+ 1.9.6
+ foreign
+ subdir-objects
author
#1 lore raw

PATCH 2/8 minidlna: Upgrade to 1.3.3 release

Drop unneeded patches
Add a patch to fix build with ffmpeg7

---
 .../recipes-multimedia/minidlna/minidlna.inc  |  3 +-
 ...01-Add-compatibility-with-FFMPEG-7.0.patch | 49 +++++++++++++++++++
 .../0001-Update-Gettext-version.patch         | 32 ------------
 ...onfigure.ac-drop-non-standard-checks.patch | 37 --------------
 .../{minidlna_1.3.0.bb => minidlna_1.3.3.bb}  |  2 +-
 5 files changed, 51 insertions(+), 72 deletions(-)
 create mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch
 delete mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch
 delete mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch
 rename meta-multimedia/recipes-multimedia/minidlna/{minidlna_1.3.0.bb => minidlna_1.3.3.bb} (66%)
meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +1 -2
index aabf81dce0..8c9ead1489 100644
@@ -11,9 +11,8 @@ inherit gettext autotools-brokensep update-rc.d systemd
 SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
            file://minidlna-daemon.init.d \
            file://minidlna.service \
-           file://0001-Update-Gettext-version.patch \
            file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \
-           file://0001-configure.ac-drop-non-standard-checks.patch \
+           file://0001-Add-compatibility-with-FFMPEG-7.0.patch \
            "
 
 S = "${WORKDIR}/git"
meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch new file +49 -0

49 lines not on this page · raw message

meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch deleted +0 -32
deleted file mode 100644
index 6100da3581..0000000000
@@ -1,32 +0,0 @@
-From a4290bf1887f9203288858ca76bdd20b2edf337a Mon Sep 17 00:00:00 2001
-From: Baptiste Durand <[email protected]>
-Date: Sun, 9 Sep 2018 20:50:41 +0200
-Subject: [PATCH] Update Gettext version
-
-Upstream-Status: Inappropriate [oe-core specific]
-
-Signed-off-by: Baptiste Durand <[email protected]>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,7 +14,7 @@
- # License along with MiniDLNA; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- # USA.
--AC_INIT(MiniDLNA,1.1.3,,minidlna)
-+AC_INIT(MiniDLNA,1.2.1,,minidlna)
- #LT_INIT
- 
- AC_CANONICAL_TARGET
-@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC
- 
- AM_ICONV
- AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION(0.18)
-+AM_GNU_GETTEXT_VERSION(0.20)
- 
- # Checks for programs.
- AC_PROG_AWK
meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch deleted +0 -37
deleted file mode 100644
index 93334b7dab..0000000000
@@ -1,37 +0,0 @@
-From 83425344b2d7339e8f5b0ad230c51278d330d613 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Sat, 22 Jan 2022 11:41:50 +0100
-Subject: [PATCH] configure.ac: drop non-standard checks
-
-Not sure what upstream is trying to do here but it does not work
-with the latest autoconf.
-
-Upstream-Status: Inactive-Upstream
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- configure.ac | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index aa7dd1c..858db52 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -418,7 +418,6 @@ for dir in "" /usr/local $SEARCH_DIR; do
-     AC_CHECK_LIB([id3tag -lz], [id3_file_open], [LIBID3TAG_LIBS="-lid3tag -lz"], [unset ac_cv_lib_id3tag_id3_file_open; LDFLAGS="$LDFLAGS_SAVE"; continue])
-     break
- done
--test x"$ac_cv_lib_id3tag__lz___id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag])
- AC_SUBST(LIBID3TAG_LIBS)
- 
- LDFLAGS_SAVE="$LDFLAGS"
-@@ -444,10 +443,6 @@ for dir in "" /usr/local $SEARCH_DIR; do
- 		  [unset ac_cv_lib_avformat_av_open_input_file; unset ac_cv_lib_avformat_avformat_open_input; LDFLAGS="$LDFLAGS_SAVE"; continue])])
-     break
- done
--if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___av_open_input_file" != x"yes" &&
--   test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___avformat_open_input" != x"yes"; then
--   AC_MSG_ERROR([Could not find libavformat - part of ffmpeg])
--fi
- AC_SUBST(LIBAVFORMAT_LIBS)
- 
- AC_CHECK_LIB(pthread, pthread_create)
meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.3.bb renamed from meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb +1 -1
similarity index 66%
rename from meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb
rename to meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.3.bb
index 4238918c97..da0d90a993 100644
@@ -1,4 +1,4 @@
 require ${BPN}.inc
 
-SRCREV = "109d63cb11ac207c18a784556834eb054b34b00b"
+SRCREV = "1a9b32ee7a1c89e54e9f148199b73f9b33ad45ba"
 LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"
author
#2 lore raw

PATCH 3/8 vlc: Upgrade to 3.0.21

In reply to Khem Raj

Changes between 3.0.20 and 3.0.21:
----------------------------------

Decoders:
* Improve Opus ambisonic support
* Fix some ASS subtitle rendering issues
* Fix Opus in MP4 behaviour
* Fix VAAPI hw decoding with some drivers

Input:
* Add support for HTTP content range handling according to RFC 9110
* Fix some HLS Adaptive Streaming not working in audio-only mode

Video Output:
* Super Resolution scaling with AMD GPUs
* The D3D11 HDR option can also turn on/off HDR for all sources regardless of the display
* Improve subtitles rendering on Apple platforms of notably Asian languages by correcting font fallback lookups

Video Filter:
* New AMD VQ Enhancer filter
* Add D3D11 option to use NVIDIA TrueHDR to generate HDR from SDR sources

Audio Output:
* Fix regression on macOS causing crashes when using audio devices with more than 9 channels

Services Discovery:
* Fix exposed UPnP directory URL schemes to be compliant with RFC 3986

Contrib:
* Update FFmpeg to 4.4.4
* Update dav1d to 1.4.2
* Update libvpx to 1.14.1

libVLC:
* the HWND passed to libvlc_media_player_set_hwnd must have the WS_CLIPCHILDREN style set.
* Fix crashes when using caopengllayer

Misc:
* Fix various warnings, leaks and potential crashes
* Fix security integer overflow in MMS module

---
 .../recipes-multimedia/vlc/vlc/4645.patch     | 179 ---------
 .../recipes-multimedia/vlc/vlc/4665.patch     | 377 ------------------
 .../vlc/{vlc_3.0.20.bb => vlc_3.0.21.bb}      |   5 +-
 3 files changed, 1 insertion(+), 560 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch
 delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch
 rename meta-multimedia/recipes-multimedia/vlc/{vlc_3.0.20.bb => vlc_3.0.21.bb} (97%)
meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch deleted +0 -179
deleted file mode 100644
index 3f2aa60512..0000000000
@@ -1,179 +0,0 @@
-From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001
-From: Thomas Guillem <[email protected]>
-Date: Tue, 5 Dec 2023 09:23:35 +0100
-Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment
-
-Fixes #28441
-Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4645]
-Signed-off-by: Khem Raj <[email protected]>
----
- src/input/input_internal.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/input/input_internal.h b/src/input/input_internal.h
-index d29731edca1b..ea02f39f5add 100644
---- a/src/input/input_internal.h
-+++ b/src/input/input_internal.h
-@@ -117,7 +117,7 @@ typedef struct input_thread_private_t
- 
-     /* Title infos FIXME multi-input (not easy) ? */
-     int          i_title;
--    const input_title_t **title;
-+    input_title_t * const *title;
- 
-     int i_title_offset;
-     int i_seekpoint_offset;
--- 
-GitLab
-
-
-From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001
-From: Zhao Zhili <[email protected]>
-Date: Thu, 1 Mar 2018 14:25:59 +0800
-Subject: [PATCH 2/5] yadif: fix variable type
-
-Signed-off-by: Thomas Guillem <[email protected]>
-(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60)
-Signed-off-by: Thomas Guillem <[email protected]>
----
- modules/video_filter/deinterlace/yadif.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h
-index 4bc592ba9307..af16443d0804 100644
---- a/modules/video_filter/deinterlace/yadif.h
-+++ b/modules/video_filter/deinterlace/yadif.h
-@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8
- }
- 
- static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) {
--    uint8_t *dst = (uint8_t *)dst8;
--    uint8_t *prev = (uint8_t *)prev8;
--    uint8_t *cur = (uint8_t *)cur8;
--    uint8_t *next = (uint8_t *)next8;
-+    uint16_t *dst = (uint16_t *)dst8;
-+    uint16_t *prev = (uint16_t *)prev8;
-+    uint16_t *cur = (uint16_t *)cur8;
-+    uint16_t *next = (uint16_t *)next8;
-     int x;
-     uint16_t *prev2= parity ? prev : cur ;
-     uint16_t *next2= parity ? cur  : next;
--- 
-GitLab
-
-
-From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <[email protected]>
-Date: Sun, 3 Mar 2019 09:59:10 +0200
-Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion
-
-(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058)
-Signed-off-by: Thomas Guillem <[email protected]>
----
- modules/video_chroma/swscale.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c
-index 8993d11ec5dd..11897527355c 100644
---- a/modules/video_chroma/swscale.c
-+++ b/modules/video_chroma/swscale.c
-@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
- {
-     filter_sys_t *p_sys = p_filter->p_sys;
-     uint8_t palette[AVPALETTE_SIZE];
--    uint8_t *src[4]; int src_stride[4];
--    uint8_t *dst[4]; int dst_stride[4];
-+    uint8_t *src[4], *dst[4];
-+    const uint8_t *csrc[4];
-+    int src_stride[4], dst_stride[4];
- 
-     GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video,
-                p_src, i_plane_count, b_swap_uvi );
-@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
-     GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video,
-                p_dst, i_plane_count, b_swap_uvo );
- 
-+    for (size_t i = 0; i < ARRAY_SIZE(src); i++)
-+        csrc[i] = src[i];
-+
- #if LIBSWSCALE_VERSION_INT  >= ((0<<16)+(5<<8)+0)
--    sws_scale( ctx, src, src_stride, 0, i_height,
-+    sws_scale( ctx, csrc, src_stride, 0, i_height,
-                dst, dst_stride );
- #else
--    sws_scale_ordered( ctx, src, src_stride, 0, i_height,
-+    sws_scale_ordered( ctx, csrc, src_stride, 0, i_height,
-                        dst, dst_stride );
- #endif
- }
--- 
-GitLab
-
-
-From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <[email protected]>
-Date: Sun, 3 Mar 2019 17:20:04 +0200
-Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing
-
-(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35)
-Signed-off-by: Thomas Guillem <[email protected]>
----
- modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
-index a93462925e8a..a85f9aafb0b9 100644
---- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
-+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
-@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] =
- void RegisterCommand( filter_t *p_filter )
- {
-     filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys;
--    size_t i_index = 0;
- 
-     p_sys->i_commands = ARRAY_SIZE(p_commands);
-     p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) );
-     if( !p_sys->pp_commands ) return;
--    for( i_index = 0; i_index < p_sys->i_commands; i_index ++ )
-+    for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ )
-     {
-         p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) );
-         if( !p_sys->pp_commands[i_index] ) return;
--- 
-GitLab
-
-
-From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <[email protected]>
-Date: Mon, 26 Feb 2018 20:43:03 +0200
-Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption
-
-Font alpha is 8-bits, not 32-bits.
-
-(cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0)
-Signed-off-by: Thomas Guillem <[email protected]>
----
- modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
-index a85f9aafb0b9..7a71c6f2373a 100644
---- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
-+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
-@@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end,
-     skip_space( &psz_command );
-     if( isdigit( (unsigned char)*psz_command ) )
-     {
--        if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC )
-+        int32_t value;
-+
-+        if( parse_digit( &psz_command, &value ) == VLC_EGENERIC )
-             return VLC_EGENERIC;
-+
-+        p_params->fontstyle.i_font_alpha = value;
-     }
-     return VLC_SUCCESS;
- }
--- 
-GitLab
-
meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch deleted +0 -377

377 lines not on this page · raw message

meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb renamed from meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb +1 -4
similarity index 97%
rename from meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb
rename to meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb
index 2a6b27add0..6406343c8d 100644
@@ -25,11 +25,8 @@ SRC_URI = "https://get.videolan.org/${BPN}/${PV}/${BP}.tar.xz \
            file://0006-configure-Disable-incompatible-function-pointer-type.patch \
            file://taglib-2.patch \
            file://0001-taglib-Fix-build-on-x86-32-bit.patch \
-           file://4645.patch \
-           file://4665.patch \
 "
-SRC_URI[sha256sum] = "adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5"
-
+SRC_URI[sha256sum] = "24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0"
 inherit autotools-brokensep features_check gettext pkgconfig mime-xdg
 
 REQUIRED_DISTRO_FEATURES = "x11"
author
#3 lore raw

PATCH 4/8 libplacebo: Add recipe

In reply to Khem Raj
---
 .../mplayer/libplacebo_7.349.0.bb             | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb
meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb new file +22 -0
new file mode 100644
index 0000000000..b68e67a8cb
@@ -0,0 +1,22 @@
+SUMMARY ="Reusable library for GPU-accelerated video/image rendering primitives"
+LICENSE = "Apache-2.0 & BSD-3-Clause & BSL-1.0 & MIT"
+LIC_FILES_CHKSUM = "file://3rdparty/Vulkan-Headers/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+                    file://3rdparty/fast_float/LICENSE-APACHE;md5=81db248e90379bcfc0582b578b009bc3 \
+                    file://3rdparty/fast_float/LICENSE-BOOST;md5=2c7a3fa82e66676005cd4ee2608fd7d2 \
+                    file://3rdparty/fast_float/LICENSE-MIT;md5=32b11d50c7d9788d4270f6a83f3e68eb \
+                    file://3rdparty/glad/LICENSE;md5=ae570f26774ac096cff8f992091a223c \
+                    file://3rdparty/jinja/LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462 \
+                    file://3rdparty/jinja/docs/license.rst;md5=5f4c795946979fabc2361be4c70d0a9f \
+                    file://3rdparty/markupsafe/LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75 \
+                    file://3rdparty/markupsafe/docs/license.rst;md5=5f4c795946979fabc2361be4c70d0a9f \
+                    file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da \
+                    file://demos/3rdparty/nuklear/src/LICENSE;md5=6052431ae6cd4f0082276c54996e7770 \
+                    file://demos/LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032"
+
+SRC_URI = "gitsm://github.com/haasn/libplacebo;protocol=https;branch=master"
+
+SRCREV = "1fd3c7bde7b943fe8985c893310b5269a09b46c5"
+
+inherit meson pkgconfig
+
+S = "${WORKDIR}/git"
author
#4 lore raw

PATCH 5/8 mpv: Upgrade to 0.38.0 release

In reply to Khem Raj

https://github.com/mpv-player/mpv/releases

migrate to using meson build system

---
 ...d-emitting-absolute-filepaths-into-g.patch | 33 ++++++++
 .../mplayer/{mpv_0.35.1.bb => mpv_0.38.0.bb}  | 79 ++++++++-----------
 2 files changed, 68 insertions(+), 44 deletions(-)
 create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch
 rename meta-oe/recipes-multimedia/mplayer/{mpv_0.35.1.bb => mpv_0.38.0.bb} (51%)
meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch new file +33 -0
new file mode 100644
index 0000000000..b96ec5d4c4
@@ -0,0 +1,33 @@
+From 9878681df9919d28da3e4c6cc706e264abd9df92 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Thu, 29 Aug 2024 17:54:15 -0700
+Subject: [PATCH] file2string: Avoid emitting absolute filepaths into generated
+ sources
+
+These sources are bundled into src packages to be distributed and leaking
+buildpaths results in violating reproducibility norms.
+
+Upstream-Status: Submitted [https://github.com/mpv-player/mpv/pull/14763]
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ TOOLS/file2string.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/TOOLS/file2string.py b/TOOLS/file2string.py
+index 5b1c4a95d1..39c1122a35 100755
+--- a/TOOLS/file2string.py
++++ b/TOOLS/file2string.py
+@@ -22,10 +22,10 @@
+ # License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
+-import sys
++import os, sys
+ 
+ def file2string(infilename, infile, outfile):
+-    outfile.write("// Generated from %s\n\n" % infilename)
++    outfile.write("// Generated from %s\n\n" % os.path.basename(infilename))
+ 
+     conv = ["\\%03o" % c for c in range(256)]
+     safe_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" \
meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb renamed from meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb +35 -44

125 lines not on this page · raw message

#5 lore raw

Re: [oe] [meta-oe][PATCH 5/8] mpv: Upgrade to 0.38.0 release

Quoted 92 lines · Khem Raj

https://github.com/mpv-player/mpv/releases

migrate to using meson build system

---
  ...d-emitting-absolute-filepaths-into-g.patch | 33 ++++++++
  .../mplayer/{mpv_0.35.1.bb => mpv_0.38.0.bb}  | 79 ++++++++-----------
  2 files changed, 68 insertions(+), 44 deletions(-)

create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch rename meta-oe/recipes-multimedia/mplayer/{mpv_0.35.1.bb => mpv_0.38.0.bb} (51%)

meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch new file +33 -0
new file mode 100644
index 0000000000..b96ec5d4c4
@@ -0,0 +1,33 @@
+From 9878681df9919d28da3e4c6cc706e264abd9df92 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Thu, 29 Aug 2024 17:54:15 -0700
+Subject: [PATCH] file2string: Avoid emitting absolute filepaths into generated
+ sources
+
+These sources are bundled into src packages to be distributed and leaking
+buildpaths results in violating reproducibility norms.
+
+Upstream-Status: Submitted [https://github.com/mpv-player/mpv/pull/14763]
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ TOOLS/file2string.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/TOOLS/file2string.py b/TOOLS/file2string.py
+index 5b1c4a95d1..39c1122a35 100755
+--- a/TOOLS/file2string.py
++++ b/TOOLS/file2string.py
+@@ -22,10 +22,10 @@
+ # License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ #
+
+-import sys
++import os, sys
+
+ def file2string(infilename, infile, outfile):
+-    outfile.write("// Generated from %s\n\n" % infilename)
++    outfile.write("// Generated from %s\n\n" % os.path.basename(infilename))
+
+     conv = ["\\%03o" % c for c in range(256)]
+     safe_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" \
meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb renamed from meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb +5 -9
similarity index 51%
rename from meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb
rename to meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb
index 0f50a6e8fe..e9384e88d3 100644
@@ -9,20 +9,20 @@ DEPENDS = " \
      jpeg \
      libv4l \
      libass \
+    libplacebo \
  "
 
  LICENSE = "GPL-2.0-or-later"
  LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCREV_mpv = "140ec21c89d671d392877a7f3b91d67e7d7b9239"
-SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.35;protocol=https \
-           https://waf.io/waf-2.0.25;name=waf;subdir=git \
+SRCREV_mpv = "02254b92dd237f03aa0a151c2a68778c4ea848f9"
+SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.38;protocol=https \
+           file://0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch \
             "
-SRC_URI[waf.sha256sum] = "21199cd220ccf60434133e1fd2ab8c8e5217c3799199c82722543970dc8e38d5"
 
  S = "${WORKDIR}/git"
 
-inherit waf pkgconfig mime-xdg
+inherit meson pkgconfig mime-xdg
 
  LDFLAGS:append:riscv64 = " -latomic"
 
@@ -42,59 +42,55 @@ PACKAGECONFIG ??= " \
      ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \
  "
 
-PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext"
-PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv"
-PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl"
-PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl"

meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb PACKAGECONFIG ??= " \ · line 46

Quoted 10 lines
meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb renamed from meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb +1 -8
-PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm"
-PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgbm"
-PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit"
-PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive"
-PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack"
-PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
-PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
-PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native libxkbcommon"
 
+PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=diabled,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext"

Mispelling on "diabled", should be "disabled".

Quoted 96 lines
meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb renamed from meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb +29 -28
+PACKAGECONFIG[xv] = "-Dxv=enabled,-Dxv=disabled,libxv"
+PACKAGECONFIG[opengl] = "-Dgl=enabled,-Dgl=disabled,virtual/libgl"
+PACKAGECONFIG[egl] = "-Degl=enabled,-Degl-disabled,virtual/egl"
+PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm"
+PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/libgbm"
+PACKAGECONFIG[lua] = "-Dlua=luajit,-Dlua=disabled,lua luajit"
+PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive"
+PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack"
+PACKAGECONFIG[vaapi] = "-Dvaapi=enabled,-Dvaapi=disabled,libva"
+PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau"
+PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland wayland-native libxkbcommon"
 
  python __anonymous() {
      packageconfig = (d.getVar("PACKAGECONFIG") or "").split()
      extras = []
      if "x11" in packageconfig and "opengl" in packageconfig:
-        extras.append(" --enable-gl-x11")
+        extras.append(" -Dgl-x11=enabled")
      if "x11" in packageconfig and "egl" in packageconfig:
-        extras.append(" --enable-egl-x11")
+        extras.append(" -Degl-x11=enabled")
      if "egl" in packageconfig and "drm" in packageconfig:
-        extras.append(" --enable-egl-drm")
+        extras.append(" -Degl-drm=enabled")
      if "vaapi" in packageconfig and "x11" in packageconfig:
-        extras.append(" --enable-vaapi-x11")
+        extras.append(" -Dvaapi-x11=enabled")
      if "vaapi" in packageconfig and "drm" in packageconfig:
-        extras.append(" --enable-vaapi-drm")
+        extras.append(" -Dvaapi-drm=enabled")
      if "vaapi" in packageconfig and "x11" in packageconfig and "egl" in packageconfig:
-        extras.append(" --enable-vaapi-x-egl")
+        extras.append(" -Dvaapi-x-egl=enabled")
      if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig:
-        extras.append(" --enable-vdpau-gl-x11")
+        extras.append(" -Dvdpau-gl-x11=enabled")
      if "wayland" in packageconfig and "opengl" in packageconfig:
-        extras.append(" --enable-gl-wayland")
+        extras.append(" -Dgl-wayland=enabled")
      if "wayland" in packageconfig and "vaapi" in packageconfig:
-        extras.append(" --enable-vaapi-wayland")
+        extras.append(" -Dvaapi-wayland=enabled")
      if extras:
          d.appendVar("EXTRA_OECONF", "".join(extras))
  }
 
-SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}"
+#SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}"
 
  EXTRA_OECONF = " \
-    --prefix=${prefix} \
-    --target=${SIMPLE_TARGET_SYS} \
-    --confdir=${sysconfdir} \
-    --datadir=${datadir} \
-    --disable-manpage-build \
-    --disable-libbluray \
-    --disable-dvdnav \
-    --disable-cdda \
-    --disable-uchardet \
-    --disable-rubberband \
-    --disable-lcms2 \
-    --disable-vapoursynth \
+    -Dmanpage-build=disabled \
+    -Dlibbluray=disabled \
+    -Ddvdnav=disabled \
+    -Dcdda=disabled \
+    -Duchardet=disabled \
+    -Drubberband=disabled \
+    -Dlcms2=disabled \
+    -Dvapoursynth=disabled \
      ${PACKAGECONFIG_CONFARGS} \
  "
@@ -102,11 +98,6 @@ do_configure:append() {
      sed -i -e 's#${WORKDIR}#<WORKDIR>#g' ${B}/config.h
  }
 
-link_waf() {
-    ln -s waf-2.0.25 ${S}/waf
-}
-do_unpack[postfuncs] += "link_waf"
-
  FILES:${PN} += " \
      ${datadir}/icons \
      ${datadir}/zsh \
 
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#112044): https://lists.openembedded.org/g/openembedded-devel/message/112044
Mute This Topic: https://lists.openembedded.org/mt/108174009/6551054
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS

A message that is not in the archive (sent off-list or not yet received): [email protected]

#7 lore raw

Re: [oe] [meta-oe][PATCH 5/8] mpv: Upgrade to 0.38.0 release

Quoted 9 lines · Ryan Eatmon via lists.openembedded.org
Quoted 6 lines

+PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=diabled,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext"

Mispelling on "diabled", should be "disabled".

Well... since the patch has already made it to master I'll send a new patch that fixes this spelling mistake.

Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
author
#8 lore raw

Re: [oe] [meta-oe][PATCH 5/8] mpv: Upgrade to 0.38.0 release

Quoted 7 lines · Ryan Eatmon
Quoted 4 lines · Ryan Eatmon via lists.openembedded.org
Quoted 9 lines
Quoted 5 lines
Quoted 2 lines

+PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=diabled,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext"

Mispelling on "diabled", should be "disabled".

Well... since the patch has already made it to master I'll send a new patch that fixes this spelling mistake.

Yeah thanks for noticing and yes it was already in Thanks for sending patch

Quoted 8 lines

--
Ryan Eatmon [email protected]
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS

author
#9 lore raw

PATCH 6/8 libmpdclient,mpc: Upgrade to 2.22 and 0.35 respectively

In reply to Khem Raj
---
 .../musicpd/{libmpdclient_2.20.bb => libmpdclient_2.22.bb}        | 0
 .../recipes-multimedia/musicpd/{mpc_0.34.bb => mpc_0.35.bb}       | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-multimedia/recipes-multimedia/musicpd/{libmpdclient_2.20.bb => libmpdclient_2.22.bb} (100%)
 rename meta-multimedia/recipes-multimedia/musicpd/{mpc_0.34.bb => mpc_0.35.bb} (100%)
meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.22.bb renamed from meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb +0 -0
similarity index 100%
rename from meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb
rename to meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.22.bb
meta-multimedia/recipes-multimedia/musicpd/mpc_0.35.bb renamed from meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb +0 -0
similarity index 100%
rename from meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb
rename to meta-multimedia/recipes-multimedia/musicpd/mpc_0.35.bb
author
#10 lore raw

PATCH 7/8 vlc: Disable recipe

In reply to Khem Raj

OE-core has moved to ffmpeg7, vlc3 needs to be ported to work with this version and vlc4 is not released yet.

---
 .../packagegroups/packagegroup-meta-multimedia.bb               | 1 -
 meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb            | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +0 -1
index 672c8abc9a..618eaa68d1 100644
@@ -51,7 +51,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\
     openal-soft \
     opusfile \
     opus-tools \
-    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \
     ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "sox streamripper", "", d)} \
     tinyalsa \
     ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \
meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb +2 -0
index 6406343c8d..2d2ecc63b9 100644
@@ -132,3 +132,5 @@ FILES:${PN}-staticdev += "\
 INSANE_SKIP:${PN} = "dev-so"
 
 EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}"
+
+SKIP_RECIPE[vlc] = "requires porting to ffmpeg >= 7 as of ffmpeg >= 5 it requires extensive changes disabling VAAPI (only supported with vlc >= 4)"
author
#11 lore raw

PATCH 8/8 mpd: Upgrade to 0.23.15+git

In reply to Khem Raj

Drop uneeded patch

ver 0.23.15 (2023/12/20)
* decoder
- ffmpeg: fix build failure with FFmpeg 6.1
* output
- alsa: limit buffer time to 2 seconds

Use latest master for fmt 11.x fixes

---
 ...tch-src_decoder_plugins_FfmpegIo.cxx.patch | 26 -------------------
 .../{mpd_0.23.14.bb => mpd_0.23.15.bb}        | 11 +++++---
 2 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch
 rename meta-multimedia/recipes-multimedia/musicpd/{mpd_0.23.14.bb => mpd_0.23.15.bb} (96%)
meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch deleted +0 -26
deleted file mode 100644
index b2dea331ef..0000000000
@@ -1,26 +0,0 @@
-From e62fd0eefe8b475e70d87a673a7216aac3bb622f Mon Sep 17 00:00:00 2001
-From: Markus Volk <[email protected]>
-Date: Mon, 20 Nov 2023 17:49:59 +0100
-Subject: [PATCH] patch src_decoder_plugins_FfmpegIo.cxx
-
-Signed-off-by: Markus Volk <[email protected]>
-Upstream-Status: Pending [https://github.com/MusicPlayerDaemon/MPD/issues/1898]
----
- src/decoder/plugins/FfmpegIo.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx
-index 572f1a86a..3e2347fec 100644
---- a/src/decoder/plugins/FfmpegIo.cxx
-+++ b/src/decoder/plugins/FfmpegIo.cxx
-@@ -25,6 +25,7 @@
- #include "input/InputStream.hxx"
- 
- extern "C" {
-+#include <libavutil/error.h>
- #include <libavutil/mem.h>
- }
- 
--- 
-2.42.0
-
meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb renamed from meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb +8 -3
similarity index 96%
rename from meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb
rename to meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb
index 33155da7d2..f066c405f1 100644
@@ -18,14 +18,19 @@ DEPENDS += " \
     fmt \
 "
 
+PV .= "+git"
 SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \
-           file://0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch \
            file://mpd.conf.in \
            "
-SRCREV = "feac1a3f56591ccfb00870aba66c9ac3abac4773"
+SRCREV = "965c466e9bda262790e76edd5272e9e74b407ff3"
 S = "${WORKDIR}/git"
 
-EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}"
+EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)} \
+    -Dadplug=disabled \
+    -Dsndio=disabled \
+    -Dshine=disabled \
+    -Dtremor=disabled \
+"
 
 PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \
                    alsa ao bzip2 daemon \