XLibre/xf86-video-intel
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-intel.git synced 2026-03-24 01:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop Xvmc from build system

Browse Source 
First step of dropping Xvmc entirely from this driver.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-26 17:41:17 +02:00
parent 5e1e6554ed
commit f619ba4e9a
13 changed files with 0 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@@ -341,11 +341,6 @@ else
AC_DEFINE(DEFAULT_DRI_LEVEL, ~0, [Default DRI level])
fi
AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc],
[Disable XvMC support [[default=yes]]]),
[XVMC="$enableval"],
[XVMC="yes"])
AC_ARG_ENABLE(kms,
AS_HELP_STRING([--enable-kms],
[Assume KMS support [[default=yes]]]),
@@ -646,20 +641,6 @@ AC_MSG_CHECKING([whether to include SNA support])
AM_CONDITIONAL(SNA, test "x$SNA" != "xno")
AC_MSG_RESULT([$SNA])
if test "$XVMC" = "yes"; then
PKG_CHECK_MODULES(XVMCLIB, [xvmc dri2proto x11 x11-xcb xcb-dri2 xcb-aux libdrm_intel], [], [XVMC="no"])
fi
AC_MSG_CHECKING([whether to include XvMC support])
AC_MSG_RESULT([$XVMC])
AM_CONDITIONAL(XVMC, test "x$XVMC" = "xyes")
if test "x$XVMC" = "xyes"; then
AC_DEFINE(ENABLE_XVMC,1,[Enable XvMC support])
xvmc_msg=" yes"
else
xvmc_msg=" no"
fi
AC_ARG_WITH(default-accel,
AS_HELP_STRING([--with-default-accel],
[Select the default acceleration method out of none, sna, or uxa [default is sna if enabled, otherwise uxa]]),
@@ -898,7 +879,6 @@ echo " Additional debugging support?$debug_msg"
echo " Support for Kernel Mode Setting? $KMS"
echo " Support for legacy User Mode Setting (for i810)? $UMS"
echo " Support for Direct Rendering Infrastructure:$dri_msg"
echo " Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg"
echo " Support for display hotplug notifications (udev):$udev_msg"
echo " Build additional tools and utilities?$tools_msg"
if test -n "$xp_msg"; then

19
meson.build
View File

@@ -155,20 +155,6 @@ if with_ums
config.set('UMS', 1)
endif
with_xvmc = get_option('xvmc')
if with_xvmc
dependency('xv', required : true)
dependency('xvmc', required : true)
dependency('dri2proto', required : true)
dependency('x11', required : true)
dependency('x11-xcb', required : true)
dependency('xcb-dri2', required : true)
dependency('xcb-aux', required : true)
dependency('libdrm_intel', required : true)
config.set('ENABLE_XVMC', 1)
endif
with_valgrind = get_option('valgrind')
if with_valgrind
message('Checking Valgrind support')
@@ -199,11 +185,6 @@ man_config.set('vendorversion', '"@0@ @1@" "@2@"'.format(meson.project_name(),
subdir('src')
subdir('tools')
if with_xvmc
subdir('xvmc')
endif
subdir('man')
configure_file(output: 'config.h', install: false, configuration: config)

2
meson_options.txt
View File

@@ -16,8 +16,6 @@ option('dri3', type : 'boolean', value : true,
description : 'Build with DRI3 support')
option('present', type : 'boolean', value : true,
description : 'Enable Present support')
option('xvmc', type : 'boolean', value : true,
description : 'Enable XvMC support')
option('valgrind', type : 'boolean', value : true,
description : 'Enable valgrindified ioctls for debugging')
option('default-dri', type : 'combo', value : '2', choices : [ '1', '2', '3' ],

4
src/intel_options.h
View File

@@ -30,10 +30,6 @@ enum intel_options {
OPTION_PREFER_OVERLAY,
OPTION_HOTPLUG,
OPTION_REPROBE,
#if defined(XvMCExtension) && defined(ENABLE_XVMC)
OPTION_XVMC,
#define INTEL_XVMC 1
#endif
#ifdef USE_SNA
OPTION_ZAPHOD,
OPTION_VIRTUAL,

5
src/legacy/i810/Makefile.am
View File

@@ -36,9 +36,4 @@ liblegacy_i810_la_SOURCES +=\
$(NULL)
AM_CFLAGS += $(DRI1_CFLAGS)
if XVMC
liblegacy_i810_la_SOURCES += \
i810_hwmc.c \
$(NULL)
endif
endif

8
src/legacy/i810/meson.build
View File

@@ -28,10 +28,6 @@ endif
if with_dri1
i810_sources += 'i810_dri.c'
i810_deps += dependency('xf86driproto', required : true)
if with_xvmc
i810_sources += 'i810_hwmc.c'
endif
endif
i810 = static_library('legacy_i810',
@@ -43,7 +39,3 @@ i810 = static_library('legacy_i810',
'-Wno-sign-compare',
],
install : false)
if with_xvmc
subdir('xvmc')
endif

4
src/legacy/i810/xvmc/Makefile.am
View File

@@ -1,7 +1,3 @@
if XVMC
lib_LTLIBRARIES=libI810XvMC.la
endif
libI810XvMC_la_SOURCES = I810XvMC.c \
I810XvMC.h

7
src/sna/Makefile.am
View File

@@ -130,13 +130,6 @@ libsna_la_SOURCES += sna_present.c
libsna_la_LIBADD += $(PRESENT_LIBS)
endif
if XVMC
libsna_la_SOURCES += \
sna_video_hwmc.h \
sna_video_hwmc.c \
$(NULL)
endif
if FULL_DEBUG
libsna_la_SOURCES += \
kgem_debug.c \

4
src/sna/meson.build
View File

@@ -94,10 +94,6 @@ if has_present
sna_deps += present
endif
if with_xvmc
sna_sources += 'sna_video_hwmc.c'
endif
if debug == 'full'
sna_sources += [
'kgem_debug.c',

4
src/sna/sna_video.h
View File

@@ -31,10 +31,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <xf86xv.h>
#include <fourcc.h>
#if defined(XvMCExtension) && defined(ENABLE_XVMC)
#define SNA_XVMC 1
#endif
#define FOURCC_XVMC (('C' << 24) + ('M' << 16) + ('V' << 8) + 'X')
#define FOURCC_RGB565 ((16 << 24) + ('B' << 16) + ('G' << 8) + 'R')
#define FOURCC_RGB888 ((24 << 24) + ('B' << 16) + ('G' << 8) + 'R')

7
src/uxa/Makefile.am
View File

@@ -86,10 +86,3 @@ libuxa_la_SOURCES += \
intel_present.c \
$(NULL)
endif
if XVMC
AM_CFLAGS += -I$(top_srcdir)/xvmc
libuxa_la_SOURCES += \
intel_hwmc.c \
$(NULL)
endif

4
src/uxa/meson.build
View File

@@ -48,10 +48,6 @@ if has_present
uxa_sources += 'intel_present.c'
endif
if with_xvmc
uxa_sources += 'intel_hwmc.c'
endif
uxa = static_library('uxa',
sources : uxa_sources,
dependencies : uxa_deps,

4
xvmc/Makefile.am
View File

@@ -1,7 +1,3 @@
if XVMC
lib_LTLIBRARIES=libIntelXvMC.la
endif
SUBDIRS = shader
libIntelXvMC_la_SOURCES = \