Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

libcaca: Update to 0.99.beta19

Browse Source
This commit is contained in:
Alexpux
2014-08-06 16:18:11 +04:00
parent 544253338a
commit 3866014f25
7 changed files with 87 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mingw-w64-libcaca/0001-win32-is-not-msvc-it-could-be.mingw.patch
View File

@@ -7,8 +7,8 @@
-#elif defined _WIN32 && defined __LIBCACA__ && defined DLL_EXPORT
+#elif defined _MSC_VER && defined __LIBCACA__ && defined DLL_EXPORT
# define __extern extern __declspec(dllexport)
-#elif defined _WIN32 && !defined __LIBCACA__
+#elif defined _MSC_VER && !defined __LIBCACA__
-#elif defined _WIN32 && !defined __LIBCACA__ && !defined CACA_STATIC
+#elif defined _MSC_VER && !defined __LIBCACA__ && !defined CACA_STATIC
# define __extern extern __declspec(dllimport)
#else
# define __extern extern

22
mingw-w64-libcaca/0002-correct-installation-order.mingw.patch
View File

@@ -1,25 +1,3 @@
--- libcaca-0.99.beta17/caca/Makefile.am.orig 2010-02-08 16:34:28 +0400
+++ libcaca-0.99.beta17/caca/Makefile.am 2012-04-03 19:05:11 +0400
@@ -73,7 +73,7 @@
driver/win32.c \
$(NULL)
-install-exec-local:
+install-exec-local: install-libLTLIBRARIES install-pkgconfigDATA install-includeHEADERS
$(mkinstalldirs) $(DESTDIR)$(libdir)
. ./libcaca.la || exit 1; \
for x in $$library_names; do \
--- libcaca-0.99.beta17/cxx/Makefile.am.orig 2010-02-08 16:34:28 +0400
+++ libcaca-0.99.beta17/cxx/Makefile.am 2012-04-03 19:07:39 +0400
@@ -22,7 +22,7 @@
cxxtest_LDADD = libcaca++.la ../caca/libcaca.la
if USE_CXX
-install-exec-local:
+install-exec-local: install-libLTLIBRARIES install-pkgconfigDATA install-includeHEADERS
$(mkinstalldirs) $(DESTDIR)$(libdir)
. ./libcaca++.la || exit 1; \
for x in $$library_names; do \
--- libcaca-0.99.beta17/doc/Makefile.am.orig 2010-02-08 16:34:28 +0400
+++ libcaca-0.99.beta17/doc/Makefile.am 2012-04-03 19:09:57 +0400
@@ -39,7 +39,7 @@

33
mingw-w64-libcaca/0003-correct-builddir-reference.mingw.patch
View File

@@ -1,33 +0,0 @@
--- libcaca-0.99.beta18/cxx/Makefile.am.orig 2012-09-14 09:08:05 +0400
+++ libcaca-0.99.beta18/cxx/Makefile.am 2012-09-14 09:17:11 +0400
@@ -26,7 +26,7 @@
$(mkinstalldirs) $(DESTDIR)$(libdir)
. ./libcaca++.la || exit 1; \
for x in $$library_names; do \
- ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
+ ln -sf $(builddir)/$$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
done
ln -sf libcaca++.la $(DESTDIR)$(libdir)/libcucul++.la
--- libcaca-0.99.beta18/caca/Makefile.am.orig 2012-09-14 09:17:50 +0400
+++ libcaca-0.99.beta18/caca/Makefile.am 2012-09-14 09:20:28 +0400
@@ -84,7 +84,7 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
- ln -sf caca.pc $(DESTDIR)$(pkgconfigdir)/cucul.pc
+ ln -sf $(builddir)/caca.pc $(DESTDIR)$(pkgconfigdir)/cucul.pc
$(mkinstalldirs) $(DESTDIR)$(includedir)
ln -sf caca.h $(DESTDIR)$(includedir)/cucul.h
--- libcaca-0.99.beta18/cxx/Makefile.am.orig 2012-09-14 09:55:39 +0400
+++ libcaca-0.99.beta18/cxx/Makefile.am 2012-09-14 09:57:35 +0400
@@ -32,7 +32,7 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
- ln -sf caca++.pc $(DESTDIR)$(pkgconfigdir)/cucul++.pc
+ ln -sf $(builddir)/caca++.pc $(DESTDIR)$(pkgconfigdir)/cucul++.pc
endif
uninstall-local:

40
mingw-w64-libcaca/0004-msc-only-please.all.patch Normal file
View File

@@ -0,0 +1,40 @@
--- libcaca-0.99.beta19/caca/figfont.c.orig 2012-12-28 17:34:08.000000000 +0000
+++ libcaca-0.99.beta19/caca/figfont.c 2014-07-30 10:38:17.765662500 +0000
@@ -29,7 +29,7 @@
#include "caca.h"
#include "caca_internals.h"
-#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3
+#if defined _MSC_VER && defined __GNUC__ && __GNUC__ >= 3
int sprintf_s(char *s, size_t n, const char *fmt, ...) CACA_WEAK;
int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) CACA_WEAK;
#endif
@@ -636,7 +636,7 @@
* Functions for the mingw32 runtime
*/
-#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3
+#if defined _MSC_VER && defined __GNUC__ && __GNUC__ >= 3
int sprintf_s(char *s, size_t n, const char *fmt, ...)
{
va_list args;
--- libcaca-0.99.beta19/caca/string.c.orig 2012-12-28 17:34:08.000000000 +0000
+++ libcaca-0.99.beta19/caca/string.c 2014-07-30 10:38:28.801063800 +0000
@@ -36,7 +36,7 @@
#include "caca.h"
#include "caca_internals.h"
-#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3
+#if defined _MSC_VER && defined __GNUC__ && __GNUC__ >= 3
int vsnprintf_s(char *s, size_t n, size_t c,
const char *fmt, va_list ap) CACA_WEAK;
int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) CACA_WEAK;
@@ -610,7 +610,7 @@
* Functions for the mingw32 runtime
*/
-#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3
+#if defined _MSC_VER && defined __GNUC__ && __GNUC__ >= 3
int vsnprintf_s(char *s, size_t n, size_t c, const char *fmt, va_list ap)
{
return vsnprintf(s, n, fmt, ap);

13
mingw-w64-libcaca/0005-ruby-paths.mingw.patch Normal file
View File

@@ -0,0 +1,13 @@
--- libcaca-0.99.beta19/configure.ac.orig 2014-05-16 19:07:53.000000000 +0000
+++ libcaca-0.99.beta19/configure.ac 2014-07-30 11:04:20.605117900 +0000
@@ -467,8 +467,8 @@
if test "${RUBY}" != "no"; then
RUBY_CFLAGS="$(ruby -r mkmf -e 'conf = RbConfig::CONFIG.merge("hdrdir" => $hdrdir, "arch_hdrdir" => $arch_hdrdir); print RbConfig::expand("#$INCFLAGS", conf)')"
RUBY_LIBS="-L$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"libdir"@:>@') -l$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"RUBY_SO_NAME"@:>@')"
- RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitearchdir"@:>@'`
- RUBY_SITELIBDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitelibdir"@:>@'`
+ RUBY_SITEARCHDIR=$(cygpath `ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitearchdir"@:>@'`)
+ RUBY_SITELIBDIR=$(cygpath `ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitelibdir"@:>@'`)
AC_SUBST(RUBY_CFLAGS)
AC_SUBST(RUBY_LIBS)
AC_SUBST(RUBY_SITEARCHDIR)

11
mingw-w64-libcaca/0006-no-undefined.all.patch Normal file
View File

@@ -0,0 +1,11 @@
--- libcaca-0.99.beta19/ruby/Makefile.am.orig 2010-02-08 00:49:49.000000000 +0000
+++ libcaca-0.99.beta19/ruby/Makefile.am 2014-07-30 11:20:48.699589900 +0000
@@ -24,7 +24,7 @@
caca-event.c \
caca-event.h \
$(NULL)
-caca_la_LDFLAGS = -module -avoid-version -shared $(RUBY_LIBS)
+caca_la_LDFLAGS = -module -avoid-version -shared $(RUBY_LIBS) -no-undefined
caca_la_LIBADD = ../caca/libcaca.la
EXTRA_DIST = ruby.dox \

32
mingw-w64-libcaca/PKGBUILD
View File

@@ -3,7 +3,7 @@
_realname=libcaca
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.99.beta18
pkgver=0.99.beta19
pkgrel=1
pkgdesc="Color AsCii Art library (mingw-w64)"
arch=('any')
@@ -13,23 +13,33 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-pkg-config"
#"${MINGW_PACKAGE_PREFIX}-ncurses"
"${MINGW_PACKAGE_PREFIX}-python2"
"${MINGW_PACKAGE_PREFIX}-ruby"
)
depends=("${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-freetype" "${MINGW_PACKAGE_PREFIX}-fontconfig" "${MINGW_PACKAGE_PREFIX}-cppunit")
depends=("${MINGW_PACKAGE_PREFIX}-zlib"
"${MINGW_PACKAGE_PREFIX}-freetype"
"${MINGW_PACKAGE_PREFIX}-fontconfig"
"${MINGW_PACKAGE_PREFIX}-cppunit")
options=(!libtool strip staticlibs)
source=(http://libcaca.zoy.org/files/libcaca/${_realname}-${pkgver}.tar.gz
0001-win32-is-not-msvc-it-could-be.mingw.patch
0002-correct-installation-order.mingw.patch
0003-correct-builddir-reference.mingw.patch)
md5sums=('93d35dbdb0527d4c94df3e9a02e865cc'
'b1b859f5af37400e439db211685e1cc7'
'1c68758085bd3056d78ebc9bbe804b84'
'f919daa538638d9198e91cf87efec406')
0001-win32-is-not-msvc-it-could-be.mingw.patch
0002-correct-installation-order.mingw.patch
0004-msc-only-please.all.patch
0005-ruby-paths.mingw.patch
0006-no-undefined.all.patch)
md5sums=('a3d4441cdef488099f4a92f4c6c1da00'
'da6d45ee487c53d86fe05e29ee194077'
'38eef968b6dc2ae420c5a37e50852e85'
'f51e4e2b95d395190d4c390e974e95f5'
'106e58123709bf5fd36ed0d2c7fbeae2'
'2d813bb6a305c467cdcdc5cf05d545c0')
prepare() {
cd ${srcdir}/${_realname}-${pkgver}
patch -p1 -i ${srcdir}/0001-win32-is-not-msvc-it-could-be.mingw.patch
patch -p1 -i ${srcdir}/0002-correct-installation-order.mingw.patch
patch -p1 -i ${srcdir}/0003-correct-builddir-reference.mingw.patch
patch -p1 -i ${srcdir}/0004-msc-only-please.all.patch
patch -p1 -i ${srcdir}/0005-ruby-paths.mingw.patch
patch -p1 -i ${srcdir}/0006-no-undefined.all.patch
autoreconf -fi
}
@@ -43,7 +53,7 @@ build() {
--prefix=${MINGW_PREFIX} \
--build=${MINGW_CHOST} \
--host=${MINGW_CHOST} \
--disable-static \
--enable-static \
--enable-shared \
--disable-ncurses
make