diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-03 10:03:46 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-03 10:04:44 +0000 |
| commit | dd04485bc45202b49ea7c5b58f9aa211b4dd47d7 (patch) | |
| tree | 572faf2e385914854cc9e67b21bdf711e2ea0973 | |
| parent | 8580c902f26bfdde8552e9a91d2f351ba384701a (diff) | |
| download | aports-dd04485bc45202b49ea7c5b58f9aa211b4dd47d7.tar.bz2 aports-dd04485bc45202b49ea7c5b58f9aa211b4dd47d7.tar.xz | |
main/recordmydesktop: build fix. fix libm underlinking
| -rw-r--r-- | main/recordmydesktop/APKBUILD | 21 | ||||
| -rw-r--r-- | main/recordmydesktop/libm-underlinking.patch | 11 | ||||
| -rw-r--r-- | main/recordmydesktop/shmstr-to-shmproto.patch | 8 |
3 files changed, 29 insertions, 11 deletions
diff --git a/main/recordmydesktop/APKBUILD b/main/recordmydesktop/APKBUILD index 6d07961b5e..d67a5ec9bf 100644 --- a/main/recordmydesktop/APKBUILD +++ b/main/recordmydesktop/APKBUILD @@ -1,24 +1,30 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=recordmydesktop pkgver=0.3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Produces a OGG encapsulated Theora/Vorbis recording of your desktop" url="http://recordmydesktop.sourceforge.net" arch="all" license="GPL" depends="" makedepends="alsa-lib-dev zlib-dev libvorbis-dev libxdamage-dev libxext-dev - libtheora-dev libsm-dev" + libtheora-dev libsm-dev autoconf automake libtool" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/recordmydesktop/recordmydesktop-$pkgver.tar.gz shmstr-to-shmproto.patch - recordmydesktop-bitrate.patch" + recordmydesktop-bitrate.patch + libm-underlinking.patch + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -p0 < $srcdir/shmstr-to-shmproto.patch - patch -p1 < $srcdir/recordmydesktop-bitrate.patch + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + libtoolize --force && aclocal && autoconf && automake || return 1 } build() { @@ -34,5 +40,6 @@ package() { } md5sums="6998b165540598965499bd99d8aa0eef recordmydesktop-0.3.8.1.tar.gz -211a1773f223b3f281520aa1056395e6 shmstr-to-shmproto.patch -b0794a769efd287e9e8c5fb8c3299b35 recordmydesktop-bitrate.patch" +7aa0bb8a8821b7178137e5293d1046a7 shmstr-to-shmproto.patch +b0794a769efd287e9e8c5fb8c3299b35 recordmydesktop-bitrate.patch +28ed60c8c7c5a139a14a74fa228f2d0b libm-underlinking.patch" diff --git a/main/recordmydesktop/libm-underlinking.patch b/main/recordmydesktop/libm-underlinking.patch new file mode 100644 index 0000000000..04036b86e8 --- /dev/null +++ b/main/recordmydesktop/libm-underlinking.patch @@ -0,0 +1,11 @@ +--- ./src/Makefile.am.orig ++++ ./src/Makefile.am +@@ -76,7 +76,7 @@ + skeleton.h + + recordmydesktop_CPPFLAGS = -D_THREAD_SAFE -pthread -Wall +-recordmydesktop_LDFLAGS = @X_LIBS@ @X_EXTRA_LIBS@ @X_PRE_LIBS@ ++recordmydesktop_LDFLAGS = -lm @X_LIBS@ @X_EXTRA_LIBS@ @X_PRE_LIBS@ + + + # RectInsert test diff --git a/main/recordmydesktop/shmstr-to-shmproto.patch b/main/recordmydesktop/shmstr-to-shmproto.patch index 6fc446e9a8..8dff417685 100644 --- a/main/recordmydesktop/shmstr-to-shmproto.patch +++ b/main/recordmydesktop/shmstr-to-shmproto.patch @@ -1,5 +1,5 @@ ---- src/rmd_getzpixmap.c 2008-12-13 17:04:10.000000000 +0100 -+++ src/rmd_getzpixmap.c 2009-11-11 11:30:18.000000000 +0100 +--- a/src/rmd_getzpixmap.c 2008-12-13 17:04:10.000000000 +0100 ++++ b/src/rmd_getzpixmap.c 2009-11-11 11:30:18.000000000 +0100 @@ -32,7 +32,7 @@ #include <X11/Xlib.h> @@ -9,8 +9,8 @@ #include <X11/extensions/XShm.h> ---- src/rmd_update_image.c 2008-12-13 17:20:49.000000000 +0100 -+++ src/rmd_update_image.c 2009-11-11 11:30:34.000000000 +0100 +--- a/src/rmd_update_image.c 2008-12-13 17:20:49.000000000 +0100 ++++ b/src/rmd_update_image.c 2009-11-11 11:30:34.000000000 +0100 @@ -32,7 +32,7 @@ #include "rmd_types.h" |