1
diff --git a/debian/patches/egl-platform-mir.patch b/debian/patches/egl-platform-mir.patch
2
index 851deca..ee795ed 100644
3
--- a/debian/patches/egl-platform-mir.patch
4
+++ b/debian/patches/egl-platform-mir.patch
7
* Map --with-egl-platforms names to platform types.
9
- { _EGL_PLATFORM_DRM, "drm" },
10
{ _EGL_PLATFORM_FBDEV, "fbdev" },
11
{ _EGL_PLATFORM_NULL, "null" },
12
-- { _EGL_PLATFORM_ANDROID, "android" }
13
-+ { _EGL_PLATFORM_ANDROID, "android" },
14
+ { _EGL_PLATFORM_ANDROID, "android" },
15
+- { _EGL_PLATFORM_HAIKU, "haiku" }
16
+ { _EGL_PLATFORM_MIR, "mir" },
20
--- a/src/egl/main/egldisplay.h
21
+++ b/src/egl/main/egldisplay.h
23
- _EGL_PLATFORM_FBDEV,
25
_EGL_PLATFORM_ANDROID,
26
+ _EGL_PLATFORM_HAIKU,
1
30
diff --git a/debian/control b/debian/control
2
index a1f52c4..0f6c554 100644
31
index aeeb12a..2224936 100644
3
32
--- a/debian/control
4
33
+++ b/debian/control
5
@@ -42,7 +42,6 @@ Build-Depends:
6
llvm-3.4-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
7
libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
8
libwayland-dev (>= 1.2.0) [linux-any],
9
- libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
10
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
11
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
12
Homepage: http://mesa3d.sourceforge.net/
13
@@ -199,7 +198,6 @@ Depends:
17
- libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
18
libwayland-dev (>= 1.2.0) [linux-any],
20
Description: free implementation of the EGL API -- development files
34
@@ -150,7 +150,6 @@ Depends:
37
libgl1-mesa-dri (= ${binary:Version}),
38
-Recommends: libegl1-mesa-drivers [!hurd-any]
40
Conflicts: libegl1-x11
42
@@ -185,7 +184,6 @@ Section: libdevel
45
libegl1-mesa (= ${binary:Version}),
46
- libegl1-mesa-drivers (= ${binary:Version}) [!hurd-any],
47
libdrm-dev (>= 2.4.52) [!hurd-any],
48
x11proto-dri2-dev (>= 2.6),
49
x11proto-gl-dev (>= 1.4.14),
50
@@ -256,7 +254,6 @@ Depends:
53
libegl1-mesa (= ${binary:Version})
54
-Recommends: libegl1-mesa-drivers
55
Provides: libwayland-egl1
56
Conflicts: libwayland-egl1
57
Replaces: libwayland-egl1, libegl1-mesa-drivers (<< 10.1.0-2)
58
@@ -278,59 +275,6 @@ Description: implementation of the Wayland EGL platform -- debugging symbols
59
This package contains the debugging symbols for the mesa implementation of the
62
-Package: libopenvg1-mesa
64
-Architecture: linux-any kfreebsd-any
69
-Conflicts: libopenvg1
71
-Pre-Depends: ${misc:Pre-Depends}
73
-Description: free implementation of the OpenVG API -- runtime
74
- This package contains the mesa implementation of the OpenVG 2D acceleration
75
- library. OpenVG provides a device independent and vendor-neutral interface
76
- for sophisticated 2D graphical applications, while allowing device
77
- manufacturers to provide hardware acceleration on devices ranging from wrist
78
- watches to full microprocessor-based desktop and server machines.
80
-Package: libopenvg1-mesa-dbg
83
-Architecture: linux-any kfreebsd-any
85
- libopenvg1-mesa (= ${binary:Version}),
88
-Description: free implementation of the OpenVG API -- debugging symbols
89
- This package contains the mesa implementation of the OpenVG 2D acceleration
90
- library. OpenVG provides a device independent and vendor-neutral interface
91
- for sophisticated 2D graphical applications, while allowing device
92
- manufacturers to provide hardware acceleration on devices ranging from wrist
93
- watches to full microprocessor-based desktop and server machines.
95
- This package contains the debugging symbols for the OpenVG library.
97
-Package: libopenvg1-mesa-dev
99
-Architecture: linux-any kfreebsd-any
101
- libopenvg1-mesa (= ${binary:Version}),
105
-Description: free implementation of the OpenVG API -- development files
106
- This package contains the mesa implementation of the OpenVG 2D acceleration
107
- library. OpenVG provides a device independent and vendor-neutral interface
108
- for sophisticated 2D graphical applications, while allowing device
109
- manufacturers to provide hardware acceleration on devices ranging from wrist
110
- watches to full microprocessor-based desktop and server machines.
112
- This package contains the development environment required for compiling
113
- programs against the OpenVG 2D acceleration library.
115
Package: libgles1-mesa
118
diff --git a/debian/libegl1-mesa-drivers.install.in b/debian/libegl1-mesa-drivers.install.in
119
index 72a3603..ecdbbe5 100644
120
--- a/debian/libegl1-mesa-drivers.install.in
121
+++ b/debian/libegl1-mesa-drivers.install.in
123
# This file gets tweaked in an os-specific fashion (see libegl1-mesa-drivers.install.linux.in)
124
-dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so usr/lib/${DEB_HOST_MULTIARCH}/egl
125
+#dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so usr/lib/${DEB_HOST_MULTIARCH}/egl
126
diff --git a/debian/libgbm1.install.in b/debian/libgbm1.install.in
127
index be214fc..44a4050 100644
128
--- a/debian/libgbm1.install.in
129
+++ b/debian/libgbm1.install.in
131
dri/usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so.1* usr/lib/${DEB_HOST_MULTIARCH}
132
-dri/usr/lib/${DEB_HOST_MULTIARCH}/gbm usr/lib/${DEB_HOST_MULTIARCH}
21
133
diff --git a/debian/rules b/debian/rules
22
index 43329b0..931fa44 100755
134
index fdc824b..c990cce 100755
23
135
--- a/debian/rules
24
136
+++ b/debian/rules
25
@@ -71,11 +71,6 @@ else
26
# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
27
EGL_DISPLAYS += wayland
29
-# Mir isn't built on AArch64 and PPC
30
- ifeq (,$(filter $(DEB_HOST_ARCH),arm64 powerpc ppc64 ppc64el))
34
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
35
DRI_DRIVERS += nouveau
37
@@ -237,7 +232,7 @@ binary-arch: install
38
install -m755 -d debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
39
mv debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so \
40
debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
137
@@ -108,7 +108,7 @@ else
140
confflags_DIRECT_RENDERING = --enable-driglx-direct
141
- confflags_OPENVG = --enable-openvg --enable-gallium-egl
142
+ # confflags_OPENVG = --enable-openvg
143
confflags_GALLIUM += --enable-vdpau
145
confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
146
@@ -249,7 +244,7 @@ binary-arch: install
147
debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
41
150
- dh_install -s --fail-missing
42
151
+ dh_install -s --list-missing
44
153
# Create an ld.so.conf which says where to find libGL from Mesa
45
154
echo "/usr/lib/$(DEB_HOST_MULTIARCH)/mesa" \
46
@@ -273,10 +268,10 @@ binary-arch: install
155
@@ -279,11 +279,11 @@ binary-arch: install
156
# Because there's no packaging problem so onerous that accomodating
47
157
# proprietary alternatives can't make more difficult…
48
158
set -e ; for PACKAGE in \
49
libegl1-mesa libgles1-mesa libgles2-mesa libopenvg1-mesa; do \
50
- dh_makeshlibs -p$$PACKAGE -- -c4 \
51
+ dh_makeshlibs -p$$PACKAGE -- -c1 \
159
- libegl1-mesa libgles1-mesa libgles2-mesa libopenvg1-mesa; do \
160
+ libegl1-mesa libgles1-mesa libgles2-mesa; do \
161
dh_makeshlibs -p$$PACKAGE -- -c4 \
52
162
-edebian/$$PACKAGE/usr/lib/$(DEB_HOST_MULTIARCH)/mesa-egl/\* \
54
- dh_makeshlibs -s --remaining-packages -- -c4
164
- dh_makeshlibs -s -Xgbm_gallium_drm.so --remaining-packages -- -c4
55
165
+ dh_makeshlibs -s --remaining-packages -- -c1