public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/
Date: Sat, 27 May 2023 02:17:05 +0000 (UTC)	[thread overview]
Message-ID: <1685153811.e269d743a4ffd1a74e8efeeb2b088bfb2da47b72.sam@gentoo> (raw)

commit:     e269d743a4ffd1a74e8efeeb2b088bfb2da47b72
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 02:16:24 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 <sam@gentoo.org>
+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 <sam@gentoo.org>
+--- 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 <sam@gentoo.org>
+Date: Sat, 27 May 2023 03:13:38 +0100
+Subject: [PATCH 1/2] foo1
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- 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 )


             reply	other threads:[~2023-05-27  2:17 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-27  2:17 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-21 22:43 [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/ Andreas Sturmlechner
2025-02-12 22:43 Andreas Sturmlechner
2025-01-15 20:31 Andreas Sturmlechner
2025-01-08  8:22 Sam James
2024-10-04 17:37 Andreas Sturmlechner
2024-07-03 14:26 Ben Kohler
2024-03-17  4:02 Sam James
2023-05-13 22:52 Sam James
2021-11-07 15:41 Andreas Sturmlechner
2021-08-31 19:06 Pacho Ramos
2021-06-22 18:43 Sam James
2021-04-23  8:09 Sergei Trofimovich
2019-08-01 15:34 Andreas Sturmlechner
2019-03-10  9:34 Andreas Sturmlechner
2019-02-27 22:20 Thomas Raschbacher
2019-02-24 18:01 Andreas Sturmlechner
2018-11-08 12:29 Andreas Sturmlechner
2018-03-18 20:21 Andreas Sturmlechner
2017-12-09 13:52 Andreas Sturmlechner
2017-08-29 19:40 Andreas Sturmlechner
2016-11-26 18:00 Michael Palimaka
2016-11-26 18:00 Michael Palimaka
2016-02-09  7:41 Lars Wendler
2015-10-28  1:43 Ian Delaney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1685153811.e269d743a4ffd1a74e8efeeb2b088bfb2da47b72.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox