From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F6BE15806E for ; Sat, 27 May 2023 02:17:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 539DBE0856; Sat, 27 May 2023 02:17:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2F4A5E0856 for ; Sat, 27 May 2023 02:17:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 116F3341022 for ; Sat, 27 May 2023 02:17:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9ED47A6D for ; Sat, 27 May 2023 02:17:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1685153811.e269d743a4ffd1a74e8efeeb2b088bfb2da47b72.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/files/vlc-9999-configure-lua-version.patch media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch media-video/vlc/files/vlc-configure_lua_version.patch media-video/vlc/vlc-9999.ebuild X-VCS-Directories: media-video/vlc/ media-video/vlc/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e269d743a4ffd1a74e8efeeb2b088bfb2da47b72 X-VCS-Branch: master Date: Sat, 27 May 2023 02:17:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5024e81e-7267-4c44-945e-40c2c512b5a1 X-Archives-Hash: e95a3b3d2254ecb23a4cec6f0bc510dc commit: e269d743a4ffd1a74e8efeeb2b088bfb2da47b72 Author: Sam James gentoo org> AuthorDate: Sat May 27 02:16:24 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat May 27 02:16:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e269d743 media-video/vlc: rebase live patches Closes: https://bugs.gentoo.org/901995 Signed-off-by: Sam James gentoo.org> ....patch => vlc-9999-configure-lua-version.patch} | 24 +++++++++++++--------- .../vlc/files/vlc-9999-fix-libtremor-libs.patch | 20 ++++++++++++++++++ media-video/vlc/vlc-9999.ebuild | 5 ++--- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/media-video/vlc/files/vlc-configure_lua_version.patch b/media-video/vlc/files/vlc-9999-configure-lua-version.patch similarity index 82% rename from media-video/vlc/files/vlc-configure_lua_version.patch rename to media-video/vlc/files/vlc-9999-configure-lua-version.patch index 2628075535a6..d0ac9493a0fd 100644 --- a/media-video/vlc/files/vlc-configure_lua_version.patch +++ b/media-video/vlc/files/vlc-9999-configure-lua-version.patch @@ -1,10 +1,12 @@ -Only look for one single version of Lua: the one pointed to by the -pkgconfig package 'lua'. The wrapper set up by lua eclasses will take care -of the rest. +From 543ae8e4118dd902e5ec9464caf315213e317089 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 27 May 2023 03:14:49 +0100 +Subject: [PATCH 2/2] foo3 ---- a/configure.ac 2021-06-11 12:20:01.222417096 +0200 -+++ b/configure.ac 2021-06-11 12:21:00.257419197 +0200 -@@ -1907,44 +1907,10 @@ +Signed-off-by: Sam James +--- a/configure.ac ++++ b/configure.ac +@@ -1847,43 +1847,10 @@ AC_ARG_ENABLE([lua], [disable LUA scripting support (default enabled)])) if test "${enable_lua}" != "no" then @@ -45,11 +47,13 @@ of the rest. - AS_IF([test "${have_lua_lib}" = "yes"], [ - AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], [ have_lua=yes ], []) ]) - ]) -- + PKG_CHECK_MODULES(LUA, lua, + [ have_lua=yes ], + [ have_lua=no ] -+ ) - if test "x${have_lua}" != "xyes" ; then ++ ) + + if test "${have_lua}" != "yes" ; then AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.]) - fi +-- +2.40.1 + diff --git a/media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch b/media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch new file mode 100644 index 000000000000..690cb73acfc4 --- /dev/null +++ b/media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch @@ -0,0 +1,20 @@ +From 9f8193bd55f7b75c213a60a48a3302f009bdf054 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 27 May 2023 03:13:38 +0100 +Subject: [PATCH 1/2] foo1 + +Signed-off-by: Sam James +--- a/modules/codec/Makefile.am ++++ b/modules/codec/Makefile.am +@@ -332,7 +332,7 @@ codec_LTLIBRARIES += $(LTLIBdaala) + libtremor_plugin_la_SOURCES = codec/vorbis.c + libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_TREMOR + libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' +-libtremor_plugin_la_LIBADD = -lvorbisdec -logg ++libtremor_plugin_la_LIBADD = $(VORBIS_LIBS) $(OGG_LIBS) + EXTRA_LTLIBRARIES += libtremor_plugin.la + codec_LTLIBRARIES += $(LTLIBtremor) + +-- +2.40.1 + diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index d46d85184e77..f27bd375a84e 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -230,9 +230,8 @@ DEPEND="${RDEPEND} " PATCHES=( - "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system - "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 - "${FILESDIR}"/${PN}-configure_lua_version.patch + "${FILESDIR}"/${PN}-9999-fix-libtremor-libs.patch # build system + "${FILESDIR}"/${PN}-9999-configure-lua-version.patch ) DOCS=( AUTHORS THANKS NEWS README.md doc/fortunes.txt )