[arch-commits] Commit in aegisub/trunk (PKGBUILD crash-on-deatach.patch lua51.patch)

[Maxime Gauduin]

    Date: Sunday, June 30, 2013 @ 21:00:50
  Author: alucryd
Revision: 93264

upgpkg: aegisub 3.0.3-1

Modified:
  aegisub/trunk/PKGBUILD
Deleted:
  aegisub/trunk/crash-on-deatach.patch
  aegisub/trunk/lua51.patch

------------------------+
 PKGBUILD               |   19 +++++--------------
 crash-on-deatach.patch |   10 ----------
 lua51.patch            |   24 ------------------------
 3 files changed, 5 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-30 14:06:34 UTC (rev 93263)
+++ PKGBUILD	2013-06-30 19:00:50 UTC (rev 93264)
@@ -4,8 +4,8 @@
 # Contributor: Limao Luo <luolimao+AUR at gmail.com>
 
 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 @@
 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

Deleted: crash-on-deatach.patch
===================================================================
--- crash-on-deatach.patch	2013-06-30 14:06:34 UTC (rev 93263)
+++ crash-on-deatach.patch	2013-06-30 19:00:50 UTC (rev 93264)
@@ -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());

Deleted: lua51.patch
===================================================================
--- lua51.patch	2013-06-30 14:06:34 UTC (rev 93263)
+++ lua51.patch	2013-06-30 19:00:50 UTC (rev 93264)
@@ -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
-   ])])])
- ])