[vlc-commits] [Git][videolan/vlc][3.0.x] 3 commits: contrib: x265: update link and version of x265

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC


Commits:
4c8f13dc by rego21 at 2022-03-31T06:52:49+00:00
contrib: x265: update link and version of x265

The x265 link changed and version 2.7 isn't available in their downloads page.

- - - - -
14a7c847 by rego21 at 2022-03-31T06:52:49+00:00
contrib: x265: update patches

Update patches to tackle the 2.9 version.

- - - - -
008c3330 by rego21 at 2022-03-31T06:52:49+00:00
contrib: x265: add patch to enable detect512

Enables detect512 for all architectures

- - - - -


5 changed files:

- contrib/src/x265/SHA512SUMS
- contrib/src/x265/rules.mak
- + contrib/src/x265/x265-enable-detect512.patch
- contrib/src/x265/x265-ldl-linking.patch
- contrib/src/x265/x265-no-pdb-install.patch


Changes:

=====================================
contrib/src/x265/SHA512SUMS
=====================================
@@ -1 +1 @@
-a808ffe0da5e13bba42e8f6d6e1bc5bd7e3dfe8515a8177b315565461a5830ce4cb40888e84240521064ba38c0b6676eeb0ecc371a6ca9407b22b90481937350  x265-2.7.tar.bz2
+270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3  x265_2.9.tar.gz


=====================================
contrib/src/x265/rules.mak
=====================================
@@ -1,8 +1,8 @@
 # x265
 
 #X265_GITURL := https://github.com/videolan/x265
-X265_VERSION := 2.7
-X265_SNAPURL := https://bitbucket.org/multicoreware/x265/get/$(X265_VERSION).tar.bz2
+X265_VERSION := 2.9
+X265_SNAPURL := https://bitbucket.org/multicoreware/x265_git/downloads/x265_$(X265_VERSION).tar.gz
 
 ifdef BUILD_ENCODERS
 ifdef GPL
@@ -17,17 +17,16 @@ endif
 $(TARBALLS)/x265-git.tar.xz:
 	$(call download_git,$(X265_GITURL))
 
-$(TARBALLS)/x265-$(X265_VERSION).tar.bz2:
+$(TARBALLS)/x265_$(X265_VERSION).tar.gz:
 	$(call download_pkg,$(X265_SNAPURL),x265)
 
-.sum-x265: x265-$(X265_VERSION).tar.bz2
+.sum-x265: x265_$(X265_VERSION).tar.gz
 
-x265: x265-$(X265_VERSION).tar.bz2 .sum-x265
-	rm -Rf $@-$(X265_VERSION)
-	mkdir -p $@-$(X265_VERSION)
-	tar xvjfo "$<" --strip-components=1 -C $@-$(X265_VERSION)
+x265: x265_$(X265_VERSION).tar.gz .sum-x265
+	$(UNPACK)
 	$(APPLY) $(SRC)/x265/x265-ldl-linking.patch
 	$(APPLY) $(SRC)/x265/x265-no-pdb-install.patch
+	$(APPLY) $(SRC)/x265/x265-enable-detect512.patch
 	$(call pkg_static,"source/x265.pc.in")
 ifndef HAVE_WIN32
 	$(APPLY) $(SRC)/x265/x265-pkg-libs.patch


=====================================
contrib/src/x265/x265-enable-detect512.patch
=====================================
@@ -0,0 +1,26 @@
+This function is used on all architectures, not just X86.
+
+--- x265/source/common/cpu.cpp
++++ x265/source/common/cpu.cpp
+@@ -110,6 +110,11 @@
+     { "", 0 },
+ };
+ 
++bool detect512()
++{
++    return(enable512);
++}
++
+ #if X265_ARCH_X86
+ 
+ extern "C" {
+@@ -123,10 +128,6 @@
+ #pragma warning(disable: 4309) // truncation of constant value
+ #endif
+ 
+-bool detect512()
+-{
+-    return(enable512);
+-}
+ uint32_t cpu_detect(bool benableavx512 )
+ {


=====================================
contrib/src/x265/x265-ldl-linking.patch
=====================================
@@ -1,6 +1,6 @@
---- x265-1.9/source/CMakeLists.txt.orig	2016-01-25 06:16:50.000000000 +0100
-+++ x265-1.9/source/CMakeLists.txt	2016-07-10 13:36:14.759323966 +0200
-@@ -566,7 +566,7 @@
+--- x265/source/CMakeLists.txt.orig	2022-03-20 16:40:01.560434700 +0000
++++ x265/source/CMakeLists.txt	2022-03-20 16:41:20.563787600 +0000
+@@ -713,7 +713,7 @@
          if(WIN32 OR NOT ENABLE_SHARED OR INTEL_CXX)
              # The CLI cannot link to the shared library on Windows, it
              # requires internal APIs not exported from the DLL


=====================================
contrib/src/x265/x265-no-pdb-install.patch
=====================================
@@ -1,11 +1,11 @@
---- x265/source/CMakeLists.txt.nopdb	2018-05-18 16:28:43.150790700 +0200
-+++ x265/source/CMakeLists.txt	2018-05-18 16:28:53.838634400 +0200
-@@ -546,7 +546,7 @@ if(ENABLE_HDR10_PLUS)
+--- x265/source/CMakeLists.txt.nopdb	2022-03-20 16:50:06.435395700 +0000
++++ x265/source/CMakeLists.txt	2022-03-20 16:50:23.988474200 +0000
+@@ -554,7 +554,7 @@
          ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
  endif()
  install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
--if(WIN32)
-+if(WIN32 AND MSVC_IDE)
+-if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED))
++if((WIN32 AND ENABLE_CLI AND MSVC_IDE) OR (WIN32 AND ENABLE_SHARED AND MSVC_IDE))
      if(MSVC_IDE)
          install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
          install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/0d556269778d0b9d0e9d05cc78b3365e0e74792e...008c33307cbd901069444165e5cabb7cdb54ec17

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/0d556269778d0b9d0e9d05cc78b3365e0e74792e...008c33307cbd901069444165e5cabb7cdb54ec17
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance