From fe2e1217d9b4175a6c7c17a8742886af7cc1dd2f Mon Sep 17 00:00:00 2001 From: clayton craft Date: Tue, 3 Oct 2017 17:31:07 +0000 Subject: [PATCH] Remove SDL2 package from aports (#640) Now that SDL2 2.0.6 is out and updated in Alpine, there's no reason for us to keep this package around, at least from an osk-sdl perspective! --- main/sdl2/0001-fix-c90-errors.patch | 28 ------------ main/sdl2/APKBUILD | 69 ----------------------------- main/sdl2/altivec-fixes.patch | 36 --------------- 3 files changed, 133 deletions(-) delete mode 100644 main/sdl2/0001-fix-c90-errors.patch delete mode 100644 main/sdl2/APKBUILD delete mode 100644 main/sdl2/altivec-fixes.patch diff --git a/main/sdl2/0001-fix-c90-errors.patch b/main/sdl2/0001-fix-c90-errors.patch deleted file mode 100644 index 0a240be66..000000000 --- a/main/sdl2/0001-fix-c90-errors.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/video/directfb/SDL_DirectFB_shape.c b/src/video/directfb/SDL_DirectFB_shape.c -index 3239e30..e3d4dcd 100644 ---- a/src/video/directfb/SDL_DirectFB_shape.c -+++ b/src/video/directfb/SDL_DirectFB_shape.c -@@ -37,18 +37,20 @@ DirectFB_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsi - SDL_WindowShaper* - DirectFB_CreateShaper(SDL_Window* window) { - SDL_WindowShaper* result = NULL; -- -+ SDL_ShapeData* data = NULL; -+ int resized_properly = 0; -+ - result = malloc(sizeof(SDL_WindowShaper)); - result->window = window; - result->mode.mode = ShapeModeDefault; - result->mode.parameters.binarizationCutoff = 1; - result->userx = result->usery = 0; -- SDL_ShapeData* data = SDL_malloc(sizeof(SDL_ShapeData)); - result->driverdata = data; - data->surface = NULL; - window->shaper = result; -- int resized_properly = DirectFB_ResizeWindowShape(window); - SDL_assert(resized_properly == 0); -+ data = SDL_malloc(sizeof(SDL_ShapeData)); -+ resized_properly = DirectFB_ResizeWindowShape(window); - - return result; - } diff --git a/main/sdl2/APKBUILD b/main/sdl2/APKBUILD deleted file mode 100644 index 4464e4882..000000000 --- a/main/sdl2/APKBUILD +++ /dev/null @@ -1,69 +0,0 @@ -pkgname=sdl2 -pkgver=9999 -_pkgver=2.0.5 -pkgrel=2 -_pkgname=SDL2 -pkgdesc="A development library designed to provide low level access to audio, keyboard, mouse, joystick and graphics" -url="http://www.libsdl.org" -arch="all" -license="zlib" -depends="directfb tslib" -depends_dev="alsa-lib-dev libxcursor-dev libxrandr-dev libxrender-dev mesa-dev directfb-dev tslib-dev" -makedepends="$depends_dev" -subpackages="$pkgname-dev" -source="https://www.libsdl.org/release/$_pkgname-$_pkgver.tar.gz - altivec-fixes.patch - 0001-fix-c90-errors.patch" - -builddir="$srcdir/$_pkgname-$_pkgver" - -prepare(){ - cd "$builddir" - - # first apply patches in specified order - for i in $source; do - case $i in - *.patch) - msg "Applying $i..." - if ! patch -s -p1 -N -i "$srcdir"/$i; then - echo $i >>failed - _patch_failed=1 - fi - ;; - esac - done - - if ! [ -z "$_patch_failed" ]; then - error "The following patches failed:" - cat failed - return 1 - fi - - -} - -build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --enable-alsa \ - --enable-clock_gettime \ - --disable-arts \ - --disable-esd \ - --disable-nas \ - --disable-rpath \ - --with-x \ - --enable-video-directfb - make -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 -} - -sha512sums="6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750 SDL2-2.0.5.tar.gz -aad37129e8d1259fcceea087794aa45f7d94a5b0b09275a72e20ae53809a587f8a59dba05c9bd763012e6471d6d9d87739e282bcbb7df4de5c66d06d9e23d8d3 altivec-fixes.patch -25dbfa65f15040564f2345c235e8997fcc60e81e03691afcd75b3d5f982941220d4a2b7710de1e40b581b63632f1b667befbc819513a785da01ad40d6ce1ef5f 0001-fix-c90-errors.patch" diff --git a/main/sdl2/altivec-fixes.patch b/main/sdl2/altivec-fixes.patch deleted file mode 100644 index 7617e6336..000000000 --- a/main/sdl2/altivec-fixes.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- SDL2-2.0.5.orig/src/video/SDL_blit_N.c -+++ SDL2-2.0.5/src/video/SDL_blit_N.c -@@ -118,12 +118,6 @@ - 16, 8, 0, 24, - 0, NULL - }; -- if (!srcfmt) { -- srcfmt = &default_pixel_format; -- } -- if (!dstfmt) { -- dstfmt = &default_pixel_format; -- } - const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00, - 0x04, 0x04, 0x04, 0x04, - 0x08, 0x08, 0x08, 0x08, -@@ -132,10 +126,16 @@ - vector unsigned char vswiz; - vector unsigned int srcvec; - #define RESHIFT(X) (3 - ((X) >> 3)) -- Uint32 rmask = RESHIFT(srcfmt->Rshift) << (dstfmt->Rshift); -- Uint32 gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift); -- Uint32 bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift); -- Uint32 amask; -+ Uint32 rmask, gmask, bmask, amask; -+ if (!srcfmt) { -+ srcfmt = &default_pixel_format; -+ } -+ if (!dstfmt) { -+ dstfmt = &default_pixel_format; -+ } -+ rmask = RESHIFT(srcfmt->Rshift) << (dstfmt->Rshift); -+ gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift); -+ bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift); - /* Use zero for alpha if either surface doesn't have alpha */ - if (dstfmt->Amask) { - amask =