Ver Fonte

package/onevpl: rename package to libvpl

Upstream changed the package name and its github repo:
https://github.com/intel/libvpl/commit/44df6e08cc836ed65725ed344e7ec9ded5193874

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Bernd Kuhls há 1 ano atrás
pai
commit
f6acde11ab

+ 5 - 0
Config.in.legacy

@@ -146,6 +146,11 @@ endif
 
 
 comment "Legacy options removed in 2023.11"
 comment "Legacy options removed in 2023.11"
 
 
+config BR2_PACKAGE_ONEVPL
+	bool "onevpl package was renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LIBVPL
+
 config BR2_KERNEL_HEADERS_6_5
 config BR2_KERNEL_HEADERS_6_5
 	bool "kernel headers version 6.5.x are no longer supported"
 	bool "kernel headers version 6.5.x are no longer supported"
 	select BR2_LEGACY
 	select BR2_LEGACY

+ 1 - 1
DEVELOPERS

@@ -439,6 +439,7 @@ F:	package/libva/
 F:	package/libva-intel-driver/
 F:	package/libva-intel-driver/
 F:	package/libva-utils/
 F:	package/libva-utils/
 F:	package/libvorbis/
 F:	package/libvorbis/
+F:	package/libvpl/
 F:	package/libvpx/
 F:	package/libvpx/
 F:	package/libyuv/
 F:	package/libyuv/
 F:	package/linux-firmware/
 F:	package/linux-firmware/
@@ -449,7 +450,6 @@ F:	package/mjpg-streamer/
 F:	package/mpg123/
 F:	package/mpg123/
 F:	package/ntp/
 F:	package/ntp/
 F:	package/nut/
 F:	package/nut/
-F:	package/onevpl/
 F:	package/onevpl-intel-gpu/
 F:	package/onevpl-intel-gpu/
 F:	package/opus/
 F:	package/opus/
 F:	package/pciutils/
 F:	package/pciutils/

+ 1 - 1
package/Config.in

@@ -1669,9 +1669,9 @@ menu "Graphics"
 	source "package/libva-intel-driver/Config.in"
 	source "package/libva-intel-driver/Config.in"
 	source "package/libvdpau/Config.in"
 	source "package/libvdpau/Config.in"
 	source "package/libvips/Config.in"
 	source "package/libvips/Config.in"
+	source "package/libvpl/Config.in"
 	source "package/libwpe/Config.in"
 	source "package/libwpe/Config.in"
 	source "package/menu-cache/Config.in"
 	source "package/menu-cache/Config.in"
-	source "package/onevpl/Config.in"
 	source "package/onevpl-intel-gpu/Config.in"
 	source "package/onevpl-intel-gpu/Config.in"
 	source "package/opencl-clhpp/Config.in"
 	source "package/opencl-clhpp/Config.in"
 	source "package/opencv3/Config.in"
 	source "package/opencv3/Config.in"

+ 0 - 0
package/onevpl/0001-Don-t-force-fstack-protector.patch → package/libvpl/0001-Don-t-force-fstack-protector.patch


+ 6 - 6
package/onevpl/Config.in → package/libvpl/Config.in

@@ -1,11 +1,11 @@
-config BR2_PACKAGE_ONEVPL_ARCH_SUPPORTS
+config BR2_PACKAGE_LIBVPL_ARCH_SUPPORTS
 	bool
 	bool
 	default y if BR2_ARCH_IS_64
 	default y if BR2_ARCH_IS_64
 	default y if BR2_arm
 	default y if BR2_arm
 
 
-config BR2_PACKAGE_ONEVPL
-	bool "onevpl"
-	depends on BR2_PACKAGE_ONEVPL_ARCH_SUPPORTS
+config BR2_PACKAGE_LIBVPL
+	bool "libvpl"
+	depends on BR2_PACKAGE_LIBVPL_ARCH_SUPPORTS
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_STATIC_LIBS # dlfcn.h
 	depends on !BR2_STATIC_LIBS # dlfcn.h
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7
@@ -21,7 +21,7 @@ config BR2_PACKAGE_ONEVPL
 
 
 	  https://github.com/oneapi-src/oneVPL
 	  https://github.com/oneapi-src/oneVPL
 
 
-comment "onevpl needs a toolchain w/ dynamic library, gcc >= 7, C++, threads"
-	depends on BR2_PACKAGE_ONEVPL_ARCH_SUPPORTS
+comment "libvpl needs a toolchain w/ dynamic library, gcc >= 7, C++, threads"
+	depends on BR2_PACKAGE_LIBVPL_ARCH_SUPPORTS
 	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \
 	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \
 		!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 		!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

+ 1 - 1
package/onevpl/onevpl.hash → package/libvpl/libvpl.hash

@@ -1,3 +1,3 @@
 # Locally computed
 # Locally computed
-sha256  978398c7bb1665a6ad7a1a15cc57dc0204608e56c88436e376b717320a9e63fd  onevpl-2023.4.0.tar.gz
+sha256  978398c7bb1665a6ad7a1a15cc57dc0204608e56c88436e376b717320a9e63fd  libvpl-2023.4.0.tar.gz
 sha256  bf1cfac2e2792b6e1e995ce103d70796aecaf2ec7e4c5fe5474f7acec7b4a677  LICENSE
 sha256  bf1cfac2e2792b6e1e995ce103d70796aecaf2ec7e4c5fe5474f7acec7b4a677  LICENSE

+ 44 - 0
package/libvpl/libvpl.mk

@@ -0,0 +1,44 @@
+################################################################################
+#
+# libvpl
+#
+################################################################################
+
+LIBVPL_VERSION = 2023.4.0
+LIBVPL_SITE = $(call github,intel,libvpl,v$(LIBVPL_VERSION))
+LIBVPL_LICENSE = MIT
+LIBVPL_LICENSE_FILES = LICENSE
+LIBVPL_INSTALL_STAGING = YES
+LIBVPL_DEPENDENCIES = host-pkgconf
+
+LIBVPL_CONF_OPTS = \
+	-DBUILD_TOOLS=OFF \
+	-DINSTALL_EXAMPLE_CODE=OFF
+
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+LIBVPL_CONF_OPTS += \
+	-DCMAKE_CXX_FLAGS="-latomic"
+endif
+
+ifeq ($(BR2_PACKAGE_LIBVA),y)
+LIBVPL_CONF_OPTS += -DENABLE_VA=ON
+LIBVPL_DEPENDENCIES += libva
+else
+LIBVPL_CONF_OPTS += -DENABLE_VA=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_WAYLAND),y)
+LIBVPL_CONF_OPTS += -DENABLE_WAYLAND=ON
+LIBVPL_DEPENDENCIES += wayland wayland-protocols
+else
+LIBVPL_CONF_OPTS += -DENABLE_WAYLAND=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_XORG7),y)
+LIBVPL_CONF_OPTS += -DENABLE_X11=ON
+LIBVPL_DEPENDENCIES += libxcb xlib_libX11
+else
+LIBVPL_CONF_OPTS += -DENABLE_X11=OFF
+endif
+
+$(eval $(cmake-package))

+ 7 - 7
package/onevpl-intel-gpu/Config.in

@@ -1,16 +1,16 @@
 config BR2_PACKAGE_ONEVPL_INTEL_GPU
 config BR2_PACKAGE_ONEVPL_INTEL_GPU
 	bool "onevpl-intel-gpu"
 	bool "onevpl-intel-gpu"
 	depends on BR2_x86_64 # intel-mediadriver
 	depends on BR2_x86_64 # intel-mediadriver
-	depends on BR2_PACKAGE_ONEVPL_ARCH_SUPPORTS # onevpl
-	depends on BR2_INSTALL_LIBSTDCPP # onevpl
-	depends on !BR2_STATIC_LIBS # onevpl
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # onevpl
+	depends on BR2_PACKAGE_LIBVPL_ARCH_SUPPORTS # libvpl
+	depends on BR2_INSTALL_LIBSTDCPP # libvpl
+	depends on !BR2_STATIC_LIBS # libvpl
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libvpl
 	depends on BR2_TOOLCHAIN_HAS_SYNC_1 # intel-mediadriver
 	depends on BR2_TOOLCHAIN_HAS_SYNC_1 # intel-mediadriver
-	depends on BR2_TOOLCHAIN_HAS_THREADS # onevpl
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libvpl
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # intel-mediadriver
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # intel-mediadriver
 	select BR2_PACKAGE_INTEL_MEDIADRIVER # runtime
 	select BR2_PACKAGE_INTEL_MEDIADRIVER # runtime
 	select BR2_PACKAGE_LIBVA
 	select BR2_PACKAGE_LIBVA
-	select BR2_PACKAGE_ONEVPL
+	select BR2_PACKAGE_LIBVPL
 	help
 	help
 	  Intel® oneVPL GPU Runtime is a Runtime implementation of
 	  Intel® oneVPL GPU Runtime is a Runtime implementation of
 	  oneVPL API for Intel Gen GPUs, starting with Tiger Lake.
 	  oneVPL API for Intel Gen GPUs, starting with Tiger Lake.
@@ -19,7 +19,7 @@ config BR2_PACKAGE_ONEVPL_INTEL_GPU
 
 
 comment "onevpl-intel-gpu needs a toolchain w/ dynamic library, gcc >= 7, C++, NPTL"
 comment "onevpl-intel-gpu needs a toolchain w/ dynamic library, gcc >= 7, C++, NPTL"
 	depends on BR2_x86_64
 	depends on BR2_x86_64
-	depends on BR2_PACKAGE_ONEVPL_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_LIBVPL_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_SYNC_1
 	depends on BR2_TOOLCHAIN_HAS_SYNC_1
 	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \
 	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \
 		!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 		!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

+ 1 - 1
package/onevpl-intel-gpu/onevpl-intel-gpu.mk

@@ -8,6 +8,6 @@ ONEVPL_INTEL_GPU_VERSION = 23.4.3
 ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION))
 ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION))
 ONEVPL_INTEL_GPU_LICENSE = MIT
 ONEVPL_INTEL_GPU_LICENSE = MIT
 ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE
 ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE
-ONEVPL_INTEL_GPU_DEPENDENCIES = libva onevpl
+ONEVPL_INTEL_GPU_DEPENDENCIES = libva libvpl
 
 
 $(eval $(cmake-package))
 $(eval $(cmake-package))

+ 0 - 44
package/onevpl/onevpl.mk

@@ -1,44 +0,0 @@
-################################################################################
-#
-# onevpl
-#
-################################################################################
-
-ONEVPL_VERSION = 2023.4.0
-ONEVPL_SITE = $(call github,oneapi-src,oneVPL,v$(ONEVPL_VERSION))
-ONEVPL_LICENSE = MIT
-ONEVPL_LICENSE_FILES = LICENSE
-ONEVPL_INSTALL_STAGING = YES
-ONEVPL_DEPENDENCIES = host-pkgconf
-
-ONEVPL_CONF_OPTS = \
-	-DBUILD_TOOLS=OFF \
-	-DINSTALL_EXAMPLE_CODE=OFF
-
-ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
-ONEVPL_CONF_OPTS += \
-	-DCMAKE_CXX_FLAGS="-latomic"
-endif
-
-ifeq ($(BR2_PACKAGE_LIBVA),y)
-ONEVPL_CONF_OPTS += -DENABLE_VA=ON
-ONEVPL_DEPENDENCIES += libva
-else
-ONEVPL_CONF_OPTS += -DENABLE_VA=OFF
-endif
-
-ifeq ($(BR2_PACKAGE_WAYLAND),y)
-ONEVPL_CONF_OPTS += -DENABLE_WAYLAND=ON
-ONEVPL_DEPENDENCIES += wayland wayland-protocols
-else
-ONEVPL_CONF_OPTS += -DENABLE_WAYLAND=OFF
-endif
-
-ifeq ($(BR2_PACKAGE_XORG7),y)
-ONEVPL_CONF_OPTS += -DENABLE_X11=ON
-ONEVPL_DEPENDENCIES += libxcb xlib_libX11
-else
-ONEVPL_CONF_OPTS += -DENABLE_X11=OFF
-endif
-
-$(eval $(cmake-package))