commit e16fb3d7b7a8bebcab1e7873e3c6752af0f09649 Author: John McQuah <jmcquah@disroot.org> Date: Fri Mar 3 12:25:18 2023 -0500 sdl_net, sdl_ttf: adopted, dropped obsolete patches, updated urls diff --git a/sdl_net/.signature b/sdl_net/.signature index 5033ac8f7..0152d2468 100644 --- a/sdl_net/.signature +++ b/sdl_net/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36wAaSxuA9pr2HHL6dyXez/S1GOpxNttRK40adMr7Sel3n/BRQd7wixaC6p0axoS7kXqlHwr7jqCmWUQSfvCyw4= -SHA256 (Pkgfile) = 7f7bf4b41ad83b2ba25c47fd288cfe03a9f80639b97886c59c4374c08f674332 +RWSagIOpLGJF3y+oX+hlz1q6O+Dx5lS8I2y5V9srQNwMHz1LYlHIad70fcxCzwaIK1oPDXHw98lkxPO/g2/zRuFs8yhow5cp2gI= +SHA256 (Pkgfile) = df14c43261b4955fbd446d6278b078094f1b55f26e0a0d2f9bda170757fcea70 SHA256 (.footprint) = ca946ec5219bbf20c3adc9e134db35490ce49eba061ce44107c8d98d83255c38 -SHA256 (SDL_net-1.2.8.tar.gz) = 5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4 +SHA256 (sdl_net-release-1.2.8.tar.gz) = d6780896b5e78b74932bc31bd67e714ed990531028ad350ed6d6bbba8b2bf324 diff --git a/sdl_net/Pkgfile b/sdl_net/Pkgfile index b6bd36da9..92ab5efc0 100644 --- a/sdl_net/Pkgfile +++ b/sdl_net/Pkgfile @@ -1,17 +1,17 @@ # Description: A cross-platform networking library for SDL. -# URL: http://www.libsdl.org/projects/SDL_net/ -# Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Simone Rota, sip at crux dot nu +# URL: https://github.com/libsdl-org/SDL_net +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: libsdl name=sdl_net version=1.2.8 release=1 -source=(https://www.libsdl.org/projects/SDL_net/release/SDL_net-$version.tar.gz) +source=(https://github.com/libsdl-org/SDL_net/archive/refs/tags/release-$version.tar...) +renames=($name-release-$version.tar.gz) build() { - cd SDL_net-$version - ./configure --prefix=/usr + cd SDL_net-release-$version + ./configure --prefix=/usr --enable-gui=no --disable-sdltest make make DESTDIR=$PKG install } diff --git a/sdl_ttf/.footprint b/sdl_ttf/.footprint index cfbbac088..b21c4b04c 100644 --- a/sdl_ttf/.footprint +++ b/sdl_ttf/.footprint @@ -3,10 +3,10 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/SDL/ -rw-r--r-- root/root usr/include/SDL/SDL_ttf.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libSDL_ttf-2.0.so.0 -> libSDL_ttf-2.0.so.0.10.1 --rwxr-xr-x root/root usr/lib/libSDL_ttf-2.0.so.0.10.1 +lrwxrwxrwx root/root usr/lib/libSDL_ttf-2.0.so.0 -> libSDL_ttf-2.0.so.0.10.2 +-rwxr-xr-x root/root usr/lib/libSDL_ttf-2.0.so.0.10.2 -rw-r--r-- root/root usr/lib/libSDL_ttf.a -rwxr-xr-x root/root usr/lib/libSDL_ttf.la -lrwxrwxrwx root/root usr/lib/libSDL_ttf.so -> libSDL_ttf-2.0.so.0.10.1 +lrwxrwxrwx root/root usr/lib/libSDL_ttf.so -> libSDL_ttf-2.0.so.0.10.2 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/SDL_ttf.pc diff --git a/sdl_ttf/.signature b/sdl_ttf/.signature index cfd1a814a..83242fdd8 100644 --- a/sdl_ttf/.signature +++ b/sdl_ttf/.signature @@ -1,7 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wMqgmpyDXwlGyPhyvwrmPk2OI86dHHRGph+X2+whDeQ0ziGycEkXcF7dR7ifLvloQiPeviUQ/nc16eFqQO+Lwg= -SHA256 (Pkgfile) = 7670b947de6ffed51a2aee18014edd70840c90cf45d7ac9dfd55bf1a5c37626e -SHA256 (.footprint) = 2b4e678b2ec669dfd9c984c938bb395b191ff84f71b12239239087ab514f50d2 -SHA256 (SDL_ttf-2.0.11.tar.gz) = 724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7 -SHA256 (freetype-pkgconfig.patch) = 87412f614b97b4724cb4845db882f07c15caf098dee57a856d6dbae0f58de80d -SHA256 (bug1433.patch) = 4baea703454b9bca9498a920485552f1b8489a5007f8f1366080b14a4cd74c90 +RWSagIOpLGJF363ii5D68DkxSYWLrDpGlGYy7FphG6rfsKExgOXGx2PW5EgI5hwjXbcN5Ha/TumcHCVRkFz8dMzsb5vUigaTYQw= +SHA256 (Pkgfile) = c317a394ea4e232cb1cf9c7ab8a509dcc60a67c9c9182a7ec7a3afe09c452e6a +SHA256 (.footprint) = 9d7e1d43c913d5d7bb7162c0a5e58f3241b0e2171d4e7eef9bf8eb3bcb825d49 +SHA256 (sdl_ttf-2.0.11.1.zip) = 34cc21f8c3999ae2b6bbce8343027e12b14f3fa361953961e77890f7e62bc7f6 diff --git a/sdl_ttf/Pkgfile b/sdl_ttf/Pkgfile index 47367dbf7..ea772e21d 100644 --- a/sdl_ttf/Pkgfile +++ b/sdl_ttf/Pkgfile @@ -1,25 +1,20 @@ # Description: TrueType library for libsdl. -# URL: https://www.libsdl.org/projects/SDL_ttf/ -# Maintainer: Danny Rawlins, crux at romster dot me +# URL: https://github.com/libsdl-org/SDL_ttf +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: freetype libsdl name=sdl_ttf -version=2.0.11 -release=2 -source=(https://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$version.tar.gz - freetype-pkgconfig.patch - bug1433.patch) +version=2.0.11.1 +release=1 +source=(https://github.com/libsdl-org/SDL_ttf/archive/refs/heads/SDL-1.2.zip) +renames=($name-$version.zip) build() { - cd SDL_ttf-$version + cd SDL_ttf-* - patch -i $SRC/bug1433.patch - patch -p1 -i $SRC/freetype-pkgconfig.patch - - touch NEWS README AUTHORS ChangeLog - autoreconf -vi - - ./configure --prefix=/usr + ./configure --prefix=/usr \ + --disable-sdltest \ + --disable-freetypetest make make DESTDIR=$PKG install } diff --git a/sdl_ttf/bug1433.patch b/sdl_ttf/bug1433.patch deleted file mode 100644 index b402fb3e9..000000000 --- a/sdl_ttf/bug1433.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- SDL_ttf.c.orig 2012-02-12 16:36:41.859977617 +0100 -+++ SDL_ttf.c 2012-02-12 16:36:53.696580159 +0100 -@@ -1747,7 +1747,7 @@ - /* Copy the character from the pixmap */ - src = glyph->pixmap.buffer; - dst = (Uint8*) textbuf->pixels; -- for ( row = 0; row < glyph->bitmap.rows; ++row ) { -+ for ( row = 0; row < glyph->pixmap.rows; ++row ) { - memcpy( dst, src, glyph->pixmap.width ); - src += glyph->pixmap.pitch; - dst += textbuf->pitch; \ No newline at end of file diff --git a/sdl_ttf/freetype-pkgconfig.patch b/sdl_ttf/freetype-pkgconfig.patch deleted file mode 100644 index 02b063561..000000000 --- a/sdl_ttf/freetype-pkgconfig.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugs.gentoo.org/654758 - ---- SDL_ttf-2.0.11/configure.in -+++ SDL_ttf-2.0.11/configure.in -@@ -64,6 +64,7 @@ - ;; - esac - -+PKG_PROG_PKG_CONFIG - - dnl Check for iconv (character conversion library; see iconv.m4) - dnl This isn't available on many systems -@@ -94,6 +95,17 @@ - dnl - dnl Get the cflags and libraries from the freetype-config script - dnl -+PKG_CHECK_MODULES( -+ FREETYPE2, -+ freetype2, -+ [ -+ ft_found=yes -+ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" -+ LIBS="$LIBS $FREETYPE2_LIBS" -+ ], -+ ft_found=no -+) -+ - AC_ARG_WITH(freetype-prefix,[ --with-freetype-prefix=PFX Prefix where FREETYPE is - installed (optional)], - freetype_prefix="$withval", freetype_prefix="") -@@ -101,6 +113,7 @@ - where FREETYPE is installed (optional)], - freetype_exec_prefix="$withval", freetype_exec_prefix="") - -+if test "x$ft_found" != "xyes" ; then - if test x$freetype_exec_prefix != x ; then - freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix" - if test x${FREETYPE_CONFIG+set} != xset ; then -@@ -123,6 +136,7 @@ - CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" - LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" - fi -+fi - - dnl Check for SDL - SDL_VERSION=1.2.4