From 545cc688f36387d9b1f29e04089a2d91a3786165 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 1 Jul 2013 01:27:51 -0700 Subject: Mon Jul 1 01:27:49 PDT 2013 --- community/aegisub/PKGBUILD | 21 ++++++--------------- community/aegisub/crash-on-deatach.patch | 10 ---------- community/aegisub/lua51.patch | 24 ------------------------ 3 files changed, 6 insertions(+), 49 deletions(-) delete mode 100755 community/aegisub/crash-on-deatach.patch delete mode 100755 community/aegisub/lua51.patch (limited to 'community/aegisub') diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD index 3d4671472..03044338c 100755 --- a/community/aegisub/PKGBUILD +++ b/community/aegisub/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85317 2013-03-01 00:32:14Z alucryd $ +# $Id: PKGBUILD 93265 2013-06-30 19:01:59Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: kozec # Contributor: Limao Luo pkgname=aegisub -pkgver=3.0.2 -pkgrel=6 +pkgver=3.0.3 +pkgrel=1 pkgdesc="A general-purpose subtitle editor with ASS/SSA support" arch=('i686' 'x86_64') url="http://www.aegisub.org" @@ -13,28 +13,19 @@ license=('GPL' 'BSD') depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9' 'hicolor-icon-theme') makedepends=('mesa') install=aegisub.install -source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz" 'crash-on-deatach.patch' 'lua51.patch') -sha256sums=('68ec20cf49f513608cec400bd462ebb762d6057109968fb01d842e10e6e7fb39' - '85e2c2a6bf091f5b4ca29a0149df8d8ca6219d98a4095f79809f2e698983bca4' - 'ce67b143cc2949fbbd7d72862c54005030339d1c364753335acec271ca9e179d') +source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz") +sha256sums=('9623e1967ae774d8a34fae531dcf76f15ae060f864cf941d34ba3d64e1986efc') build() { cd "${srcdir}"/${pkgname}/${pkgname} -# Patch - patch -Np1 -i "${srcdir}"/crash-on-deatach.patch - patch -Np1 -i "${srcdir}"/lua51.patch - -# Build - autoreconf -ivf - ./configure --prefix=/usr --without-{portaudio,openal,oss} --with-wxdir=/usr/include/wx-2.9 --with-wx-config=/usr/bin/wx-config-2.9 + ACLOCAL=aclocal AUTOMAKE=automake ./autogen.sh --prefix=/usr --without-{portaudio,openal,oss} --with-wxdir=/usr/include/wx-2.9 --with-wx-config=/usr/bin/wx-config-2.9 make } package() { cd "${srcdir}"/${pkgname}/${pkgname} -# Install make DESTDIR="$pkgdir" install # License diff --git a/community/aegisub/crash-on-deatach.patch b/community/aegisub/crash-on-deatach.patch deleted file mode 100755 index 1a1a3d007..000000000 --- a/community/aegisub/crash-on-deatach.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/video_display.cpp -+++ b/src/video_display.cpp -@@ -309,6 +309,7 @@ - } - - void VideoDisplay::UpdateSize() { -+ if (zoomValue<=0) zoomValue = 1; - if (!con->videoController->IsLoaded() || !IsShownOnScreen()) return; - - videoSize.Set(con->videoController->GetWidth(), con->videoController->GetHeight()); diff --git a/community/aegisub/lua51.patch b/community/aegisub/lua51.patch deleted file mode 100755 index f93fb02de..000000000 --- a/community/aegisub/lua51.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -371,9 +371,9 @@ - - AS_IF([test x$with_lua = xno], [$with_auto4_lua="no"; lua_disabled="(disabled)"], [ - # First try pkg-config with several names -- PKG_CHECK_MODULES(LUA, lua >= 5.1, [with_auto4_lua="yes"], [ -- PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [with_auto4_lua="yes"], [ -- PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1, [with_auto4_lua="yes"], [ -+ PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1 lua5.1 < 5.2, [with_auto4_lua="yes"], [ -+ PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1 lua-5.1 < 5.2, [with_auto4_lua="yes"], [ -+ PKG_CHECK_MODULES(LUA, lua >= 5.1 lua < 5.2, [with_auto4_lua="yes"], [ - # Still not found so try to autodetect - AS_IF([test -z "$LUA_CFLAGS"], - [AGI_FIND_HEADER([LUA], [lua.hpp], -@@ -393,7 +393,7 @@ - return !res; - }]) - AS_IF([test x$agi_cv_with_lua = xno && test x$with_lua = xyes], -- [AC_MSG_FAILURE([--with-lua was specified, but lua could not be found. Try setting LUA_CLFAGS and LUA_LIBS manually])]) -+ [AC_MSG_FAILURE([--with-lua was specified, but lua 5.1 could not be found. Try setting LUA_CLFAGS and LUA_LIBS manually])]) - with_auto4_lua=$agi_cv_with_lua - ])])]) - ]) -- cgit v1.2.3-54-g00ecf