[arch-commits] Commit in sdl2_ttf/repos/extra-x86_64 (4 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Fri Feb 15 13:54:24 UTC 2019


    Date: Friday, February 15, 2019 @ 13:54:22
  Author: svenstaro
Revision: 346282

archrelease: copy trunk to extra-x86_64

Added:
  sdl2_ttf/repos/extra-x86_64/PKGBUILD
    (from rev 346281, sdl2_ttf/trunk/PKGBUILD)
  sdl2_ttf/repos/extra-x86_64/freetype-pkgconfig.patch
    (from rev 346281, sdl2_ttf/trunk/freetype-pkgconfig.patch)
Deleted:
  sdl2_ttf/repos/extra-x86_64/PKGBUILD
  sdl2_ttf/repos/extra-x86_64/freetype-pkgconfig.patch

--------------------------+
 PKGBUILD                 |   73 ++++++++++++++++-------------------
 freetype-pkgconfig.patch |   92 ++++++++++++++++++++++-----------------------
 2 files changed, 80 insertions(+), 85 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-15 13:54:12 UTC (rev 346281)
+++ PKGBUILD	2019-02-15 13:54:22 UTC (rev 346282)
@@ -1,39 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-
-pkgname=sdl2_ttf
-pkgver=2.0.14
-pkgrel=2
-pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (Version 2)"
-arch=('x86_64')
-url="http://www.libsdl.org/projects/SDL_ttf"
-license=('MIT')
-depends=('sdl2' 'freetype2')
-makedepends=('cmake')
-source=("https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${pkgver}.tar.gz"
-        freetype-pkgconfig.patch)
-sha512sums=('4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099'
-            'abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937')
-
-prepare() {
-  cd SDL2_ttf-${pkgver}
-
-  # Fix build with FreeType 2.9.1
-  patch -Np1 -i ../freetype-pkgconfig.patch
-
-  touch NEWS README AUTHORS ChangeLog
-  autoreconf -vi
-}
-
-build() {
-  cd "${srcdir}/SDL2_ttf-${pkgver}/"
-
-  ./configure --disable-static --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/SDL2_ttf-${pkgver}/"
-
-  make DESTDIR="${pkgdir}/" install
-  install -Dm644 COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: sdl2_ttf/repos/extra-x86_64/PKGBUILD (from rev 346281, sdl2_ttf/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-02-15 13:54:22 UTC (rev 346282)
@@ -0,0 +1,34 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+
+pkgname=sdl2_ttf
+pkgver=2.0.15
+pkgrel=1
+pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (Version 2)"
+arch=('x86_64')
+url="http://www.libsdl.org/projects/SDL_ttf"
+license=('MIT')
+depends=('sdl2' 'freetype2')
+makedepends=('cmake')
+source=("https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${pkgver}.tar.gz")
+sha512sums=('30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd')
+
+prepare() {
+  cd SDL2_ttf-${pkgver}
+
+  touch NEWS README AUTHORS ChangeLog
+  autoreconf -vi
+}
+
+build() {
+  cd "${srcdir}/SDL2_ttf-${pkgver}/"
+
+  ./configure --disable-static --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/SDL2_ttf-${pkgver}/"
+
+  make DESTDIR="${pkgdir}/" install
+  install -Dm644 COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: freetype-pkgconfig.patch
===================================================================
--- freetype-pkgconfig.patch	2019-02-15 13:54:12 UTC (rev 346281)
+++ freetype-pkgconfig.patch	2019-02-15 13:54:22 UTC (rev 346282)
@@ -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

Copied: sdl2_ttf/repos/extra-x86_64/freetype-pkgconfig.patch (from rev 346281, sdl2_ttf/trunk/freetype-pkgconfig.patch)
===================================================================
--- freetype-pkgconfig.patch	                        (rev 0)
+++ freetype-pkgconfig.patch	2019-02-15 13:54:22 UTC (rev 346282)
@@ -0,0 +1,46 @@
+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



More information about the arch-commits mailing list