qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Repair guenther's damage that I didn't ok.

Browse Source
This commit is contained in:
matthieu 2013-08-13 18:52:10 +00:00
parent a9e4debd4a
commit acee5d3c07
16 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
driver/xf86-video-intel/Makefile.bsd-wrapper
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2008/03/25 23:41:50 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2013/08/13 18:52:13 matthieu Exp $
.include <bsd.xconf.mk>
@ -6,4 +6,6 @@
CONFIGURE_ARGS+= --disable-dri
.endif
SHARED_LIBS= IntelXvMC 2,0
.include <bsd.xorg.mk>

2
driver/xf86-video-intel/src/legacy/i810/xvmc/Makefile.am
View File

@ -7,5 +7,5 @@ libI810XvMC_la_SOURCES = I810XvMC.c \
AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ -DTRUE=1 -DFALSE=0
libI810XvMC_la_LDFLAGS = -version-number 2:0:0
libI810XvMC_la_LDFLAGS = -version-number 1:0:0
libI810XvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@

2
driver/xf86-video-intel/src/legacy/i810/xvmc/Makefile.in
View File

@ -314,7 +314,7 @@ libI810XvMC_la_SOURCES = I810XvMC.c \
I810XvMC.h
AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ -DTRUE=1 -DFALSE=0
libI810XvMC_la_LDFLAGS = -version-number 2:0:0
libI810XvMC_la_LDFLAGS = -version-number 1:0:0
libI810XvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
all: all-am

2
driver/xf86-video-intel/src/xvmc/Makefile.am
View File

@ -19,5 +19,5 @@ libIntelXvMC_la_SOURCES = intel_xvmc.c \
AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
@XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
libIntelXvMC_la_LDFLAGS = -version-number 2:0:0
libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @DRMINTEL_LIBS@ -lpthread

2
driver/xf86-video-intel/src/xvmc/Makefile.in
View File

@ -365,7 +365,7 @@ libIntelXvMC_la_SOURCES = intel_xvmc.c \
AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
@XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
libIntelXvMC_la_LDFLAGS = -version-number 2:0:0
libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @DRMINTEL_LIBS@ -lpthread
all: all-recursive

4
lib/libX11/Makefile.bsd-wrapper
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.21 2013/08/13 07:07:12 guenther Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.22 2013/08/13 18:52:17 matthieu Exp $
.include <bsd.xconf.mk>
SHARED_LIBS= X11 16.0
SHARED_LIBS= X11 16.0 X11_xcb 2.0
CONFIGURE_ARGS= --enable-tcp-transport --enable-unix-transport --enable-ipv6 \
--disable-composecache \

2
lib/libX11/src/Makefile.am
View File

@ -350,7 +350,7 @@ EXTRA_DIST = \
UIThrStubs.c
libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
libX11_xcb_la_LDFLAGS = -version-number 2:0:0 -no-undefined
libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libX11_xcb_la_LIBADD = libX11.la
#

2
lib/libX11/src/Makefile.in
View File

@ -599,7 +599,7 @@ EXTRA_DIST = \
UIThrStubs.c
libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
libX11_xcb_la_LDFLAGS = -version-number 2:0:0 -no-undefined
libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libX11_xcb_la_LIBADD = libX11.la
#

4
lib/libXmu/Makefile.bsd-wrapper
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2013/08/13 07:07:17 guenther Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2013/08/13 18:52:14 matthieu Exp $
SHARED_LIBS= Xmu 11.0
SHARED_LIBS= Xmu 11.0 Xmuu 6.0
CONFIGURE_ARGS+= --without-xsltproc --without-fop --without-xmlto

2
lib/libXmu/src/Makefile.am
View File

@ -10,7 +10,7 @@ AM_CPPFLAGS = \
AM_CFLAGS = $(CWARNFLAGS) $(XMU_CFLAGS)
libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined
libXmuu_la_LDFLAGS = -version-number 6:0:0 -no-undefined
libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libXmu_la_LIBADD = $(XMU_LIBS)
libXmuu_la_LIBADD = $(XMUU_LIBS)

2
lib/libXmu/src/Makefile.in
View File

@ -259,7 +259,7 @@ AM_CPPFLAGS = \
AM_CFLAGS = $(CWARNFLAGS) $(XMU_CFLAGS)
libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined
libXmuu_la_LDFLAGS = -version-number 6:0:0 -no-undefined
libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libXmu_la_LIBADD = $(XMU_LIBS)
libXmuu_la_LIBADD = $(XMUU_LIBS)
libXmuu_la_SOURCES = \

4
lib/libXvMC/Makefile.bsd-wrapper
View File

@ -1,5 +1,5 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2013/08/13 07:07:19 guenther Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2013/08/13 18:52:11 matthieu Exp $
SHARED_LIBS= XvMC 6.0
SHARED_LIBS= XvMC 6.0 XvMCW 2.0
.include <bsd.xorg.mk>

2
lib/libXvMC/src/Makefile.am
View File

@ -5,7 +5,7 @@ AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS)
libXvMC_la_SOURCES = XvMC.c XvMClibint.h
libXvMC_la_LIBADD = $(XVMC_LIBS)
libXvMC_la_LDFLAGS = -version-number 2:0:0 -no-undefined
libXvMC_la_LDFLAGS = -version-number 1:0:0 -no-undefined
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \

2
lib/libXvMC/src/Makefile.in
View File

@ -293,7 +293,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(MALLOC_ZERO_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS)
libXvMC_la_SOURCES = XvMC.c XvMClibint.h
libXvMC_la_LIBADD = $(XVMC_LIBS)
libXvMC_la_LDFLAGS = -version-number 2:0:0 -no-undefined
libXvMC_la_LDFLAGS = -version-number 1:0:0 -no-undefined
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS)

2
lib/libXvMC/wrapper/Makefile.am
View File

@ -11,7 +11,7 @@ AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS)
libXvMCW_la_SOURCES = XvMCWrapper.c
libXvMCW_la_LIBADD = $(XVMC_LIBS)
libXvMCW_la_LDFLAGS = -version-number 2:0:0 -no-undefined
libXvMCW_la_LDFLAGS = -version-number 1:0:0 -no-undefined
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \

2
lib/libXvMC/wrapper/Makefile.in
View File

@ -299,7 +299,7 @@ AM_CPPFLAGS = \
AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS)
libXvMCW_la_SOURCES = XvMCWrapper.c
libXvMCW_la_LIBADD = $(XVMC_LIBS)
libXvMCW_la_LDFLAGS = -version-number 2:0:0 -no-undefined
libXvMCW_la_LDFLAGS = -version-number 1:0:0 -no-undefined
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS)