diff --git a/common/shlibs b/common/shlibs index 44765ce4ccd..92bf76a736c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -670,8 +670,7 @@ libxfce4kbd-private-2.so.0 libxfce4ui-4.9.2_1 libxfce4kbd-private-3.so.0 libxfce4ui-4.12.1_2 libxml++-2.6.so.2 libxml++-2.32.0_1 libftgl.so.2 ftgl-2.1.2_1 -libGLEW.so.1.13 glew-1.13.0_1 -libGLEWmx.so.1.13 glew-1.13.0_2 +libGLEW.so.2.1 glew-2.1.0_1 libsndfile.so.1 libsndfile-1.0.20_1 libspeex.so.1 libspeex-1.1_1 libspeexdsp.so.1 speexdsp-1.2rc2_1 diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 1f4e9b17bc8..d86c681918b 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=2.79 -revision=1 +revision=2 build_style="cmake" makedepends=" libgomp-devel libpng-devel tiff-devel python3-devel glu-devel diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template index 7e8aff04262..9412a073f6d 100644 --- a/srcpkgs/cegui/template +++ b/srcpkgs/cegui/template @@ -1,7 +1,7 @@ # Template file for 'cegui' pkgname=cegui version=0.8.7 -revision=5 +revision=6 build_style=cmake hostmakedepends="graphviz doxygen dejavu-fonts-ttf gd glm perl pkg-config" makedepends="libxml2-devel boost-devel glu-devel glew-devel glfw-devel diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template index 098431672db..406c17021ab 100644 --- a/srcpkgs/cegui07/template +++ b/srcpkgs/cegui07/template @@ -1,7 +1,7 @@ # Template file for 'cegui07' pkgname=cegui07 version=0.7.9 -revision=3 +revision=4 wrksrc=CEGUI-${version} build_style=gnu-configure configure_args="--disable-samples" diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index bee9cafe022..ea19d611efd 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,7 +1,7 @@ # Template file for 'clementine' pkgname=clementine version=1.3.1 -revision=10 +revision=11 patch_args="-Np1" build_style=cmake hostmakedepends="sparsehash pkg-config qt-host-tools qt-devel protobuf-c" diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index 9475d238431..ae91e3eb01b 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -1,7 +1,7 @@ # Template file for 'flightgear' pkgname=flightgear version=2017.3.1 -revision=1 +revision=2 build_style=cmake configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata -DSYSTEM_SQLITE=1" hostmakedepends="fltk pkg-config" diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template index 8afac663b49..a63e9d36405 100644 --- a/srcpkgs/freeorion/template +++ b/srcpkgs/freeorion/template @@ -1,7 +1,7 @@ # Template file for 'freeorion' pkgname=freeorion version=0.4.7.1 -revision=2 +revision=3 _release=${version}_2017-09-03.139ffd9 wrksrc="src-tarball" build_style=cmake diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template index 80ae6d775c2..bdf4fe72141 100644 --- a/srcpkgs/glew/template +++ b/srcpkgs/glew/template @@ -1,7 +1,7 @@ # Template build file for 'glew'. pkgname=glew -version=1.13.0 -revision=2 +version=2.1.0 +revision=1 hostmakedepends="pkg-config" makedepends="libXext-devel libXmu-devel libXi-devel glu-devel" short_desc="The OpenGL Extension Wrangler Library" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="http://glew.sourceforge.net" license="BSD, MIT, GPL-2" distfiles="${SOURCEFORGE_SITE}/glew/glew-${version}.tgz" -checksum=aa25dc48ed84b0b64b8d41cdd42c8f40f149c37fa2ffa39cd97f42c78d128bc7 +checksum=04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95 do_build() { sed -i -e "s|lib64|lib|" config/Makefile.linux @@ -24,7 +24,7 @@ do_install() { } glew-devel_package() { - depends="glew-${version}_${revision} glu-devel" + depends="${sourcepkg}-${version}_${revision} glu-devel" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/glew19-devel b/srcpkgs/glew19-devel deleted file mode 120000 index 989d1aa46f1..00000000000 --- a/srcpkgs/glew19-devel +++ /dev/null @@ -1 +0,0 @@ -glew19 \ No newline at end of file diff --git a/srcpkgs/glew19/template b/srcpkgs/glew19/template deleted file mode 100644 index 7bd4f2ab102..00000000000 --- a/srcpkgs/glew19/template +++ /dev/null @@ -1,33 +0,0 @@ -# Template build file for 'glew19'. -pkgname=glew19 -version=1.9.0 -revision=2 -hostmakedepends="pkg-config" -makedepends="libXext-devel libXmu-devel libXi-devel MesaLib-devel" -short_desc="The OpenGL Extension Wrangler Library (1.9 branch)" -maintainer="Juan RP " -homepage="http://glew.sourceforge.net" -license="BSD, MIT, GPL-2" -distfiles="${SOURCEFORGE_SITE}/glew/glew-${version}.tgz" -checksum=9b36530e414c95d6624be9d6815a5be1531d1986300ae5903f16977ab8aeb787 -wrksrc=glew-${version} - -do_build() { - sed -i -e "s|lib64|lib|" config/Makefile.linux - make CFLAGS.EXTRA="-fPIC $CFLAGS" LDFLAGS.EXTRA="$LDFLAGS" ${makejobs} -} -do_install() { - make GLEW_DEST=${DESTDIR}/usr install -} - -glew19-devel_package() { - conflicts="glew-devel>=0" - depends="glew19-${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/glew19/update b/srcpkgs/glew19/update deleted file mode 100644 index 7f7277fbcb9..00000000000 --- a/srcpkgs/glew19/update +++ /dev/null @@ -1,2 +0,0 @@ -pkgname="glew" -ignore="20* 1.1*" diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template index 7263fb6fd20..06b97ff3b60 100644 --- a/srcpkgs/gource/template +++ b/srcpkgs/gource/template @@ -1,7 +1,7 @@ # Template file for 'gource' pkgname=gource version=0.47 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF" hostmakedepends="pkg-config" diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 00c8e642b9b..a9578a5b3d4 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,7 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2017.0.0 -revision=5 +revision=6 wrksrc=${pkgname}-${version} build_style=cmake configure_args="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0" diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template index 0327e530c9c..dd387c2466a 100644 --- a/srcpkgs/kicad/template +++ b/srcpkgs/kicad/template @@ -1,7 +1,7 @@ # Template file for 'kicad' pkgname=kicad version=4.0.7 -revision=3 +revision=4 build_style=cmake configure_args="-DKICAD_BUILD_VERSION=$version -DKICAD_SKIP_BOOST=ON -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template index 8cba17afa71..a99236fc5b8 100644 --- a/srcpkgs/logstalgia/template +++ b/srcpkgs/logstalgia/template @@ -1,7 +1,7 @@ # Template file for 'logstalgia' pkgname=logstalgia version=1.1.0 -revision=1 +revision=2 wrksrc="$pkgname-$version" build_style=gnu-configure hostmakedepends="pkg-config" diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template index d041e536f10..c5f711a095d 100644 --- a/srcpkgs/mesa-demos/template +++ b/srcpkgs/mesa-demos/template @@ -1,7 +1,7 @@ # Template build file for 'MesaLib'. pkgname=mesa-demos version=8.3.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel libfreeglut-devel" diff --git a/srcpkgs/opencsg/template b/srcpkgs/opencsg/template index 76ccfa810e5..0758b33ed06 100644 --- a/srcpkgs/opencsg/template +++ b/srcpkgs/opencsg/template @@ -2,7 +2,7 @@ pkgname="opencsg" version="1.4.2" -revision=1 +revision=2 short_desc="A library that does image-based CSG rendering using OpenGL" maintainer="Pierre Allegraud " license="GPL-2" diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template index bfb45771c56..2f484824d46 100644 --- a/srcpkgs/openmsx/template +++ b/srcpkgs/openmsx/template @@ -1,7 +1,7 @@ # Template file for 'openmsx' pkgname=openmsx version=0.13.0 -revision=1 +revision=2 short_desc="The MSX emulator that aims for perfection" maintainer="Juan RP " license="GPL-3" diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template index 82320017ab6..898e597cdf7 100644 --- a/srcpkgs/openscad/template +++ b/srcpkgs/openscad/template @@ -2,7 +2,7 @@ pkgname="openscad" version="2015.03.2" -revision=5 +revision=6 _distver="${version%.*}-${version##*.}" build_style=qmake short_desc="The programmers solid 3D CAD modeller" diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template index 62c886de0ff..2082eee75ad 100644 --- a/srcpkgs/ppsspp/template +++ b/srcpkgs/ppsspp/template @@ -1,7 +1,7 @@ # Template file for 'ppsspp' pkgname=ppsspp version=1.5.3 -revision=1 +revision=2 build_wrksrc="${pkgname}-${version}" build_style=cmake configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1" diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template index 505e7986b68..117d1e8bda1 100644 --- a/srcpkgs/slop/template +++ b/srcpkgs/slop/template @@ -1,7 +1,7 @@ # Template file for 'slop' pkgname=slop version=7.3.49 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="libXext-devel libXrender-devel MesaLib-devel icu-devel glm glew-devel" diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template index 3d68f4950c9..ec60443eaea 100644 --- a/srcpkgs/supertux2/template +++ b/srcpkgs/supertux2/template @@ -1,7 +1,7 @@ # Template file for 'supertux2' pkgname=supertux2 version=0.5.1 -revision=1 +revision=2 wrksrc=SuperTux-v$version-Source build_style=cmake configure_args=" diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template index e3261206b85..942cd04e915 100644 --- a/srcpkgs/warzone2100/template +++ b/srcpkgs/warzone2100/template @@ -1,7 +1,7 @@ # Template file for 'warzone2100' pkgname=warzone2100 version=3.2.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-distributor=void" hostmakedepends="zip unzip asciidoc pkg-config perl" diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template index abc83bac8aa..7cd797becca 100644 --- a/srcpkgs/widelands/template +++ b/srcpkgs/widelands/template @@ -1,7 +1,7 @@ # Template file for 'widelands' pkgname=widelands version=18 -revision=4 +revision=5 wrksrc=${pkgname}-build${version}-src build_style=cmake configure_args="