Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
ab4134c1 by Johannes Kauffmann at 2022-09-15T05:49:19+00:00
contrib: openjpeg: remove unused FreeBSD patch
It hasn't been applied for a long time, and was already integrated with
2.3.0.
- - - - -
c8ef7c08 by Johannes Kauffmann at 2022-09-15T05:49:19+00:00
contrib: openjpeg: remove unused restrict patch
It wasn't applied since a long time, and was not applicable anymore
since the switch to CMake. openjpeg checks for restrict internally now.
- - - - -
eb7ec442 by Johannes Kauffmann at 2022-09-15T05:49:19+00:00
contrib: openjpeg: update to 2.5.0
- - - - -
5c49d608 by Johannes Kauffmann at 2022-09-15T05:49:19+00:00
contrib: ffmpeg: cleanup openjpeg rules
openjpeg used to be disabled with libav, but libav is gone now.
- - - - -
9 changed files:
- contrib/src/ffmpeg/rules.mak
- contrib/src/openjpeg/SHA512SUMS
- − contrib/src/openjpeg/emscripten.patch
- − contrib/src/openjpeg/freebsd.patch
- − contrib/src/openjpeg/install.patch
- − contrib/src/openjpeg/msvc.patch
- contrib/src/openjpeg/openjp2_pthread.patch
- − contrib/src/openjpeg/restrict.patch
- contrib/src/openjpeg/rules.mak
Changes:
=====================================
contrib/src/ffmpeg/rules.mak
=====================================
@@ -15,6 +15,7 @@ FFMPEGCONF = \
--disable-encoder=vorbis \
--disable-decoder=opus \
--enable-libgsm \
+ --enable-libopenjpeg \
--disable-debug \
--disable-avdevice \
--disable-devices \
@@ -36,11 +37,7 @@ FFMPEGCONF += \
--disable-securetransport
endif
-DEPS_ffmpeg = zlib $(DEPS_zlib) gsm $(DEPS_gsm)
-
-FFMPEGCONF += \
- --enable-libopenjpeg
-DEPS_ffmpeg += openjpeg $(DEPS_openjpeg)
+DEPS_ffmpeg = zlib $(DEPS_zlib) gsm $(DEPS_gsm) openjpeg $(DEPS_openjpeg)
# Optional dependencies
ifndef BUILD_NETWORK
=====================================
contrib/src/openjpeg/SHA512SUMS
=====================================
@@ -1 +1 @@
-0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
openjpeg-v2.3.0.tar.gz
+08975a2dd79f1e29fd1824249a5fbe66026640ed787b3a3aa8807c2c69f994240ff33e2132f8bf15bbc2202bef7001f98e42d487231d4eebc8e503538658049a
openjpeg-v2.5.0.tar.gz
=====================================
contrib/src/openjpeg/emscripten.patch deleted
=====================================
@@ -1,29 +0,0 @@
-From c4c22e82c1fb1d722509e5005cb3ee4b3600b919 Mon Sep 17 00:00:00 2001
-From: Mehdi Sabwat <mehdisab...@gmail.com>
-Date: Mon, 26 Apr 2021 15:37:44 +0200
-Subject: [PATCH 1/1] emscripten: disable big endian test
-
-This test should not run on the emscripten platform because of :
-https://github.com/emscripten-core/emscripten/blob/dff33368427fba16745c8ce52f11484a67b2855d/cmake/Modules/TestBigEndian.cmake#L5
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 299f74c3..d343905b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -162,8 +162,10 @@ endif()
-
- #-----------------------------------------------------------------------------
- # Big endian test:
-+if (NOT EMSCRIPTEN)
- include (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
- TEST_BIG_ENDIAN(OPJ_BIG_ENDIAN)
-+endif()
-
- #-----------------------------------------------------------------------------
- # Setup file for setting custom ctest vars
---
-2.31.1
-
=====================================
contrib/src/openjpeg/freebsd.patch deleted
=====================================
@@ -1,13 +0,0 @@
-*** openjpeg/libopenjpeg/opj_malloc.h.orig 2012-01-27 16:25:43.875875000
-0500
---- openjpeg/libopenjpeg/opj_malloc.h 2012-01-27 16:25:43.875875000 -0500
-***************
-*** 83,88 ****
---- 83,90 ----
- #else /* Not _WIN32 */
- #if defined(__sun)
- #define HAVE_MEMALIGN
-+ #elif defined(__FreeBSD__)
-+ #define HAVE_POSIX_MEMALIGN
- /* Linux x86_64 and OSX always align allocations to 16 bytes */
- #elif !defined(__amd64__) && !defined(__APPLE__)
- #define HAVE_MEMALIGN
=====================================
contrib/src/openjpeg/install.patch deleted
=====================================
@@ -1,23 +0,0 @@
-From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.roua...@spatialys.com>
-Date: Mon, 9 Oct 2017 11:40:43 +0200
-Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or
- static-only build lacks the installation target for the library (#1019, fixes
- regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)
-
----
- src/lib/openjp2/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
-index 0b4520384..f8990ccf0 100644
---- a/src/lib/openjp2/CMakeLists.txt
-+++ b/src/lib/openjp2/CMakeLists.txt
-@@ -99,6 +99,7 @@ else()
- set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
- else()
- add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
-+ set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
- endif()
- endif()
-
=====================================
contrib/src/openjpeg/msvc.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- openjpeg/libopenjpeg/opj_includes.h 2012-02-07 11:49:55.000000000
+0100
-+++ /home/vlc/vlc/contrib/windowsphone/openjpeg/libopenjpeg/opj_includes.h
2014-12-15 16:54:31.303058600 +0100
-@@ -87,7 +87,7 @@
- #endif
-
- /* MSVC and Borland C do not have lrintf */
--#if defined(_MSC_VER) || defined(__BORLANDC__)
-+#if (defined(_MSC_VER) && _MSC_VER < 1800) || defined(__BORLANDC__)
- static INLINE long lrintf(float f){
- #ifdef _M_X64
- return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
=====================================
contrib/src/openjpeg/openjp2_pthread.patch
=====================================
@@ -1,5 +1,5 @@
---- openjpeg/src/lib/openjp2/libopenjp2.pc.cmake.in.ORIG 2017-10-04
18:23:14.000000000 -0400
-+++ openjpeg/src/lib/openjp2/libopenjp2.pc.cmake.in 2017-12-05
19:05:07.578239280 -0500
+--- openjpeg/src/lib/openjp2/libopenjp2.pc.cmake.in.ORIG 2022-09-11
18:37:05.422118714 +0200
++++ openjpeg/src/lib/openjp2/libopenjp2.pc.cmake.in 2022-09-11
18:37:24.669787836 +0200
@@ -10,5 +10,5 @@
URL: http://www.openjpeg.org/
Version: @OPENJPEG_VERSION@
@@ -7,9 +7,9 @@
-Libs.private: -lm
+Libs.private: -lm @PTHREAD_LIBS@
Cflags: -I${includedir}
---- openjpeg/src/lib/openjp2/CMakeLists.txt.ORIG 2017-12-05
19:24:42.152312033 -0500
-+++ openjpeg/src/lib/openjp2/CMakeLists.txt 2017-12-05 19:25:35.097306981
-0500
-@@ -188,6 +188,7 @@
+--- openjpeg/src/lib/openjp2/CMakeLists.txt.ORIG 2022-09-11
18:54:26.244430934 +0200
++++ openjpeg/src/lib/openjp2/CMakeLists.txt 2022-09-11 19:01:15.953517284
+0200
+@@ -191,6 +191,7 @@
endif(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_WIN32_THREADS_INIT )
if(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT )
@@ -17,18 +17,18 @@
add_definitions( -DMUTEX_pthread)
endif(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT )
-@@ -216,3 +216,8 @@
+@@ -219,3 +220,8 @@
target_link_libraries(test_sparse_array ${CMAKE_THREAD_LIBS_INIT})
endif(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT)
- endif(BUILD_UNIT_TESTS)
+ endif(BUILD_UNIT_TESTS AND UNIX)
+
+if(BUILD_PKGCONFIG_FILES)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libopenjp2.pc.cmake.in
+ ${PROJECT_BINARY_DIR}/libopenjp2.pc @ONLY)
+endif(BUILD_PKGCONFIG_FILES)
---- openjpeg/CMakeLists.txt.ORIG 2017-10-04 18:23:14.000000000 -0400
-+++ openjpeg/CMakeLists.txt 2017-12-05 19:43:35.573788173 -0500
-@@ -359,8 +359,6 @@
+--- openjpeg/CMakeLists.txt.ORIG 2022-09-11 18:55:05.655765381 +0200
++++ openjpeg/CMakeLists.txt 2022-09-11 18:55:30.279349621 +0200
+@@ -367,8 +367,6 @@
endif()
if(BUILD_PKGCONFIG_FILES)
# install in lib and not share (see multi-arch note above)
=====================================
contrib/src/openjpeg/restrict.patch deleted
=====================================
@@ -1,50 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 71098e5..8843546 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -486,6 +486,8 @@ else
- OPJ_COMPILER_FLAG([-O3])
- fi
-
-+AC_C_RESTRICT
-+
-
- ### Checks for linker characteristics
-
-diff --git a/libopenjpeg/dwt.c b/libopenjpeg/dwt.c
-index 0fbfc20..26ee0f4 100644
---- a/libopenjpeg/dwt.c
-+++ b/libopenjpeg/dwt.c
-@@ -35,6 +35,7 @@
- #include <xmmintrin.h>
- #endif
-
-+#include "opj_config.h"
- #include "opj_includes.h"
-
- /** @defgroup DWT DWT - Implementation of a discrete wavelet transform */
-diff --git a/libopenjpeg/mct.c b/libopenjpeg/mct.c
-index 870993b..66c91d8 100644
---- a/libopenjpeg/mct.c
-+++ b/libopenjpeg/mct.c
-@@ -33,6 +33,7 @@
- #include <xmmintrin.h>
- #endif
-
-+#include "opj_config.h"
- #include "opj_includes.h"
-
- /* <summary> */
-diff --git a/libopenjpeg/t1.c b/libopenjpeg/t1.c
-index ed9cdc3..78f6940 100644
---- a/libopenjpeg/t1.c
-+++ b/libopenjpeg/t1.c
-@@ -30,6 +30,7 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#include "opj_config.h"
- #include "opj_includes.h"
- #include "t1_luts.h"
-
-
=====================================
contrib/src/openjpeg/rules.mak
=====================================
@@ -1,6 +1,6 @@
# jpeg
-OPENJPEG_VERSION := 2.3.0
+OPENJPEG_VERSION := 2.5.0
OPENJPEG_URL :=
https://github.com/uclouvain/openjpeg/archive/v$(OPENJPEG_VERSION).tar.gz
ifdef HAVE_WIN32
@@ -15,14 +15,8 @@ $(TARBALLS)/openjpeg-v$(OPENJPEG_VERSION).tar.gz:
openjpeg: openjpeg-v$(OPENJPEG_VERSION).tar.gz .sum-openjpeg
$(UNPACK)
mv openjpeg-$(OPENJPEG_VERSION) openjpeg-v$(OPENJPEG_VERSION)
-ifdef HAVE_VISUALSTUDIO
-# $(APPLY) $(SRC)/openjpeg/msvc.patch
-endif
-# $(APPLY) $(SRC)/openjpeg/restrict.patch
- $(APPLY) $(SRC)/openjpeg/install.patch
$(APPLY) $(SRC)/openjpeg/pic.patch
$(APPLY) $(SRC)/openjpeg/openjp2_pthread.patch
- $(APPLY) $(SRC)/openjpeg/emscripten.patch
$(call pkg_static,"./src/lib/openjp2/libopenjp2.pc.cmake.in")
$(MOVE)
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/96cc32c529002b1dd9f21afc86df1bb15adee818...5c49d608f7748b5981457e741c219c35624e0811
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/96cc32c529002b1dd9f21afc86df1bb15adee818...5c49d608f7748b5981457e741c219c35624e0811
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits