Commit 348d542d authored by Samir's avatar Samir

libpng group: update/rebuild platform

will commit them separately next time... it's just too much work to do separate commits right now
parent 22293b79
......@@ -6,12 +6,12 @@
pkgname=autopano-sift-c
pkgver=2.5.1
pkgrel=3
pkgrel=4
pkgdesc="Identify key feature points within arbitrary images"
arch=('x86_64')
url="http://hugin.sourceforge.net/"
license=('GPL2')
depends=('libxml2' 'libpano13>=2.9.17' 'gcc-libs')
depends=('libxml2' 'libpano13>=2.9.17' 'gcc-libs' 'libpng' 'libtiff')
makedepends=('cmake')
source=("http://sourceforge.net/projects/hugin/files/autopano-sift-C/autopano-sift-C-2.5.1/autopano-sift-C-${pkgver}.tar.gz")
md5sums=('b9bade07e8c4f2ea383c22a082c260e0')
......
......@@ -4,26 +4,41 @@
pkgname=cairo
pkgver=1.12.14
pkgrel=1
pkgrel=2
pkgdesc="Cairo vector graphics library"
arch=('x86_64')
license=('LGPL' 'MPL')
url="http://cairographics.org/"
depends=('libpng>=1.5.0' 'libxrender' 'libxext' 'fontconfig>=2.8.0' 'pixman' 'glib2' 'sh')
makedepends=('librsvg' 'poppler-glib' 'libspectre')
depends=('libpng>=1.6.0' 'libxrender' 'libxext' 'fontconfig>=2.8.0' 'pixman' 'glib2' 'sh' 'mesa>=9.0' 'libgl' 'lzo2')
makedepends=('librsvg' 'poppler-glib' 'libspectre' 'valgrind' 'ttf-dejavu' 'gsfonts' 'xorg-server')
provides=('cairo-xcb')
rpelaces=('cairo-xcb')
options=('!libtool')
source=("http://cairographics.org/releases/${pkgname}-${pkgver}.tar.xz")
sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15')
source=("http://cairographics.org/releases/${pkgname}-${pkgver}.tar.xz"
"libpng16.patch")
sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15'
'c9911f185637d266ce1d2985bd6fb7d0df3d75b2')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 < ../libpng16.patch
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
# autoreconf -vfi
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static \
--enable-tee \
--disable-xlib-xcb
--enable-gl \
--enable-egl \
--enable-svg \
--enable-ps \
--enable-pdf \
--enable-gobject
make
}
......
From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 16 Apr 2013 09:58:56 +0000
Subject: png: Avoid marking the surface as in error after a png warning
It turns out that libpng will continue to load an image after throwing a
warning, and that libpng16 now throws warnings for images that libpng15
and earlier loaded without error. As we were happily loading those
images into cairo surfaces before, we are therefore being overzealous
in throwing an error now - so just squelch the warning.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
diff --git a/src/cairo-png.c b/src/cairo-png.c
index e74a4a8..068617d 100644
--- a/src/cairo-png.c
+++ b/src/cairo-png.c
@@ -149,13 +149,13 @@ static void
png_simple_warning_callback (png_structp png,
png_const_charp error_msg)
{
- cairo_status_t *error = png_get_error_ptr (png);
-
- /* default to the most likely error */
- if (*error == CAIRO_STATUS_SUCCESS)
- *error = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-
- /* png does not expect to abort and will try to tidy up after a warning */
+ /* png does not expect to abort and will try to tidy up and continue
+ * loading the image after a warning. So we also want to return the
+ * (incorrect?) surface.
+ *
+ * We use our own warning callback to squelch any attempts by libpng
+ * to write to stderr as we may not be in control of that output.
+ */
}
--
cgit v0.9.0.2-2-gbebe
......@@ -4,7 +4,7 @@
pkgname=cairomm
pkgver=1.10.0
pkgrel=3
pkgrel=4
pkgdesc="C++ bindings to Cairo vector graphics library"
arch=('x86_64')
url="http://www.cairographics.org"
......
# Maintainer: abveritas@chakraproject.org
pkgname=cups-filters
pkgver=1.0.30
pkgrel=2
pkgver=1.0.35
pkgrel=1
pkgdesc="OpenPrinting CUPS Filters"
arch=('x86_64')
url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
......@@ -17,8 +17,8 @@ backup=(etc/fonts/conf.d/99pdftoopvp.conf)
options=(!libtool)
source=("http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz"
'cups-browsed.service')
md5sums=('0d338e63f445e98d29c963620e5b1420'
'c1101c052abfd93759d4963f6f6c36f0')
md5sums=('26f150f1e9ce1f7b0f38ae4ebb01e23d'
'9ef68d7c2a84713fd421f4e87dec0a6e')
build() {
cd "$srcdir/$pkgname-$pkgver"
......
[Unit]
Description=A daemon to browse remote Cups printers
Description=Make remote CUPS printers available locally
After=cups.service avahi-daemon.service
Wants=cups.service avahi-daemon.service
[Service]
ExecStart=/usr/sbin/cups-browsed
ExecStart=/usr/bin/cups-browsed
[Install]
WantedBy=multi-user.target
......@@ -2,75 +2,96 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.6.2
pkgrel=5
pkgver=1.6.3
pkgrel=1
arch=('x86_64')
license=('GPL')
url="http://www.cups.org/"
makedepends=('libtiff' 'libpng' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'pkg-config'
'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd' 'colord')
makedepends=('libtiff' 'libpng' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd')
source=(http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.gz
cups-no-gcrypt.patch
cups.logrotate cups.pam
# Fedora patches
# improve build and linking
cups-no-export-ssllibs.patch
cups-no-gcrypt.patch
cups-no-gzip-man.patch
# FC
cups-systemd-socket.patch
cups-dbus-utf8.patch
cups-no-export-ssllibs.patch
cups-direct-usb.patch
cups-eggcups.patch
cups-driverd-timeout.patch
cups-res_init.patch
cups-uri-compat.patch
cups-0755.patch
cups-hp-deviceid-oid.patch
cups-dnssd-deviceid.patch
cups-ricoh-deviceid-oid.patch
cups-systemd-socket.patch)
md5sums=('8b8e40560b67e28607b1f04dafd9a94d'
'cc4101beccb5ed6deb1c92707a575925'
cups-avahi-address.patch
cups-enum-all.patch
# Gentoo
cups-1.6.0-fix-install-perms.patch
cups-1.6.2-statedir.patch
# Debian
cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
get-ppd-file-for-statically-configured-ipp-shared-queues.patch
ppd-poll-with-client-conf.patch)
md5sums=('3c50d396fef2ba721224fe65880fe3c3'
'f861b18f4446c43918c8643dcbbd7f6d'
'96f82c38f3f540b53f3e5144900acf17'
'9b8467a1e51d360096b70e2c3c081e6c'
'cc4101beccb5ed6deb1c92707a575925'
'90c30380d4c8cd48a908cfdadae1ea24'
'b4868b83f7f2d6ec24a1be76509379f0'
'dd97f8282cbfbab11b2dbec681d29ccb'
'9b8467a1e51d360096b70e2c3c081e6c'
'0f914ce1caab109a2ca00d407680a509'
'393d03e82a2bc19a8c1c51efef46354f'
'34627148dca8ca15882801e456c6b28d'
'8fe27d4248cacbc02824e7937cab4088'
'2c70e9b8ddc2f53fd93d9d5631b21b4a'
'a800699f5c2617454c89bd734a9bcbd0'
'87b959b630c1338c880950007dae654e'
'c933cb00a9b9cddde40ce095b3ad48a5'
'0f2c7ca20285883834b53b2e38f34edc'
'b4868b83f7f2d6ec24a1be76509379f0')
'df0c367c0022e3c7d8e01827e8a6c5e7'
'f30c2a161caaf27854581507cde8cac6'
'5117f65342fcc69c6a506529e4daca9e'
'9247e218eea94ebda0aebc8ee0e77db8'
'cb58bf4e0b80eaee383712e5c84a1ab4'
'b578bcd17949a7203237ba1e31f78ef9'
'0becd6ab8782b97f19a02c1dc174c75e')
prepare() {
cd ${pkgbase}-${pkgver}
# add systemd socket support - Fedora patch, also used in Gentoo
# modified now to the changes done by Gentoo in their svn ebuild
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1
patch -p1 -i ${srcdir}/cups-systemd-socket.patch
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
# Do not export SSL libs in cups-config
patch -p1 -i "${srcdir}/cups-no-export-ssllibs.patch"
patch -p1 -i "${srcdir}/cups-no-gcrypt.patch"
# Chakra patches
patch -p1 -i ${srcdir}/cups-no-gcrypt.patch
# Fedora patches
# don't zip man pages in make install, let makepkg do that / Fedora
patch -p1 -i ${srcdir}/cups-no-gzip-man.patch
# various bugfixes (upstream reports/SVN or Fedora/Debian
# Ensure attributes are valid UTF-8 in dbus notifier
patch -p1 -i ${srcdir}/cups-dbus-utf8.patch
patch -p1 -i ${srcdir}/cups-no-export-ssllibs.patch
patch -p1 -i ${srcdir}/cups-direct-usb.patch
patch -p1 -i ${srcdir}/cups-uri-compat.patch
patch -p1 -i ${srcdir}/cups-eggcups.patch
patch -p1 -i ${srcdir}/cups-driverd-timeout.patch
patch -p1 -i ${srcdir}/cups-res_init.patch
patch -p1 -i ${srcdir}/cups-0755.patch
patch -p1 -i ${srcdir}/cups-hp-deviceid-oid.patch
patch -p1 -i ${srcdir}/cups-dnssd-deviceid.patch
patch -p1 -i ${srcdir}/cups-ricoh-deviceid-oid.patch
patch -p1 -i ${srcdir}/cups-systemd-socket.patch
# Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll.
patch -p1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
# Applications could not get the PPD file for statically-configured IPP-shared print queues
patch -p1 -i ${srcdir}/get-ppd-file-for-statically-configured-ipp-shared-queues.patch
# If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs
# for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server Bug: http://www.cups.org/str.php?L2763
patch -p1 -i ${srcdir}/ppd-poll-with-client-conf.patch
# fix permissions on some files - alternative: cups-0755.patch by FC
patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch
# move /var/run -> /run for pid file
patch -p1 -i ${srcdir}/cups-1.6.2-statedir.patch
# Re-initialise the resolver on failure in httpAddrGetList()
patch -p1 -i ${srcdir}/cups-res_init.patch
# Use IP address when resolving DNSSD URIs
patch -p1 -i ${srcdir}/cups-avahi-address.patch
# Return from cupsEnumDests() once all records have been returned.
patch -p1 -i ${srcdir}/cups-enum-all.patch
# Rebuild configure script for not zipping man-pages.
aclocal -I config-scripts
autoconf -I config-scripts
}
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libdir=/usr/lib \
......@@ -106,7 +127,6 @@ backup=(etc/cups/client.conf)
# install client.conf man page and config file
install -dm755 ${pkgdir}/usr/share/man/man5
#install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5.gz ${pkgdir}/usr/share/man/man5/
install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/
install -dm755 ${pkgdir}/etc/cups
touch ${pkgdir}/etc/cups/client.conf
......@@ -169,7 +189,7 @@ optdepends=('xdg-utils: xdg .desktop file support')
# remove files now part of cups-filters
rm -v ${pkgdir}/usr/share/cups/banners/*
rm -v ${pkgdir}/usr/share/cups/data/testprint
# comment out all conversion rules which use any of the removed filters
# comment out all conversion rules which use any of the removed filters
perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs
# Provide native service
......
Index: Makedefs.in
===================================================================
--- Makedefs.in (Revision 10520)
+++ Makedefs.in (Arbeitskopie)
@@ -40,14 +40,14 @@
# Installation programs...
#
-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@
INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
-INSTALL_DATA = $(INSTALL) -c -m 444
+INSTALL_DATA = $(INSTALL) -c -m 644
INSTALL_DIR = $(INSTALL) -d
-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-INSTALL_MAN = $(INSTALL) -c -m 444
-INSTALL_SCRIPT = $(INSTALL) -c -m 555
+INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+INSTALL_MAN = $(INSTALL) -c -m 644
+INSTALL_SCRIPT = $(INSTALL) -c -m 755
#
# Default user, group, and system groups for the scheduler...
diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4
--- cups-1.6.2.orig/config-scripts/cups-directories.m4 2012-10-01 03:55:23.000000000 +0200
+++ cups-1.6.2/config-scripts/cups-directories.m4 2013-04-02 00:11:41.000000000 +0200
@@ -429,7 +429,7 @@
;;
*)
# All others
- CUPS_STATEDIR="$localstatedir/run/cups"
+ CUPS_STATEDIR="/run/cups"
;;
esac
AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
diff -up cups-1.6.2/cups/http-support.c.avahi-address cups-1.6.2/cups/http-support.c
--- cups-1.6.2/cups/http-support.c.avahi-address 2013-03-11 18:44:36.000000000 +0000
+++ cups-1.6.2/cups/http-support.c 2013-04-04 15:39:06.651847041 +0100
@@ -2121,7 +2121,7 @@ http_resolve_cb(
const char *type, /* I - Registration type */
const char *domain, /* I - Domain (unused) */
const char *hostTarget, /* I - Hostname */
- const AvahiAddress *address, /* I - Address (unused) */
+ const AvahiAddress *address, /* I - Address */
uint16_t port, /* I - Port number */
AvahiStringList *txt, /* I - TXT record */
AvahiLookupResultFlags flags, /* I - Lookup flags (unused) */
@@ -2253,36 +2253,37 @@ http_resolve_cb(
DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget));
- snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port));
- if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL)
+ int error = getnameinfo(&(address->data),
+ address->proto == AVAHI_PROTO_INET ?
+ sizeof (AvahiIPv4Address) :
+ (address->proto == AVAHI_PROTO_INET6 ?
+ sizeof (AvahiIPv6Address) :
+ sizeof (address->data)),
+ fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
+
+ if (!error)
{
- for (addr = addrlist; addr; addr = addr->next)
+ DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
+
+ if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
+ _cups_strcasecmp(hostptr, ".local"))
{
- int error = getnameinfo(&(addr->addr.addr),
- httpAddrLength(&(addr->addr)),
- fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
-
- if (!error)
- {
- DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
-
- if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
- _cups_strcasecmp(hostptr, ".local"))
- {
- hostTarget = fqdn;
- break;
- }
- }
+ hostTarget = fqdn;
+ }
+ }
#ifdef DEBUG
- else
- DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
- httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)),
- error));
+ else
+ DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
+ httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)),
+ error));
#endif /* DEBUG */
- }
+ } else {
+ /*
+ * Use the IP address that responded...
+ */
- httpAddrFreeList(addrlist);
- }
+ avahi_address_snprint (fqdn, sizeof (fqdn), address);
+ hostTarget = fqdn;
}
/*
diff -up cups-1.6.2/cups/dest.c.enum-all cups-1.6.2/cups/dest.c
--- cups-1.6.2/cups/dest.c.enum-all 2013-06-04 10:58:36.169786250 +0100
+++ cups-1.6.2/cups/dest.c 2013-06-04 10:59:02.147900811 +0100
@@ -2724,9 +2724,12 @@ cups_dnssd_browse_cb(
break;
case AVAHI_BROWSER_REMOVE:
- case AVAHI_BROWSER_ALL_FOR_NOW:
case AVAHI_BROWSER_CACHE_EXHAUSTED:
break;
+
+ case AVAHI_BROWSER_ALL_FOR_NOW:
+ avahi_simple_poll_quit(data->simple_poll);
+ break;
}
}
Description: Fixed crash which sometimes happens on shutdown of the CUPS
daemon, caused by a wrong shutdown sequence for shutting down the Avahi
threaded poll.
Author: Till Kamppeter <till.kamppeter@gmail.com>
Bug-Upstream: http://cups.org/str.php?L4180
Bug-Upstream: http://cups.org/str.php?L4213
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1034045
Last-Updated: 2012-10-16
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -1333,6 +1333,7 @@
DNSSDMaster = NULL;
# else /* HAVE_AVAHI */
+ avahi_threaded_poll_stop(DNSSDMaster);
avahi_client_free(DNSSDClient);
DNSSDClient = NULL;
Description: Applications could not get the PPD file for
statically-configured IPP-shared print queues
Author: Till Kamppeter <till.kamppeter@gmail.com>
Bug-Upstream: http://cups.org/str.php?L4178
Last-Updated: 2012-09-19
--- a/cups/util.c
+++ b/cups/util.c
@@ -1731,6 +1731,22 @@
return (1);
}
+ else if (device_uri &&
+ (!strncmp(device_uri, "ipp:", 4) != NULL ||
+ !strncmp(device_uri, "ipps:", 5) != NULL))
+ {
+ /*
+ * Statically-configured IPP shared printer.
+ */
+
+ httpSeparateURI(HTTP_URI_CODING_ALL,
+ device_uri,
+ scheme, sizeof(scheme), username, sizeof(username),
+ host, hostsize, port, resource, resourcesize);
+ ippDelete(response);
+
+ return (1);
+ }
else if ((attr = ippFindAttribute(response, "member-uris",
IPP_TAG_URI)) != NULL)
{
Description: If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server
Bug: http://www.cups.org/str.php?L2763
--- a/cups/util.c
+++ b/cups/util.c
@@ -1085,11 +1085,13 @@
http2 = http;
else if ((http2 = httpConnectEncrypt(hostname, port,
cupsEncryption())) == NULL)
- {
- DEBUG_puts("1cupsGetPPD3: Unable to connect to server");
+ if ((http2 = httpConnectEncrypt(http_hostname, http_port,
+ cupsEncryption())) == NULL)
+ {
+ DEBUG_puts("1cupsGetPPD3: Unable to connect to server");
- return (HTTP_SERVICE_UNAVAILABLE);
- }
+ return (HTTP_SERVICE_UNAVAILABLE);
+ }
/*
* Get a temp file...
......@@ -4,7 +4,7 @@
# maintainer abveritas[at]chakra-project[dot]org>
pkgname=directfb
pkgver=1.6.2
pkgver=1.7.0
pkgrel=1
pkgdesc="Library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device"
arch=('x86_64')
......@@ -13,7 +13,7 @@ license=('LGPL')
depends=('gcc-libs' 'libjpeg-turbo' 'sdl' 'libpng' 'freetype2')
options=('!libtool')
source=("http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz")
md5sums=('6bebdbf26f03f7114ae17ab86d4d1d27')
sha1sums=('095852479098a55be2b0c6a0250af4159ee16e7c')
build() {
cd "${srcdir}/DirectFB-${pkgver}"
......
......@@ -7,12 +7,13 @@
pkgname=dkms-lts
_pkgname=dkms
pkgver=2.2.0.3
pkgrel=5
pkgrel=6
pkgdesc='Dynamic Kernel Modules System'
arch=('any')
url='http://linux.dell.com/dkms/'
license=('GPL2')
depends=('linux-lts-headers' 'kmod')
conflicts=('dkms')
backup=('etc/dkms/framework.conf' "etc/conf.d/$pkgname")
source=("http://linux.dell.com/$_pkgname/permalink/$_pkgname-$pkgver.tar.gz"
"$pkgname.service"
......
......@@ -2,7 +2,7 @@
pkgname=enblend-enfuse
pkgver=4.1.1
pkgrel=1
pkgrel=2
pkgdesc="intelligent blend tool for overlapping picture"
arch=("x86_64")
license=('GPL')
......@@ -20,7 +20,7 @@ md5sums=('9bc34f423f3bee35150ab593211da4a2')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
LIBS="-lboost_system" ./configure --prefix=/usr./configure --prefix=/usr
LIBS="-lboost_system" ./configure --prefix=/usr
make
}
......
......@@ -2,25 +2,37 @@
pkgname=ffmpegthumbnailer
pkgver=2.0.8
pkgrel=5
pkgrel=6
pkgdesc="Lightweight video thumbnailer that can be used by file managers."
url="http://code.google.com/p/ffmpegthumbnailer/"
license=('GPL2')
arch=('x86_64')
depends=('ffmpeg' 'libjpeg-turbo' 'libpng')
source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz")
source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz"
"ffmpegthumbnailer-2.0.8-memcpy.patch")
options=(!libtool)
sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533')
sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533'
'c23ef173f98c928fcacacd6e6060dab2e56f1239')
prepare() {
cd ${pkgname}-${pkgver}
patch -p0 < "$srcdir"/ffmpegthumbnailer-2.0.8-memcpy.patch
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr
make
./configure --prefix=/usr \
--enable-gio \
--enable-thumbnailer
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
}
libffmpegthumbnailer/pngwriter.cpp: In function 'void ffmpegthumbnailer::writeDataCallback(png_structp, png_bytep, png_size_t)':
libffmpegthumbnailer/pngwriter.cpp:111:52: error: 'memcpy' was not declared in this scope
--- libffmpegthumbnailer/pngwriter.cpp
+++ libffmpegthumbnailer/pngwriter.cpp
@@ -17,6 +17,7 @@
#include "pngwriter.h"
#include <stdexcept>
#include <cassert>
+#include <cstring>
using namespace std;
# Contributor: kote
# Maintainer: Daniele Cocca <jmc@chakra-project.org>
pkgname=fltk
pkgver=1.3.2
pkgrel=2
pkgdesc="Graphical user interface toolkit for X."
arch=('x86_64')
screenshot="http://www.fltk.org/images/fltk-widgets-std.png"
license=('custom:LGPL')
url="http://www.fltk.org/"
depends=('libjpeg-turbo' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme'
'desktop-file-utils' 'xdg-utils' 'libgl')
makedepends=('mesa' 'doxygen' 'alsa-lib')
options=('!docs')
categories=('system')
install="fltk.install"
source=("http://fltk.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}-source.tar.gz")
md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
-e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
./configure --prefix=/usr \
--enable-shared \
--enable-threads \
--enable-xft \
--enable-gl
make
cd documentation && make html
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
( cd fluid && make DESTDIR="${pkgdir}" install install-linux )
chmod 644 "${pkgdir}/usr/lib"/*.a
install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
# vim:set ts=2 sw=2 et:
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Replace generic bitmap font names by generic font families.
These font-families will get replaced by other rules and
default to scaled ones. -->
<match target="pattern" name="family">
<test name="family" qual="any">
<string>Helvetica</string>
</test>
<edit mode="assign" name="family">
<string>Arial</string>
<string>Liberation Sans</string>
<string>sans-serif</string>
</edit>
</match>
<match target="pattern" name="family">
<test name="family" qual="any">
<string>Courier</string>
</test>