Merge pull request #2646 from pullmoll/lua

lua: update to 5.3.1
This commit is contained in:
Jürgen Buchmüller 2015-10-02 11:26:08 +02:00
commit e52823ef15
39 changed files with 296 additions and 105 deletions

View file

@ -807,8 +807,9 @@ libgc.so.1 gc-7.1_1
libcord.so.1 gc-7.4_1
libgslcblas.so.0 gsl-1.15_1
libgsl.so.0 gsl-1.15_1
liblua.so.5.2 lua-5.2.2_1
liblua5.1.so.5.1 lua51-5.1.5_1
liblua5.2.so.5.2 lua52-5.2.4_2
liblua.so.5.3 lua-5.3.1_1
libburn.so.4 libburn-0.7.2_1
libgdkmm-2.4.so.1 gtkmm2-2.24.0_1
libgtkmm-2.4.so.1 gtkmm2-2.24.0_1

View file

@ -1,15 +1,17 @@
# Template file for 'awesome'
pkgname=awesome
version=3.5.6
revision=2
revision=3
build_style=cmake
configure_args="-DSYSCONFDIR=/etc -DLUA_LIBRARY=/usr/lib/liblua.so.5.2"
configure_args="-DSYSCONFDIR=/etc
-DLUA_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/lua5.2
-DLUA_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/liblua5.2.so.5.2"
hostmakedepends="cmake which xmlto asciidoc pkg-config"
makedepends="
libxcb-devel pango-devel xcb-util-devel xcb-util-image-devel
xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-cursor-devel
startup-notification-devel imlib2-devel ImageMagick lgi
libxdg-basedir-devel gdk-pixbuf-devel lua-devel dbus-devel"
libxdg-basedir-devel gdk-pixbuf-devel lua52-devel dbus-devel"
depends="dbus-x11 lgi>=0.7.2 pango"
conf_files="/etc/xdg/awesome/rc.lua"
short_desc="Highly configurable, next gen framework window manager for X"
@ -22,6 +24,7 @@ checksum=37f49de187825425cb3096fc870959d5fec9302b22ffd0f2874d8a18e85046d7
pre_configure() {
# Russian manpages fail to build.
sed -i -e "s|es fr de ru|es fr de|g" CMakeLists.txt
sed -i -e "s|lua|lua5.2|g" build-utils/lgi-check.sh
}
post_install() {
vinstall awesome.desktop 644 usr/share/xsessions

View file

@ -1,8 +1,8 @@
# Template file for 'bam'
pkgname=bam
version=0.4.0
revision=2
makedepends="lua-devel"
revision=3
makedepends="lua52-devel"
short_desc="A fast and flexible build system using Lua"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="custom"

View file

@ -0,0 +1,11 @@
--- doc/config_settings.xml.orig 2015-09-09 22:46:13.283151562 -0400
+++ doc/config_settings.xml 2015-09-09 22:46:25.629151185 -0400
@@ -80,7 +80,7 @@
</term>
<listitem>A comma-separated list of strings to use as the bars of a graph output
to console/shell. The first list item is used for the minimum bar height and the
- last item is used for the maximum. Example: " ,_,▁,▂,▃,▄,▅,▆,▇,█".
+ last item is used for the maximum.
<para /></listitem>
</varlistentry>
<varlistentry>

View file

@ -1,28 +1,32 @@
# Template file for 'conky-cli'
pkgname=conky-cli
version=1.9.0
revision=5
version=1.10.0
revision=1
wrksrc="${pkgname/-cli/}-${version}"
build_style=gnu-configure
configure_args="--enable-lua --disable-x11 --disable-xft --disable-imlib2
--disable-own-window --disable-xdamage --disable-double-buffer --enable-curl
--enable-wlan --enable-rss --enable-ibm"
hostmakedepends="libtool pkg-config"
makedepends="lua-devel ncurses-devel wireless_tools-devel libglib-devel libcurl-devel libxml2-devel"
build_style=cmake
configure_args="
-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DDOC_PATH=share/${pkgname}
-DBUILD_X11=OFF -DBUILD_CURL=ON -DBUILD_XDBE=OFF -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=OFF
-DBUILD_WEATHER_XOAP=OFF -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON"
hostmakedepends="cmake libtool pkg-config docbook2x man-db"
makedepends="lua52-devel ncurses-devel wireless_tools-devel libglib-devel libcurl-devel libxml2-devel"
conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
provides="conky-${version}_${revision}"
conflicts="conky>=0"
short_desc="Conky command line without X11"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="BSD, GPL"
maintainer="Ypnose <linuxien@legtuxDOTorg>"
license="BSD, GPL-3"
homepage="http://conky.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/${pkgname/-cli/}/${pkgname/-cli/}-${version}.tar.gz"
checksum=1de754d77b2671f68795fdb9fc506328a1668dd6ca00984c3f49790a66d368ca
checksum=f392f3f91fcc37f04ff65d53957512e4d81b7b9b36394acb5ecaefe92623f8eb
pre_configure() {
libtoolize -f
}
post_install() {
vinstall COPYING 644 usr/share/licenses/$_pkgname
vmkdir etc/conky
mv ${DESTDIR}/usr/share/conky-cli/conky.conf ${DESTDIR}/etc/conky/
mv ${DESTDIR}/usr/share/conky-cli/conky_no_x11.conf ${DESTDIR}/etc/conky/
vlicense COPYING
}

View file

@ -1,14 +1,14 @@
# Template file for 'conky'
pkgname=conky
version=1.10.0
revision=2
revision=3
build_style=cmake
configure_args="
-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DDOC_PATH=share/${pkgname}
-DBUILD_X11=ON -DBUILD_CURL=ON -DBUILD_XDBE=ON -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON
-DBUILD_WEATHER_XOAP=ON -DBUILD_IMLIB2=ON -DBUILD_WLAN=ON"
hostmakedepends="cmake libtool pkg-config docbook2x man-db"
makedepends="lua-devel alsa-lib-devel libglib-devel libxml2-devel libXft-devel
makedepends="lua52-devel alsa-lib-devel libglib-devel libxml2-devel libXft-devel
libXdamage-devel imlib2-devel wireless_tools-devel libcurl-devel ncurses-devel"
conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
short_desc="Lightweight system monitor for X"

View file

@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=1.6.8
revision=2
revision=3
build_style=cmake
# this makes sure to use -march=generic and -msse3
configure_args="-DBINARY_PACKAGE_BUILD=ON"
@ -13,7 +13,7 @@ hostmakedepends="cmake pkg-config intltool"
makedepends="gtk+-devel glib-devel exiv2-devel lcms2-devel
libglade-devel libxslt-devel dbus-glib-devel libcurl-devel libgphoto2-devel
libwebp-devel libsoup-devel lensfun-devel sqlite-devel librsvg-devel
lua-devel json-glib-devel libgomp-devel colord-devel
lua52-devel json-glib-devel libgomp-devel colord-devel
libopenjpeg-devel libopenexr-devel libgraphicsmagick-devel
SDL-devel libsecret-devel glu-devel"
only_for_archs="i686 x86_64 x86_64-musl" # too much SSE2 stuff all over

View file

@ -1,7 +1,7 @@
# Template file for 'freeciv'
pkgname=freeciv
version=2.5.1
revision=1
revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all
--enable-sys-lua --enable-client=all"
@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
makedepends="bzip2-devel liblzma-devel sqlite-devel freetype-devel
libXpm-devel libXaw-devel libXt-devel libXmu-devel
SDL_mixer-devel SDL_image-devel SDL_gfx-devel SDL_ttf-devel
gtk+-devel gtk+3-devel libcurl-devel lua-devel"
gtk+-devel gtk+3-devel libcurl-devel lua52-devel"
short_desc="Free and Open Source empire-building strategy game - server/data"
maintainer="Juhani Imberg <juhani@imberg.fi>"
license="GPL-2"

View file

@ -1,10 +1,10 @@
# Template file for 'gnuplot'
pkgname=gnuplot
version=5.0.1
revision=1
revision=2
configure_args="--with-readline=builtin"
hostmakedepends="pkg-config"
makedepends="zlib-devel libX11-devel gd-devel lua-devel"
makedepends="zlib-devel libX11-devel gd-devel lua52-devel"
depends="gnuplot-common>=${version}_${revision}"
replaces="gnuplot<4.6.6_1"
short_desc="Command-line driven graphing utility"
@ -14,6 +14,8 @@ license="gnuplot"
distfiles="${SOURCEFORGE_SITE}/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz"
checksum=7cbc557e71df581ea520123fb439dea5f073adcc9010a2885dc80d4ed28b3c47
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
subpackages="gnuplot-common"
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" cairo-devel pango-devel wxGTK-devel qt-devel"
@ -42,6 +44,8 @@ pre_configure() {
}
do_configure() {
export LUA_CFLAGS="-L${XBPS_CROSS_BASE}/usr/include/lua5.2"
export LUA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -llua5.2"
if [ -z "$CROSS_BUILD" ]; then
cd ${wrksrc}/x11
./configure ${configure_args} --without-qt --disable-wxwidgets --without-cairo --disable-wxt

View file

@ -1,11 +1,11 @@
# Template file for 'gpick'
pkgname=gpick
version=0.2.5
revision=1
revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=scons
hostmakedepends="scons pkg-config"
makedepends="boost-devel gtk+-devel lua-devel"
makedepends="boost-devel gtk+-devel lua52-devel"
short_desc="Advanced color picker written in C++ using GTK+ toolkit"
maintainer="Alexander Mamay <alexander@mamay.su>"
license="3-clause-BSD"

View file

@ -1,10 +1,10 @@
# Template file for 'ipe'
pkgname=ipe
version=7.1.8
revision=4
revision=5
_tools_commit=3c1bfb642f53c114262ed732a5f16f0a8ad1649b
hostmakedepends="pkg-config"
makedepends="qt-devel lua-devel libjpeg-turbo-devel cairo-devel poppler-devel"
makedepends="qt-devel lua52-devel libjpeg-turbo-devel cairo-devel poppler-devel"
short_desc="Drawing editor for creating figures in PDF or EPS formats"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="GPL-3, GPL-2"
@ -22,7 +22,7 @@ post_extract() {
}
do_build() {
make ${makejobs} -C src IPEPREFIX=/usr LUA_PACKAGE=lua
make ${makejobs} -C src IPEPREFIX=/usr LUA_PACKAGE=lua5.2
make ${makejobs} -C ipe-tools/figtoipe
make ${makejobs} -C ipe-tools/pdftoipe
}

View file

@ -1,12 +1,12 @@
# Template file for 'lgi'
pkgname=lgi
version=0.9.0
revision=1
revision=2
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="libglib-devel libffi-devel lua-devel
makedepends="libglib-devel libffi-devel lua52-devel
gobject-introspection gir-freedesktop"
depends="lua>=5.2 gir-freedesktop"
depends="lua52>=5.2 gir-freedesktop"
short_desc="Lua binadings for gnome/gobject using gobject-introspection library"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="MIT"
@ -14,10 +14,11 @@ homepage="https://github.com/pavouk/lgi"
distfiles="https://github.com/pavouk/lgi/archive/$version.tar.gz"
checksum="87c7870f8a1c60b48c4d5587b7fab46863e1cb9e76a68520f47e9ef2764cfe24"
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
do_install() {
make DESTDIR=${DESTDIR} LUA_LIBDIR=/usr/lib/lua/5.2 \
LUA_SHAREDIR=/usr/share/lua/5.2 install
vinstall tools/dump-typelib.lua 755 usr/bin dump-typelib
vbin tools/dump-typelib.lua dump-typelib
vlicense LICENSE
}

View file

@ -1,10 +1,10 @@
# Template file for 'libquvi'
pkgname=libquvi
version=0.4.1
revision=6
revision=7
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="lua-devel libcurl-devel libquvi-scripts"
makedepends="lua52-devel libcurl-devel libquvi-scripts"
depends="libquvi-scripts>=${version}"
replaces="quvi<0.4.0"
short_desc="C library that can be used to parse flash media stream URLs"
@ -14,8 +14,12 @@ homepage="http://quvi.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/quvi/$pkgname-$version.tar.gz"
checksum=143c92b065b7ddc2ac87c4b9679ee99df0f1dccd2d0dbda15da0a54ae280dec8
pre_configure() {
sed -i configure -e 's;"lua >= 5.1";"lua5.2 >= 5.1";g'
}
libquvi-devel_package() {
depends="libcurl-devel lua-devel>=5.2 libquvi>=${version}_${revision}"
depends="libcurl-devel lua52-devel>=5.2 libquvi>=${version}_${revision}"
short_desc+=" - development files"
replaces="quvi-devel<0.4.0"
pkg_install() {

View file

@ -1,8 +1,8 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.37
revision=1
makedepends="libmysqlclient-devel lua-devel libxml2-devel sqlite-devel gdbm-devel pcre-devel libressl-devel fcgi-devel"
revision=2
makedepends="libmysqlclient-devel lua52-devel libxml2-devel sqlite-devel gdbm-devel pcre-devel libressl-devel fcgi-devel"
hostmakedepends="automake pkg-config pcre-devel libtool"
conf_files="/etc/lighttpd/lighttpd.conf"
system_accounts="lighttpd"
@ -39,10 +39,18 @@ configure_args="
--with-lua"
lib32disabled=yes
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
pre_configure() {
autoreconf -fi
}
do_configure() {
export LUA_CFLAGS="-L${XBPS_CROSS_BASE}/usr/include/lua5.2"
export LUA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -llua5.2"
./configure ${configure_args}
}
post_install() {
vlicense COPYING
vsv lighttpd
vinstall ${FILESDIR}/lighttpd.conf 644 etc/lighttpd
}

View file

@ -1,10 +1,10 @@
# Template file for 'lua-lpeg'
pkgname=lua-lpeg
version=0.12.2
revision=1
hostmakedepends="lua"
makedepends="lua-devel"
depends="lua>=5.2"
revision=2
hostmakedepends="lua52"
makedepends="lua52-devel"
depends="lua52>=5.2"
short_desc="Pattern-matching library for Lua based on Parsing Expression Grammars"
maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
license="MIT"
@ -13,10 +13,12 @@ distfiles="${homepage}/${pkgname#lua-}-${version}.tar.gz"
wrksrc="${pkgname#lua-}-${version}"
checksum=6aad270b91d1b1c6fd75f68e162329a04a644e50e917d55f46cc8384b7120004
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
do_build() {
make CC=$CC CFLAGS="$CFLAGS -fPIC" LUADIR=${XBPS_CROSS_BASE}/usr/include ${makejobs}
make CC=$CC CFLAGS="$CFLAGS -fPIC" LUADIR=${XBPS_CROSS_BASE}/usr/include/lua5.2 ${makejobs}
}
do_install() {
install -Dm755 lpeg.so ${DESTDIR}/usr/lib/lua/5.2/lpeg.so
install -Dm644 re.lua ${DESTDIR}/usr/share/lua/5.2/re.lua
vlicense lpeg.html
}

View file

@ -11,14 +11,14 @@
src/lua -v
--- src/luaconf.h 2012-05-11 16:14:42.000000000 +0200
+++ src/luaconf.h 2012-09-12 22:40:27.986622772 +0200
@@ -100,7 +100,7 @@
@@ -188,7 +188,7 @@
#else /* }{ */
#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
-#define LUA_ROOT "/usr/local/"
+#define LUA_ROOT "/usr/"
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
#define LUA_PATH_DEFAULT \
--- src/Makefile 2012-03-09 17:32:16.000000000 +0100
+++ src/Makefile 2012-09-12 22:38:08.591386896 +0200

View file

@ -1,15 +1,16 @@
# Template file for 'lua'
pkgname=lua
version=5.2.4
version=5.3.1
revision=1
wrksrc=lua-${version}
build_pie=yes
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.lua.org"
license="MIT"
distfiles="http://www.lua.org/ftp/$pkgname-$version.tar.gz"
checksum=b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b
distfiles="http://www.lua.org/ftp/lua-$version.tar.gz"
checksum=072767aad6cc2e62044a66e8562f51770d941e972dc1e4068ba719cd8bffac17
do_build() {
sed "s/%VER%/${version%.*}/g;s/%REL%/${version}/g" ${FILESDIR}/lua.pc > lua.pc
@ -28,6 +29,7 @@ do_install() {
# Install the documentation
vmkdir usr/share/doc/lua
cp -R doc/* ${DESTDIR}/usr/share/doc/lua
vlicense doc/readme.html
}
lua-devel_package() {

View file

@ -1,10 +1,10 @@
# Template file for 'lua-BitOp'
pkgname=lua-BitOp
# Template file for 'lua52-BitOp'
pkgname=lua52-BitOp
version=1.0.2
revision=1
makedepends="lua-devel lua"
hostmakedepends="lua"
depends="lua>=5.2"
makedepends="lua52-devel lua52"
hostmakedepends="lua52"
depends="lua52>=5.2"
short_desc="C extension module for Lua which adds bitwise operations on numbers"
maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
license="MIT"
@ -13,10 +13,13 @@ distfiles="${homepage}/download/LuaBitOp-${version}.tar.gz"
checksum=1207c9293dcd52eb9dca6538d1b87352bd510f4e760938f5048433f7f272ce99
build_style=gnu-makefile
wrksrc="LuaBitOp-${version}"
make_build_args="INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
replaces="lua-BitOp>=0"
do_install() {
mod_path="${DESTDIR}$(lua installpath.lua bit)"
mod_path="${DESTDIR}$(lua5.2 installpath.lua bit)"
lua_path=$(dirname $mod_path)
install -dm0755 "$lua_path"
install -p bit.so "$mod_path"
vlicense README
}

1
srcpkgs/lua52-devel Symbolic link
View file

@ -0,0 +1 @@
lua52

View file

@ -0,0 +1,20 @@
V=%VER%
R=%REL%
prefix=/usr
INSTALL_BIN=${prefix}/bin
INSTALL_INC=${prefix}/include
INSTALL_LIB=${prefix}/lib
INSTALL_MAN=${prefix}/man/man1
INSTALL_LMOD=${prefix}/share/lua/${V}
INSTALL_CMOD=${prefix}/lib/lua/${V}
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: Lua
Description: An Extensible Extension Language
Version: ${R}
Requires:
Libs: -L${libdir} -llua -lm
Cflags: -I${includedir}

View file

@ -0,0 +1,54 @@
--- Makefile 2012-05-17 16:05:54.000000000 +0200
+++ Makefile 2012-09-12 22:39:07.162748096 +0200
@@ -52,7 +52,7 @@
all: $(PLAT)
$(PLATS) clean:
- cd src && $(MAKE) $@
+ cd src && $(MAKE) $@ V=$(V) R=$(R)
test: dummy
src/lua -v
--- src/luaconf.h 2012-05-11 16:14:42.000000000 +0200
+++ src/luaconf.h 2012-09-12 22:40:27.986622772 +0200
@@ -100,7 +100,7 @@
#else /* }{ */
#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
-#define LUA_ROOT "/usr/local/"
+#define LUA_ROOT "/usr/"
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
#define LUA_PATH_DEFAULT \
--- src/Makefile 2012-03-09 17:32:16.000000000 +0100
+++ src/Makefile 2012-09-12 22:38:08.591386896 +0200
@@ -29,6 +29,7 @@
PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
LUA_A= liblua.a
+LUA_SO= liblua.so
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
ltm.o lundump.o lvm.o lzio.o
@@ -43,7 +44,7 @@
LUAC_O= luac.o
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
ALL_A= $(LUA_A)
# Targets start here.
@@ -59,6 +60,12 @@
$(AR) $@ $(BASE_O)
$(RANLIB) $@
+$(LUA_SO): $(CORE_O) $(LIB_O)
+ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(LDFLAGS)
+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
+ ln -sf $(LUA_SO).$(R) $(LUA_SO)
+
+
$(LUA_T): $(LUA_O) $(LUA_A)
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)

56
srcpkgs/lua52/template Normal file
View file

@ -0,0 +1,56 @@
# Template file for 'lua52'
pkgname=lua52
version=5.2.4
revision=2
wrksrc=lua-${version}
build_pie=yes
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.lua.org"
license="MIT"
distfiles="http://www.lua.org/ftp/lua-$version.tar.gz"
checksum=b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b
do_build() {
sed -i src/Makefile -r \
-e '/^LUA_(SO|A|T)=/ s;lua;lua5.2;' \
-e '/^LUAC_T=/ s;luac;luac5.2;'
make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" \
CC="$CC" RANLIB="$RANLIB" \
INSTALL_DATA="cp -d" LUA_SO=liblua5.2.so ${makejobs} linux
}
do_install() {
make INSTALL_DATA="cp -d" INSTALL_TOP="${DESTDIR}/usr" \
TO_BIN="lua5.2 luac5.2" \
TO_LIB="liblua5.2.a liblua5.2.so liblua5.2.so.${version%.*} liblua5.2.so.${version}" \
INSTALL_INC="${DESTDIR}/usr/include/lua5.2" \
INSTALL_MAN="${DESTDIR}/usr/share/man/man1" install
sed ${FILESDIR}/lua.pc \
-e "s;%VER%;${version%.*};g;s;%REL%;${version};g" \
-e "s;llua;llua5.2;" \
-e "s;/include;/include/lua5.2;" \
> lua5.2.pc
vinstall lua5.2.pc 644 usr/lib/pkgconfig
# Install the documentation
rm -f doc/*.1
vmkdir usr/share/doc/lua52
cp -R doc/* ${DESTDIR}/usr/share/doc/lua52
vlicense doc/readme.html
}
lua52-devel_package() {
depends="${makedepends} lua52>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
vmove usr/share/doc
}
}

View file

@ -3,9 +3,9 @@ pkgname=luakit
_distver=2012.09.13
_patchver=r1
version=${_distver}.${_patchver}
revision=4
revision=5
hostmakedepends="pkg-config help2man"
makedepends="webkitgtk2-devel lua-devel luafilesystem libunique1-devel sqlite-devel LuaJIT-devel"
makedepends="webkitgtk2-devel lua52-devel luafilesystem libunique1-devel sqlite-devel LuaJIT-devel"
depends="desktop-file-utils luafilesystem"
conf_files="
/etc/xdg/luakit/webview.lua
@ -31,6 +31,6 @@ do_build() {
make USE_LUAJIT=1 PREFIX=/usr all
}
do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
chmod -x ${DESTDIR}/usr/share/pixmaps/luakit.png
make PREFIX=/usr DESTDIR=${DESTDIR} install
chmod -x ${DESTDIR}/usr/share/pixmaps/luakit.png
}

View file

@ -1,13 +1,13 @@
# Template file for 'luaposix'
pkgname=luaposix
version=5.1.28
revision=4
revision=5
lib32disabled=yes
wrksrc="${pkgname}-release-v${version}"
build_style=gnu-configure
configure_args="--libdir=/usr/lib/lua/5.2 --datadir=/usr/share/lua/5.2"
hostmakedepends="perl lua-devel"
makedepends="ncurses-devel lua-devel"
hostmakedepends="perl lua52-devel"
makedepends="ncurses-devel lua52-devel"
depends="lua"
short_desc="A POSIX library for Lua programming language"
maintainer="Juan RP <xtraeme@voidlinux.eu>"

View file

@ -1,13 +1,13 @@
# Template file for 'luarocks'
pkgname=luarocks
version=2.2.2
revision=1
revision=2
noarch=yes
build_style=configure
configure_args="--prefix=/usr"
hostmakedepends="curl lua-devel"
makedepends="lua-devel"
depends="lua"
hostmakedepends="curl lua52-devel"
makedepends="lua52-devel"
depends="lua52"
conf_files="/etc/luarocks/config-5.2.lua"
short_desc="Package management for Lua modules"
maintainer="Duncaen <mail@duncano.de>"

View file

@ -1,11 +1,11 @@
# Template file for 'lutok'
pkgname=lutok
version=0.4
revision=3
revision=4
build_style=gnu-configure
configure_args="--with-doxygen"
hostmakedepends="pkg-config doxygen"
makedepends="lua-devel"
makedepends="lua52-devel"
short_desc="Lightweight C++ API for Lua"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="BSD"
@ -13,6 +13,9 @@ homepage="https://github.com/jmmv/lutok"
distfiles="${homepage}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
checksum=2cec51efa0c8d65ace8b21eaa08384b77abc5087b46e785f78de1c21fb754cd5
post_install() {
vlicense COPYING
}
lutok-devel_package() {
depends="lua-devel lutok>=${version}_${revision}"
short_desc+=" - development files"

View file

@ -1,7 +1,7 @@
# Template file for 'minetest'
pkgname=minetest
version=0.4.13
revision=1
revision=2
build_style=cmake
configure_args="-DRUN_IN_PLACE=0 -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1"
short_desc="An InfiniMiner/Minecraft inspired game"
@ -10,7 +10,7 @@ license="LGPL-2.1"
homepage="http://www.minetest.org"
hostmakedepends="cmake pkg-config"
makedepends="
sqlite-devel libcurl-devel lua-devel libjpeg-turbo-devel libpng-devel
sqlite-devel libcurl-devel lua52-devel libjpeg-turbo-devel libpng-devel
LuaJIT-devel freetype-devel MesaLib-devel libopenal-devel libvorbis-devel
irrlicht-devel"
depends="hicolor-icon-theme desktop-file-utils"

View file

@ -1,7 +1,7 @@
# Template file for 'mpv'
pkgname=mpv
version=0.11.0
revision=1
revision=2
short_desc="Video player based on MPlayer/mplayer2"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
@ -11,7 +11,7 @@ configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
--enable-cdda --enable-libmpv-shared --disable-oss-audio --disable-sdl2"
hostmakedepends="pkg-config python-docutils perl"
makedepends="
ffmpeg-devel libass-devel lcms2-devel libXinerama-devel lua-devel v4l-utils-devel
ffmpeg-devel libass-devel lcms2-devel libXinerama-devel lua52-devel v4l-utils-devel
libXv-devel libxkbcommon-devel libva-glx-devel libvdpau-devel alsa-lib-devel
pulseaudio-devel libbluray-devel libcdio-paranoia-devel libdvdread-devel
MesaLib-devel harfbuzz-devel libXScrnSaver-devel jack-devel libdvdnav-devel

View file

@ -1,10 +1,10 @@
# Template file for 'nmap'
pkgname=nmap
version=6.47
revision=7
revision=8
build_style=gnu-configure
configure_args="--without-ndiff --with-openssl $(vopt_with lua liblua)"
makedepends="libpcap-devel pcre-devel libressl-devel $(vopt_if lua lua-devel)"
configure_args="--without-ndiff --with-openssl $(vopt_with lua liblua=${XBPS_CROSS_BASE}/usr/lib/lua5.2)"
makedepends="libpcap-devel pcre-devel libressl-devel $(vopt_if lua lua52-devel)"
short_desc="Utility for network discovery and security auditing"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
@ -21,7 +21,7 @@ if [ -z "$CROSS_BUILD" ]; then
makedepends+=" pygtk-devel"
configure_args+=" --with-zenmap"
else
subpackages=""
unset subpackages
configure_args+=" --without-zenmap"
fi

View file

@ -3,10 +3,10 @@
pkgname="notion"
_minversion="2014052800"
version="3.${_minversion}"
revision=1
revision=2
short_desc="Tabbed, tiling window manager"
hostmakedepends="pkg-config groff lua"
makedepends="lua-devel libXext-devel libSM-devel libXinerama-devel libXrandr-devel"
hostmakedepends="pkg-config groff lua52"
makedepends="lua52-devel libXext-devel libSM-devel libXinerama-devel libXrandr-devel"
maintainer="Julian Wiesener <jw@vtoc.de>"
license="notion"
homepage="http://notion.sourceforge.net/"

View file

@ -1,13 +1,14 @@
# Template file for 'tracebox'
pkgname=tracebox
version=0.3.1
revision=1
revision=2
_click_ver=2.0.1
_crafter_git=fed3a35e146a20ac2f02e876ccf5953b8fef422d
_crafter_ver=0.3.1git
build_style=gnu-configure
only_for_archs="i686 x86_64"
hostmakedepends="automake pkg-config libtool unzip"
makedepends="libpcap-devel json-c-devel lua-devel"
makedepends="libpcap-devel json-c-devel lua52-devel"
short_desc="A middlebox detection tool"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2"

View file

@ -1,10 +1,10 @@
# Template file for 'vicious'
pkgname=vicious
version=2.1.3
revision=2
hostmakedepends="lua-devel"
revision=3
hostmakedepends="lua52-devel"
makedepends="${hostmakedepends}"
depends="lua"
depends="lua52"
maintainer="Steven R <dev@styez.com>"
short_desc="Modular widget library for window managers"
homepage="http://git.sysphere.org/vicious/about/"
@ -15,13 +15,13 @@ checksum="97ffb824af89f2d205b0f0909601a32d761c0c02353b59b4314fd2cc47b2a387"
noarch="yes"
do_install() {
vinstall LICENSE 644 "usr/share/licenses/${pkgname}/"
vinstall CHANGES 644 "usr/share/doc/${pkgname}/"
vmkdir "usr/share/lua/5.2/${pkgname}/widgets"
vmkdir "usr/share/lua/5.2/${pkgname}/contrib"
vinstall TODO 644 "usr/share/doc/${pkgname}"
vinstall README 644 "usr/share/doc/${pkgname}"
install -m644 *.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}"
install -m644 widgets/*.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}/widgets"
install -m644 contrib/*.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}/contrib"
vinstall LICENSE 644 "usr/share/licenses/${pkgname}/"
vinstall CHANGES 644 "usr/share/doc/${pkgname}/"
vmkdir "usr/share/lua/5.2/${pkgname}/widgets"
vmkdir "usr/share/lua/5.2/${pkgname}/contrib"
vinstall TODO 644 "usr/share/doc/${pkgname}"
vinstall README 644 "usr/share/doc/${pkgname}"
install -m644 *.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}"
install -m644 widgets/*.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}/widgets"
install -m644 contrib/*.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}/contrib"
}

View file

@ -1,7 +1,7 @@
# Template file for 'vim'
pkgname=vim
version=7.4.865
revision=1
revision=2
hostmakedepends="pkg-config"
makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel perl
ruby-devel python-devel python3.4-devel lua-devel"

View file

@ -19,7 +19,7 @@ checksum=543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb
lib32disabled=yes
# XXX Add missing deps: gme, telepathy, lua, live555, libtar (for skins2).
hostmakedepends="automake libtool pkg-config libgcrypt-devel $(vopt_if lua lua)"
hostmakedepends="automake libtool pkg-config libgcrypt-devel $(vopt_if lua lua52)"
makedepends="videoproto libudev-devel libpng-devel libupnp-devel
ncurses-devel libvorbis-devel x264-devel ffmpeg-devel
xcb-util-devel xcb-util-keysyms-devel libsamplerate-devel
@ -34,7 +34,7 @@ makedepends="videoproto libudev-devel libpng-devel libupnp-devel
$(vopt_if notify libnotify-devel) $(vopt_if opengl MesaLib-devel)
$(vopt_if qt qt-devel) $(vopt_if svg librsvg-devel)
$(vopt_if v4l2 v4l-utils-devel) $(vopt_if smb samba-devel)
$(vopt_if lua lua-devel) $(vopt_if vaapi libva-devel)
$(vopt_if lua lua52-devel) $(vopt_if vaapi libva-devel)
$(vopt_if vdpau libvdpau-devel) $(vopt_if x265 x265-devel)"
depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
@ -68,6 +68,7 @@ pre_configure() {
# hostname -s is not valid, at least in coreutils!
sed -i "s|hostname -s|hostname|g" configure
sed -i "s|luac|luac5.2|g" configure
sed -i -e "s|/usr/share/fonts/truetype/freefont|/usr/share/fonts/TTF|" \
-e 's,freetype/ftsynth.h,freetype2/ftsynth.h,' \
modules/text_renderer/freetype.c

View file

@ -1,13 +1,13 @@
# Template file for 'weechat'
pkgname=weechat
version=1.3
revision=1
revision=2
lib32disabled=yes
build_style=cmake
configure_args="-DENABLE_MAN=ON -DENABLE_ENCHANT=ON -DPYTHON_EXECUTABLE=/usr/bin/python2.7 -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so"
hostmakedepends="cmake pkg-config python-devel libgcrypt-devel tcl-devel asciidoc"
makedepends="tcl-devel enchant-devel libgcrypt-devel gnutls-devel
python-devel ruby-devel lua-devel libcurl-devel"
python-devel ruby-devel lua52-devel libcurl-devel"
depends="ca-certificates"
short_desc="Fast, light and extensible IRC client"
maintainer="Juan RP <xtraeme@voidlinux.eu>"

View file

@ -1,12 +1,12 @@
# Template file for 'wireshark'
pkgname=wireshark
version=1.12.7
revision=2
revision=3
build_style=gnu-configure
configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua
--with-krb5 --with-gtk3=yes --without-portaudio CC_FOR_BUILD=cc"
hostmakedepends="pkg-config flex perl python-devel mit-krb5-devel libtool"
makedepends="libpcap-devel zlib-devel lua-devel mit-krb5-devel gnutls-devel
makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel
geoip-devel libgcrypt-devel gtk+3-devel libcap-devel sbc-devel"
depends="libcap-progs"
short_desc="A network protocol analyzer"
@ -18,6 +18,8 @@ checksum=c74a1c14e72ce0f198a93d832e71742c7f312cbbe719e5def9ecef176860f92c
system_groups="wireshark"
subpackages="libwireshark libwireshark-devel wireshark-gtk"
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" qt5-devel"
configure_args+=" --with-qt=yes"

View file

@ -0,0 +1,10 @@
--- src/DBuffer.cpp 2011-10-11 22:18:35.000000000 +0200
+++ src/DBuffer.cpp 2015-10-01 22:28:36.654255001 +0200
@@ -23,6 +23,7 @@
*/
#include "DBuffer.h"
#include "helpers/SwapEndian.h"
+#include <stdint.h>
#include <algorithm>
void DBuffer::_FreeDBuffer(void) {

View file

@ -1,14 +1,14 @@
# Template build file for 'xmoto'
pkgname=xmoto
version=0.5.11
revision=3
revision=4
build_style=gnu-configure
short_desc="2D motocross platform game"
maintainer="Enno Boland <gottox@voidlinux.eu>"
license="GPL-2"
makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel
SDL_net-devel SDL_ttf-devel lua-devel libcurl-devel libode-devel
SDL_net-devel SDL_ttf-devel lua51-devel libcurl-devel libode-devel
bzip2-devel"
hostmakedepends="libxml2-devel SDL-devel desktop-file-utils"
homepage="http://xmoto.tuxfamily.org/"