[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: mpcdec: remove unused MUSE_CONF
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Sat Nov 16 13:43:16 UTC 2024
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
3885cd77 by Steve Lhomme at 2024-11-16T12:26:28+00:00
contrib: mpcdec: remove unused MUSE_CONF
Not defined since 48caea17c602e026290b6eef0c3cf994263d4c1d.
- - - - -
22e73a44 by Steve Lhomme at 2024-11-16T12:26:28+00:00
contrib: mpcdec: only build libmpcdec
We don't need the rest.
- - - - -
6 changed files:
- contrib/src/mpcdec/0006-adapted-patch-0001-shared.patch-from-buildroot.patch
- + contrib/src/mpcdec/0007-only-build-libmpcdec.patch
- contrib/src/mpcdec/musepack-asinh-msvc.patch
- contrib/src/mpcdec/musepack-no-binaries.patch
- contrib/src/mpcdec/musepack-no-cflags-clobber.patch
- contrib/src/mpcdec/rules.mak
Changes:
=====================================
contrib/src/mpcdec/0006-adapted-patch-0001-shared.patch-from-buildroot.patch
=====================================
@@ -1,7 +1,7 @@
-From 617c72c7df93da5bcca2febbad066e31a411d976 Mon Sep 17 00:00:00 2001
+From 714e0e572ea7746831b5fa5434ea2669180e702f Mon Sep 17 00:00:00 2001
From: r2d <r2d at c51c8d5e-032a-db11-a0f2-0002b3467eef>
Date: Sun, 14 Feb 2016 22:07:10 +0000
-Subject: [PATCH 6/6] adapted patch 0001-shared.patch from buildroot:
+Subject: [PATCH 6/7] adapted patch 0001-shared.patch from buildroot:
https://git.busybox.net/buildroot/tree/package/musepack/0001-shared.patch
original changelog :
@@ -16,7 +16,7 @@ git-svn-id: http://svn.musepack.net/libmpc/trunk@491 c51c8d5e-032a-db11-a0f2-000
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/libmpcdec/CMakeLists.txt b/libmpcdec/CMakeLists.txt
-index fb18968..fa9c800 100644
+index 5579d55..7ce5e94 100644
--- a/libmpcdec/CMakeLists.txt
+++ b/libmpcdec/CMakeLists.txt
@@ -4,7 +4,6 @@ SET(mpcdec_VERSION_PATCH 1)
@@ -29,7 +29,7 @@ index fb18968..fa9c800 100644
${libmpc_SOURCE_DIR}/include/mpc/reader.h
@@ -12,12 +11,16 @@ install(FILES
${libmpc_SOURCE_DIR}/include/mpc/mpc_types.h
- DESTINATION include/mpcdec COMPONENT headers)
+ DESTINATION include/mpc COMPONENT headers)
+include_directories(${libmpc_SOURCE_DIR}/include)
if(SHARED)
@@ -49,5 +49,5 @@ index fb18968..fa9c800 100644
endif(SHARED)
--
-2.37.3.windows.1
+2.45.0.windows.1
=====================================
contrib/src/mpcdec/0007-only-build-libmpcdec.patch
=====================================
@@ -0,0 +1,24 @@
+From 0b5a35b4a87952465717a76d5dcdadf52b930ba9 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Wed, 13 Nov 2024 14:25:36 +0100
+Subject: [PATCH 7/7] only build libmpcdec
+
+We don't need anything else for VLC
+---
+ CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 50666fe..237daf1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,6 +25,3 @@ if(NOT MSVC)
+ endif(NOT MSVC)
+
+ add_subdirectory(libmpcdec)
+-add_subdirectory(libmpcpsy)
+-add_subdirectory(libmpcenc)
+-add_subdirectory(libwavformat)
+--
+2.45.0.windows.1
+
=====================================
contrib/src/mpcdec/musepack-asinh-msvc.patch
=====================================
@@ -1,11 +1,25 @@
---- musepack.clean/libmpcpsy/psy_tab.c 2014-12-03 15:25:37.877616700 +0100
-+++ musepack/libmpcpsy/psy_tab.c 2014-12-03 15:20:59.300071300 +0100
-@@ -186,7 +187,7 @@
+From db238381db9763ca1a7fc066a613a087b37d87e2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
+Date: Wed, 3 Dec 2014 15:47:33 +0100
+Subject: [PATCH 3/7] contribs: Fix mpcdec build with MSVC
+
+---
+ libmpcpsy/psy_tab.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmpcpsy/psy_tab.c b/libmpcpsy/psy_tab.c
+index 35c56ac..698601c 100644
+--- a/libmpcpsy/psy_tab.c
++++ b/libmpcpsy/psy_tab.c
+@@ -187,7 +187,7 @@ Ruhehoerschwelle ( PsyModel* m,
}
}
-
+
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1800
static double
asinh ( double x )
{
+--
+2.45.0.windows.1
+
=====================================
contrib/src/mpcdec/musepack-no-binaries.patch
=====================================
@@ -1,7 +1,17 @@
-diff -urN musepack_src_r475.clean/CMakeLists.txt musepack_src_r475/CMakeLists.txt
---- musepack_src_r475.clean/CMakeLists.txt 2012-04-17 15:16:37.000000000 +0400
-+++ musepack_src_r475/CMakeLists.txt 2012-04-17 15:17:07.000000000 +0400
-@@ -23,11 +23,4 @@
+From 22bfcda42e120ffe18b727a53b346fb489ebd88f Mon Sep 17 00:00:00 2001
+From: Pavlov Konstantin <thresh at videolan.org>
+Date: Tue, 17 Apr 2012 13:18:34 +0200
+Subject: [PATCH 2/7] don't build binaries
+
+---
+ CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a6478c5..06d4363 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,11 +23,4 @@ add_subdirectory(libmpcdec)
add_subdirectory(libmpcpsy)
add_subdirectory(libmpcenc)
add_subdirectory(libwavformat)
@@ -13,3 +23,6 @@ diff -urN musepack_src_r475.clean/CMakeLists.txt musepack_src_r475/CMakeLists.tx
-add_subdirectory(mpcchap)
-add_subdirectory(wavcmp)
add_subdirectory(include)
+--
+2.45.0.windows.1
+
=====================================
contrib/src/mpcdec/musepack-no-cflags-clobber.patch
=====================================
@@ -1,7 +1,17 @@
-diff -ru musepack.orig/CMakeLists.txt musepack/CMakeLists.txt
---- musepack.orig/CMakeLists.txt 2011-08-08 10:21:17.000000000 +0300
-+++ musepack/CMakeLists.txt 2011-08-08 10:21:03.000000000 +0300
-@@ -16,7 +16,7 @@
+From 1f177a63ae04331f07be40b6cbfda312c51ac0c8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
+Date: Mon, 8 Aug 2011 17:31:04 +0200
+Subject: [PATCH 1/7] do not clobber our precious CFLAGS
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b13f78c..a6478c5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,7 @@ endif(WIN32)
add_definitions(-DFAST_MATH -DCVD_FASTLOG)
if(NOT MSVC)
@@ -10,3 +20,6 @@ diff -ru musepack.orig/CMakeLists.txt musepack/CMakeLists.txt
endif(NOT MSVC)
add_subdirectory(libmpcdec)
+--
+2.45.0.windows.1
+
=====================================
contrib/src/mpcdec/rules.mak
=====================================
@@ -29,7 +29,7 @@ musepack: musepack_src_r$(MUSE_REV).tar.gz .sum-mpcdec
.mpcdec: musepack toolchain.cmake
$(CMAKECLEAN)
- $(HOSTVARS_CMAKE) $(CMAKE) $(MUSE_CONF)
+ $(HOSTVARS_CMAKE) $(CMAKE)
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/0ef4d6151ce7a4443d88269fcb6f78bc0a442e98...22e73a44cf2b707fd0d825ad2eed5e882d003c25
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/0ef4d6151ce7a4443d88269fcb6f78bc0a442e98...22e73a44cf2b707fd0d825ad2eed5e882d003c25
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list