SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-07-20 20:41:33 +00:00
parent b5b25afdb8
commit 2c72e27ed2
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
147 changed files with 41128 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/mesa/mk/Makefile
View file

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2024/06/18 02:44:13 jsg Exp $
# $OpenBSD: Makefile,v 1.9 2024/07/19 14:42:33 rsadowski Exp $
.include "config.mk"
@ -39,6 +39,7 @@ SUBDIR+= libisl_gfx${GFX}
.if ${WITH_GALLIUM_R300} == "yes" || ${WITH_GALLIUM_R600} == "yes" || \
${WITH_GALLIUM_RADEONSI} == "yes" || make(obj)
SUBDIR+= libva_st
SUBDIR+= libradeonwinsys
.endif
@ -101,4 +102,6 @@ SUBDIR+= libglapi libgbm libEGL libGL libGLESv1_CM libGLESv2 libOSMesa
SUBDIR+= libgallium_dri
SUBDIR+= libgallium_drv_video
.include <bsd.subdir.mk>

2
lib/mesa/mk/config.mk
View file

@ -224,12 +224,14 @@ WITH_SSE41=yes
${MACHINE} == "sparc64"
WITH_GALLIUM_R300=yes
WITH_GALLIUM_R600=yes
WITH_VAAPI=yes
CPPFLAGS+= -DHAVE_R300 -DHAVE_R600
.endif
.if ${MACHINE} == "amd64" || ${MACHINE} == "arm64" || ${MACHINE} == "i386" || \
${MACHINE} == "powerpc64" || ${MACHINE} == "riscv64"
WITH_GALLIUM_RADEONSI=yes
WITH_VAAPI=yes
WITH_AMD_VK=yes
CPPFLAGS+= -DHAVE_RADEONSI
.endif

3
lib/mesa/mk/libgallium_dri/Makefile
View file

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2024/06/17 01:29:12 jsg Exp $
# $OpenBSD: Makefile,v 1.12 2024/07/19 14:41:46 rsadowski Exp $
LIB= gallium_dri
@ -16,6 +16,7 @@ CPPFLAGS+= -I${MESA_SRC}/src/gallium/include \
-I${MESA_SRC}/src/gallium/auxiliary \
-I${MESA_SRC}/src/gallium/drivers \
-I${MESA_SRC}/src/gallium/frontends/dri \
-I${MESA_SRC}/src/gallium/frontends/va \
-I${MESA_SRC}/src/gallium/winsys \
-I${MESA_SRC}/src/mesa \
-I${MESA_SRC}/src/mesa/drivers/dri/common \

147
lib/mesa/mk/libgallium_drv_video/Makefile Normal file
View file

@ -0,0 +1,147 @@
# $OpenBSD: Makefile,v 1.1 2024/07/19 14:40:46 rsadowski Exp $
LIB= gallium_drv_video
NOPROFILE=
SRCS= target.c
.include "../Makefile.inc"
CFLAGS+= ${C_VIS_ARGS}
CXXFLAGS+= ${CXX_VIS_ARGS}
CPPFLAGS+= -I${MESA_SRC}/src/gallium/include \
-I${MESA_SRC}/src/gallium/auxiliary \
-I${MESA_SRC}/src/gallium/drivers \
-I${MESA_SRC}/src/gallium/frontends/dri \
-I${MESA_SRC}/src/gallium/frontends/va \
-I${MESA_SRC}/src/gallium/winsys \
-I${MESA_SRC}/src/mesa \
-I${MESA_SRC}/src/mesa/drivers/dri/common \
-I${MESA_SRC}/generated/src/util \
-I${MESA_SRC}/generated/src/gallium/drivers \
-DGALLIUM_SOFTPIPE
obj: _xenocara_obj
.include <bsd.lib.mk>
.include <bsd.xorg.mk>
.if ${WITH_GALLIUM_R600} == "yes"
GALLIUM_DRIVERS+= r600
CPPFLAGS+= -DGALLIUM_R600
.endif
.if ${WITH_GALLIUM_RADEONSI} == "yes"
GALLIUM_DRIVERS+= radeonsi
CPPFLAGS+= -DGALLIUM_RADEONSI
.endif
.if ${WITH_LLVM} == "yes"
CPPFLAGS+= -DGALLIUM_LLVMPIPE
.endif
install:
.for driver in ${GALLIUM_DRIVERS}
${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
-o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
lib${LIB}.so ${DESTDIR}${X11BASE}/lib/modules/drivers/${driver}_drv_video.so
.endfor
SLIBS+= libdri \
libmesa \
libglsl \
libglcpp \
libmesa_util \
libmesa_format \
libmesa_util_sse41 \
libblake3 \
libmesa_util_c11 \
libnir \
libcompiler \
libgalliumvl \
libgallium \
libpipe_loader_static \
libloader \
libxmlconfig \
libws_null \
libwsw \
libswdri \
libswkmsdri \
libsoftpipe \
libvtn
.if ${WITH_SSE41} == "yes"
SLIBS+= libmesa_sse41
.endif
.if ${WITH_GALLIUM_R300} == "yes" || ${WITH_GALLIUM_R600} == "yes" || \
${WITH_GALLIUM_RADEONSI} == "yes"
SLIBS+= libradeonwinsys
.endif
LDADD+= -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,--whole-archive -Wl,--start-group
.if ${WITH_VAAPI} == "yes"
LDADD+= ${.CURDIR}/../libva_st/${__objdir}/libva_st.a -Wl,--no-whole-archive -Wl,-z,origin
.endif
.if ${WITH_GALLIUM_R600} == "yes"
SLIBS+= libr600
.endif
.if ${WITH_GALLIUM_RADEONSI} == "yes"
SLIBS+= libamdgpuwinsys \
libaddrlib \
libamd_common \
libamd_common_llvm \
libaco \
libradeonsi_gfx6 \
libradeonsi_gfx7 \
libradeonsi_gfx8 \
libradeonsi_gfx9 \
libradeonsi_gfx10 \
libradeonsi_gfx103 \
libradeonsi_gfx11 \
libradeonsi_gfx115 \
libradeonsi
.endif
.if ${WITH_LLVM} == "yes"
SLIBS+= libllvmpipe
.endif
.for slib in ${SLIBS}
LDADD+= ${.CURDIR}/../${slib}/${__objdir}/${slib}.a
.endfor
LDADD+= -L${.CURDIR}/../libglapi/${__objdir} -lglapi
LDADD+= -lelf -lLLVM -lexpat -lz -lm -lpthread
LDADD+= -L${X11BASE}/lib -ldrm
LDADD+= -lxshmfence
LDADD+= -lxcb-present -lxcb-xfixes -lX11-xcb -lxcb -lxcb-sync
LDADD+= -lxcb-dri3 -lxcb-randr -lxcb-dri2
.if ${WITH_GALLIUM_R300} == "yes" || ${WITH_GALLIUM_R600} == "yes"
LDADD+= -ldrm_radeon
.endif
.if ${WITH_GALLIUM_RADEONSI} == "yes"
LDADD+= -ldrm_amdgpu
.endif
LDADD+= ${BUILD_ID_SHA1} -Wl,--gc-sections \
-Wl,--version-script ${MESA_SRC}/src/gallium/targets/va/va.sym
.if ${WITH_LD_DYNAMIC_LIST} == "yes"
LDADD+= -Wl,--dynamic-list ${MESA_SRC}/src/gallium/targets/dri.dyn
.endif
LDADD+= -Wl,--end-group
all: lib${LIB}.so
lib${LIB}.so: ${SOBJS} ${DPADD}
${CXX} -shared -Wl,-soname,lib${LIB}.so ${PICFLAG} -o ${.TARGET} \
`echo ${SOBJS} | tr ' ' '\n' | sort -R` ${LDADD}
CLEANFILES+= lib${LIB}.so
.PATH: ${MESA_SRC}/src/gallium/targets/va/

8
lib/mesa/mk/libgalliumvl/Makefile
View file

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2023/01/28 08:56:34 jsg Exp $
# $OpenBSD: Makefile,v 1.4 2024/07/19 14:40:43 rsadowski Exp $
LIB= galliumvl
@ -22,7 +22,10 @@ SRCS= vl_bicubic_filter.c \
vl_video_buffer.c \
vl_zscan.c
SRCS+= vl_winsys_dri_vgem.c
SRCS+= vl_winsys_dri_vgem.c \
vl_winsys_dri.c \
vl_winsys_dri3.c \
vl_winsys_drm.c
.include "../Makefile.inc"
@ -31,6 +34,7 @@ CXXFLAGS+= ${CXX_VIS_ARGS}
CPPFLAGS+= -I${MESA_SRC}/src/gallium/auxiliary/vl \
-I${MESA_SRC}/src/gallium/include \
-I${MESA_SRC}/src/gallium/auxiliary \
-I${MESA_SRC}/src/loader \
-I${MESA_SRC}/src/util
install:

50
lib/mesa/mk/libva_st/Makefile Normal file
View file

@ -0,0 +1,50 @@
# $OpenBSD: Makefile,v 1.1 2024/07/19 14:40:39 rsadowski Exp $
.include <bsd.xconf.mk>
LIB= va_st
NOPROFILE=
SRCS= buffer.c \
config.c \
context.c \
display.c \
image.c \
picture.c \
picture_av1.c \
picture_av1_enc.c \
picture_h264.c \
picture_h264_enc.c \
picture_hevc.c \
picture_hevc_enc.c \
picture_mjpeg.c \
picture_mpeg12.c \
picture_mpeg4.c \
picture_vc1.c \
picture_vp9.c \
postproc.c \
subpicture.c \
surface.c
.include "../Makefile.inc"
CFLAGS+= ${C_VIS_ARGS}
CXXFLAGS+= ${CXX_VIS_ARGS}
# XXX keep in sync with libva
CFLAGS += -DVA_DRIVER_INIT_FUNC=__vaDriverInit_1_22
CPPFLAGS += -DVA_DRIVER_INIT_FUNC=__vaDriverInit_1_22
CPPFLAGS+= -I${MESA_SRC}/src/gallium/frontends/va \
-I${MESA_SRC}/src/gallium/include \
-I${MESA_SRC}/src/gallium/auxiliary
install:
obj: _xenocara_obj
.include <bsd.lib.mk>
.include <bsd.xorg.mk>
.PATH: ${MESA_SRC}/src/gallium/frontends/va