Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3192 from suvari/master

Browse Source 
xorg-video-intel: fix dep
This commit is contained in:
Alihan Öztürk
2017-03-11 18:21:58 +02:00
committed by GitHub
parent 4077c408f5 16297e97f9
commit 117d905640
10 changed files with 122211 additions and 121766 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/virtualbox/files/virtualbox-system-x.patch
+56
View File
@@ -0,0 +1,56 @@
Index: VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
===================================================================
--- VirtualBox-5.1.2.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+++ VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
@@ -68,18 +68,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
VBoxOGL_INCS += \
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
$(VBOX_MESA_INCS) \
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
+ /usr/include/drm \
+ /usr/include/libdrm
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
@@ -214,10 +208,10 @@ VBoxOGL_LIBS.win += \
if1of ($(KBUILD_TARGET), linux solaris freebsd)
VBoxOGL_LIBS += \
- $(PATH_STAGE_LIB)/libXcomposite.so \
- $(PATH_STAGE_LIB)/libXdamage.so \
- $(PATH_STAGE_LIB)/libXfixes.so \
- $(PATH_STAGE_LIB)/libXext.so
+ Xcomposite \
+ Xdamage \
+ Xfixes \
+ Xext
ifdef VBoxOGL_FAKEDRI
ifeq ($(KBUILD_TARGET), freebsd)
VBoxOGL_LIBS += \
Index: VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
===================================================================
--- VirtualBox-5.1.2.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+++ VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
@@ -40,8 +40,6 @@ LIBRARIES += \
VBoxGuestR3LibShared
ifndef VBOX_ONLY_VALIDATIONKIT
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
- LIBRARIES += \
- VBoxGuestR3LibXFree86
endif
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
LIBRARIES += \
pisi-index.xml
+122143 -121755
View File
File diff suppressed because it is too large Load Diff
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
94cc99e7af703c1df220bb5c81c29dc4cd35433d
66791b1562de81a1cc18675c77085be480b19d49
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
128e74bc95ab12dbac5a328c6dd932cc14710d14
ad268fece8a08278d472d334f80e98f8f4985325
x11/driver/xorg-input-acecad/pspec.xml
+2 -2
View File
@@ -52,7 +52,7 @@
<Update release="4">
<Date>2017-03-11</Date>
<Version>1.5.0</Version>
<Comment>rebuild</Comment>
<Comment>Rebuild.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
@@ -78,4 +78,4 @@
<Email>burakerturk@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>
x11/driver/xorg-input-elographics/pspec.xml
+2 -2
View File
@@ -37,7 +37,7 @@
<Update release="4">
<Date>2017-03-11</Date>
<Version>1.4.1</Version>
<Comment>rebuild</Comment>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
@@ -63,4 +63,4 @@
<Email>burakerturk@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>
x11/driver/xorg-input-synaptics/pspec.xml
+2 -2
View File
@@ -64,7 +64,7 @@
<Update release="4">
<Date>2017-03-11</Date>
<Version>1.9.0</Version>
<Comment>rebuild</Comment>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
@@ -90,4 +90,4 @@
<Email>burakerturk@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>
x11/driver/xorg-video-apm/pspec.xml
+2 -2
View File
@@ -39,7 +39,7 @@
<Update release="4">
<Date>2017-03-11</Date>
<Version>1.2.5</Version>
<Comment>rebuild</Comment>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
@@ -65,4 +65,4 @@
<Email>burakerturk@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>
x11/driver/xorg-video-intel/pspec.xml
+2 -1
View File
@@ -36,6 +36,7 @@
<Dependency>xorg-server-devel</Dependency>
<Dependency>libxshmfence-devel</Dependency>
<Dependency>libXfont-devel</Dependency>
<Dependency>libXfont2-devel</Dependency>
</BuildDependencies>
</Source>
@@ -102,4 +103,4 @@
<Email>burakerturk@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>