From 35b2ffc8f51d69b33678586c82e8d6953d017dfc Mon Sep 17 00:00:00 2001 From: Jools Wills Date: Sat, 12 Sep 2015 19:44:33 +0100 Subject: [PATCH 1/6] update debian control/rules for retropie --- debian/control | 14 ++++++-------- debian/{libsdl2.install => libsdl2-2.0-0.install} | 0 debian/rules | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) rename debian/{libsdl2.install => libsdl2-2.0-0.install} (100%) diff --git a/debian/control b/debian/control index e116e9b34..844a52e08 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,6 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, dpkg-dev (>= 1.16.1~), libasound2-dev [linux-any], - libgl1-mesa-dev, - libpulse-dev, libudev-dev [linux-any], libdbus-1-dev [linux-any], libusb2-dev [kfreebsd-any], @@ -29,16 +27,16 @@ Build-Depends: debhelper (>= 9), libxxf86vm-dev Homepage: http://www.libsdl.org/ -Package: libsdl2 +Package: libsdl2-2.0-0 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, - libudev0 [linux-any], + libudev0 | libudev1 [linux-any], libdbus-1-3 [linux-any] -Conflicts: libsdl-1.3-0 -Replaces: libsdl-1.3-0 +Conflicts: libsdl-1.3-0, libsdl2 +Replaces: libsdl-1.3-0, libsdl2 Description: Simple DirectMedia Layer SDL is a library that allows programs portable low level access to a video framebuffer, audio output, mouse, and keyboard. @@ -50,7 +48,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libsdl2 (= ${binary:Version}), + libsdl2-2.0-0 (= ${binary:Version}), libc6-dev, libgl1-mesa-dev Conflicts: libsdl-1.3-dev @@ -67,7 +65,7 @@ Section: debug Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libsdl2 (= ${binary:Version}), + libsdl2-2.0-0 (= ${binary:Version}), Description: Simple DirectMedia Layer debug files SDL is a library that allows programs portable low level access to a video framebuffer, audio output, mouse, and keyboard. diff --git a/debian/libsdl2.install b/debian/libsdl2-2.0-0.install similarity index 100% rename from debian/libsdl2.install rename to debian/libsdl2-2.0-0.install diff --git a/debian/rules b/debian/rules index 4bde8f325..ba24ae163 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) confflags = --disable-rpath --disable-video-directfb \ --disable-nas --disable-esd --disable-arts \ --disable-alsa-shared --disable-pulseaudio-shared \ - --disable-x11-shared + --disable-x11-shared --host=armv6l-raspberry-linux-gnueabihf --disable-video-opengl --enable-video-gles --disable-esd --disable-pulseaudio %: dh $@ --parallel From 73e9772ad3a444407880b3bf04fe6e9bd4def5e8 Mon Sep 17 00:00:00 2001 From: Jools Wills Date: Sun, 22 Nov 2015 15:54:43 +0000 Subject: [PATCH 2/6] split configure options onto multiple lines --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index ba24ae163..2aa196c45 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,9 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) confflags = --disable-rpath --disable-video-directfb \ --disable-nas --disable-esd --disable-arts \ --disable-alsa-shared --disable-pulseaudio-shared \ - --disable-x11-shared --host=armv6l-raspberry-linux-gnueabihf --disable-video-opengl --enable-video-gles --disable-esd --disable-pulseaudio + --disable-x11-shared --disable-video-opengl --enable-video-gles \ + --disable-esd --disable-pulseaudio \ + --host=armv6l-raspberry-linux-gnueabihf %: dh $@ --parallel From a991a65cf1b7831bb425674f187840c833f506fc Mon Sep 17 00:00:00 2001 From: Jools Wills Date: Sun, 22 Nov 2015 15:55:38 +0000 Subject: [PATCH 3/6] disable tslib as it doesn't exist in Debian Jessie but does exist in Raspbian Jessie and we want to use the same binaries on both --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 2aa196c45..400c154c4 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,7 @@ confflags = --disable-rpath --disable-video-directfb \ --disable-alsa-shared --disable-pulseaudio-shared \ --disable-x11-shared --disable-video-opengl --enable-video-gles \ --disable-esd --disable-pulseaudio \ + --disable-input-tslib \ --host=armv6l-raspberry-linux-gnueabihf %: From 220c56e1118d8897197b605f42544ebf814bb020 Mon Sep 17 00:00:00 2001 From: Jools Wills Date: Sun, 22 Nov 2015 16:34:38 +0000 Subject: [PATCH 4/6] correct configure option to enable opengles --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 400c154c4..e3a2e88bb 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) confflags = --disable-rpath --disable-video-directfb \ --disable-nas --disable-esd --disable-arts \ --disable-alsa-shared --disable-pulseaudio-shared \ - --disable-x11-shared --disable-video-opengl --enable-video-gles \ + --disable-x11-shared --disable-video-opengl --enable-video-opengles \ --disable-esd --disable-pulseaudio \ --disable-input-tslib \ --host=armv6l-raspberry-linux-gnueabihf From 0e43d4b1e07a035031b0b5c73e4b0e2e37fdc35d Mon Sep 17 00:00:00 2001 From: Jools Wills Date: Sun, 22 Nov 2015 17:00:52 +0000 Subject: [PATCH 5/6] remove gl1-mesa-dev dependency --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 844a52e08..2dceefc30 100644 --- a/debian/control +++ b/debian/control @@ -49,8 +49,7 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, libsdl2-2.0-0 (= ${binary:Version}), - libc6-dev, - libgl1-mesa-dev + libc6-dev Conflicts: libsdl-1.3-dev Replaces: libsdl-1.3-dev Description: Simple DirectMedia Layer development files From 5ae53916772ca29bf15c4be6dee6f32a6a09332f Mon Sep 17 00:00:00 2001 From: Jools Wills Date: Sun, 13 Dec 2015 03:22:49 +0000 Subject: [PATCH 6/6] added libx11-dev dependency for libsdl2-dev --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 2dceefc30..e4959485d 100644 --- a/debian/control +++ b/debian/control @@ -49,7 +49,8 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, libsdl2-2.0-0 (= ${binary:Version}), - libc6-dev + libc6-dev, + libx11-dev Conflicts: libsdl-1.3-dev Replaces: libsdl-1.3-dev Description: Simple DirectMedia Layer development files