From 2a0ade82ff59e8443084085a84edf8f654e7ac6c Mon Sep 17 00:00:00 2001 From: Philip van der Hoeven Date: Thu, 5 Feb 2015 06:22:40 +0700 Subject: graphics/LDView: Updated for version 4.2beta1 + new maintainer. Signed-off-by: Willy Sudiarto Raharjo --- graphics/LDView/LDView.SlackBuild | 14 +++++--------- graphics/LDView/LDView.info | 10 +++++----- graphics/LDView/LDView_GL.patch | 6 +++--- graphics/LDView/LDView_boost15.patch | 19 +++++++++++-------- graphics/LDView/LDView_gcc47.patch | 9 +++++---- graphics/LDView/opengl.patch | 10 ---------- 6 files changed, 29 insertions(+), 39 deletions(-) delete mode 100644 graphics/LDView/opengl.patch (limited to 'graphics') diff --git a/graphics/LDView/LDView.SlackBuild b/graphics/LDView/LDView.SlackBuild index e14fa44f4f..9b835bde73 100644 --- a/graphics/LDView/LDView.SlackBuild +++ b/graphics/LDView/LDView.SlackBuild @@ -4,6 +4,7 @@ # a program to visualize LDraw files # Copyright 2009-2010, 2012-2013 Niels Horn, Rio de Janeiro, Brazil +# Copyright 2015 Philip van der Hoeven, Almere, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,11 +24,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# revision date 2013/11/20 - PRGNAM=LDView -VERSION=4.1 -BUILD=${BUILD:-3} +VERSION=${VERSION:-4.2beta1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -63,11 +62,11 @@ fi set -e -rm -rf $TMP/$PRGNAM-$VERSION $PKG +rm -rf $TMP/$PRGNAM $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +cd $PRGNAM chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -75,9 +74,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Patch for a bug in QT, solves problems on NVIDIA cards -patch -p1 < $CWD/opengl.patch - # Patch for gcc-4.7 patch -p1 < $CWD/LDView_gcc47.patch diff --git a/graphics/LDView/LDView.info b/graphics/LDView/LDView.info index e1506ef86e..9138eebe56 100644 --- a/graphics/LDView/LDView.info +++ b/graphics/LDView/LDView.info @@ -1,10 +1,10 @@ PRGNAM="LDView" -VERSION="4.1" +VERSION="4.2beta1" HOMEPAGE="http://ldview.sourceforge.net" -DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/LDView-4.1.tar.gz" -MD5SUM="942fc33b061bffc5d3e9cdf06622a878" +DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/LDView/LDView-4.2beta1.tar.gz" +MD5SUM="05e90fcde68ca0052f45e3971d0906b1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="LDraw_data tinyxml" -MAINTAINER="Niels Horn" -EMAIL="niels.horn@gmail.com" +MAINTAINER="Philip van der Hoeven" +EMAIL="philip@vd-hoeven.nl" diff --git a/graphics/LDView/LDView_GL.patch b/graphics/LDView/LDView_GL.patch index 355d5ef04c..f603552cc1 100644 --- a/graphics/LDView/LDView_GL.patch +++ b/graphics/LDView/LDView_GL.patch @@ -1,6 +1,6 @@ ---- LDView-4.1/TRE/TREGLExtensions.cpp 2008-10-25 23:33:34.000000000 -0200 -+++ LDView-4.1_patched/TRE/TREGLExtensions.cpp 2013-11-20 22:34:37.069129226 -0200 -@@ -193,7 +193,7 @@ +--- LDView.org/TRE/TREGLExtensions.cpp 2010-01-08 22:01:46.000000000 +0100 ++++ LDView/TRE/TREGLExtensions.cpp 2015-02-04 11:49:42.774280878 +0100 +@@ -204,7 +204,7 @@ // the function pointers won't be loaded. if (haveVARExtension(true)) { diff --git a/graphics/LDView/LDView_boost15.patch b/graphics/LDView/LDView_boost15.patch index df60eb4615..df34562675 100644 --- a/graphics/LDView/LDView_boost15.patch +++ b/graphics/LDView/LDView_boost15.patch @@ -1,6 +1,7 @@ ---- LDView-4.1/LDLib/LDLibraryUpdater.cpp 2009-12-01 16:42:55.000000000 -0200 -+++ LDView-4.1_patched/LDLib/LDLibraryUpdater.cpp 2013-11-20 20:39:36.003276476 -0200 -@@ -1183,7 +1183,7 @@ +diff -ru LDView.org/LDLib/LDLibraryUpdater.cpp LDView/LDLib/LDLibraryUpdater.cpp +--- LDView.org/LDLib/LDLibraryUpdater.cpp 2010-08-04 08:19:09.000000000 +0200 ++++ LDView/LDLib/LDLibraryUpdater.cpp 2015-02-04 11:45:23.930291764 +0100 +@@ -1205,7 +1205,7 @@ // it to signal. boost::xtime xt; @@ -9,8 +10,9 @@ xt.nsec += 250 * 1000 * 1000; m_threadFinish->timed_wait(lock, xt); } ---- LDView-4.1/TCFoundation/TCWebClient.cpp 2009-04-03 13:34:55.000000000 -0300 -+++ LDView-4.1_patched/TCFoundation/TCWebClient.cpp 2013-11-20 20:39:13.900470975 -0200 +diff -ru LDView.org/TCFoundation/TCWebClient.cpp LDView/TCFoundation/TCWebClient.cpp +--- LDView.org/TCFoundation/TCWebClient.cpp 2011-02-12 05:24:14.000000000 +0100 ++++ LDView/TCFoundation/TCWebClient.cpp 2015-02-04 11:45:39.781291097 +0100 @@ -118,7 +118,7 @@ #else // _OSMESA boost::xtime xt; @@ -20,9 +22,10 @@ xt.sec += sec; boost::thread::sleep(xt); #endif // _OSMESA ---- LDView-4.1/TRE/TREMainModel.cpp 2009-11-09 22:10:29.000000000 -0200 -+++ LDView-4.1_patched/TRE/TREMainModel.cpp 2013-11-20 20:39:50.523148711 -0200 -@@ -779,7 +779,7 @@ +diff -ru LDView.org/TRE/TREMainModel.cpp LDView/TRE/TREMainModel.cpp +--- LDView.org/TRE/TREMainModel.cpp 2011-02-12 05:24:14.000000000 +0100 ++++ LDView/TRE/TREMainModel.cpp 2015-02-04 11:45:51.249290615 +0100 +@@ -814,7 +814,7 @@ #ifdef ANTI_DEADLOCK_HACK boost::xtime xt; diff --git a/graphics/LDView/LDView_gcc47.patch b/graphics/LDView/LDView_gcc47.patch index ae1c7c2810..044d824c7a 100644 --- a/graphics/LDView/LDView_gcc47.patch +++ b/graphics/LDView/LDView_gcc47.patch @@ -1,5 +1,5 @@ ---- LDView-4.1/TCFoundation/TCArray.h 2008-05-18 18:16:21.000000000 -0300 -+++ LDView-4.1_patched/TCFoundation/TCArray.h 2012-09-13 14:32:40.000000000 -0300 +--- LDView.org/TCFoundation/TCArray.h 2008-05-18 23:16:21.000000000 +0200 ++++ LDView/TCFoundation/TCArray.h 2015-02-04 11:38:48.394308398 +0100 @@ -2,6 +2,7 @@ #define __TCARRAY_H__ @@ -8,8 +8,9 @@ typedef int (*TCArraySortFunction)(const void*, const void*); ---- LDView-4.1/TCFoundation/mystring.h 2009-11-17 00:45:34.000000000 -0200 -+++ LDView-4.1_patched/TCFoundation/mystring.h 2012-09-13 14:33:51.000000000 -0300 +diff -ru LDView.org/TCFoundation/mystring.h TCFoundation/mystring.h +--- LDView/TCFoundation/mystring.h 2011-05-26 06:51:55.000000000 +0200 ++++ TCFoundation/mystring.h 2015-02-04 11:39:16.529307215 +0100 @@ -13,6 +13,10 @@ #include #endif // _QT diff --git a/graphics/LDView/opengl.patch b/graphics/LDView/opengl.patch deleted file mode 100644 index 53f0364a1a..0000000000 --- a/graphics/LDView/opengl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- LDView-4.1/QT/ModelViewerWidget.cpp 2009-12-01 14:27:54.000000000 -0200 -+++ LDView-4.1_patched/QT/ModelViewerWidget.cpp 2010-05-25 20:15:41.000000000 -0300 -@@ -403,6 +403,7 @@ - if (!painting && (saving || !loading)) - { - painting = true; -+ glEnable(GL_DEPTH_TEST); - if (saving) - { - if (!TREGLExtensions::haveFramebufferObjectExtension()) -- cgit v1.2.3