From owner-svn-ports-head@freebsd.org Mon Feb 27 23:04:41 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40248CF0F50; Mon, 27 Feb 2017 23:04:41 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E4F1BF63; Mon, 27 Feb 2017 23:04:40 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RN4d5b018195; Mon, 27 Feb 2017 23:04:39 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RN4duJ018188; Mon, 27 Feb 2017 23:04:39 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201702272304.v1RN4duJ018188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 27 Feb 2017 23:04:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434996 - in head/graphics/simpleviewer: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 23:04:41 -0000 Author: danfe Date: Mon Feb 27 23:04:39 2017 New Revision: 434996 URL: https://svnweb.freebsd.org/changeset/ports/434996 Log: - Update `graphics/simpleviewer' to version 2.88 - Add missing USE_XORG components as reported by `stage-qa' - Project had moved from SourceForge to Bitbucket Added: head/graphics/simpleviewer/files/patch-CMakeLists.txt (contents, props changed) head/graphics/simpleviewer/files/patch-sanitize-fontsize (contents, props changed) head/graphics/simpleviewer/files/patch-src_common_config.cpp (contents, props changed) head/graphics/simpleviewer/files/patch-src_viewer.cpp (contents, props changed) Deleted: head/graphics/simpleviewer/files/patch-defreeglut head/graphics/simpleviewer/files/patch-src_fileslist.cpp head/graphics/simpleviewer/files/patch-src_formats_formatgif.cpp head/graphics/simpleviewer/files/patch-src_formats_formatpng.cpp Modified: head/graphics/simpleviewer/Makefile head/graphics/simpleviewer/distinfo head/graphics/simpleviewer/pkg-descr Modified: head/graphics/simpleviewer/Makefile ============================================================================== --- head/graphics/simpleviewer/Makefile Mon Feb 27 22:23:16 2017 (r434995) +++ head/graphics/simpleviewer/Makefile Mon Feb 27 23:04:39 2017 (r434996) @@ -2,31 +2,35 @@ # $FreeBSD$ PORTNAME= simpleviewer -PORTVERSION= 1.7.1553.8560 -PORTREVISION= 10 +PORTVERSION= 2.88 CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME}/OpenGL%20edition -DISTNAME= sviewgl-src-${PORTVERSION} +MASTER_SITES= https://bitbucket.org/andreyu/simple-viewer-gl/get/ +DISTNAME= v${PORTVERSION} +DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Small and simple OpenGL image viewer with transparency support LICENSE= GPLv2 -LIB_DEPENDS= libpng.so:graphics/png \ +LIB_DEPENDS= libImlib2.so:graphics/imlib2 \ + libexif.so:graphics/libexif \ + libfreetype.so:print/freetype2 \ libgif.so:graphics/giflib \ - libImlib2.so:graphics/imlib2 + libglfw.so:graphics/glfw \ + liblcms2.so:graphics/lcms2 \ + libpng.so:graphics/png \ + libtiff.so:graphics/tiff \ + libwebp.so:graphics/webp + +USES= cmake compiler:c++11-lang jpeg pkgconfig tar:bzip2 +USE_GL= glu +USE_XORG= ice sm x11 xcursor xext xrandr xxf86vm -USES= jpeg tar:bzip2 -USE_GL= glut -WRKSRC= ${WRKDIR}/sviewgl-src -MAKE_ARGS= CC="${CXX}" +WRKSRC= ${WRKDIR}/andreyu-simple-viewer-gl-b9266979237d PLIST_FILES= bin/sviewgl -post-patch: - @${REINPLACE_CMD} -e 's,-O2,${CFLAGS}, ; s,/usr/include,${LOCALBASE}/include,g ; \ - s,=-s,=-L${LOCALBASE}/lib,' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sviewgl ${STAGEDIR}${PREFIX}/bin Modified: head/graphics/simpleviewer/distinfo ============================================================================== --- head/graphics/simpleviewer/distinfo Mon Feb 27 22:23:16 2017 (r434995) +++ head/graphics/simpleviewer/distinfo Mon Feb 27 23:04:39 2017 (r434996) @@ -1,2 +1,3 @@ -SHA256 (sviewgl-src-1.7.1553.8560.tar.bz2) = 509de7d8a42c58fbd365a3b730994fef0ff1199536a20f58f29930917339f4c8 -SIZE (sviewgl-src-1.7.1553.8560.tar.bz2) = 522209 +TIMESTAMP = 1487875449 +SHA256 (simpleviewer/v2.88.tar.bz2) = 4d3835ae008b8a7cdd9379f82e72d338a9d5e3d0cb4ef491d888697727c92c56 +SIZE (simpleviewer/v2.88.tar.bz2) = 238105 Added: head/graphics/simpleviewer/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/simpleviewer/files/patch-CMakeLists.txt Mon Feb 27 23:04:39 2017 (r434996) @@ -0,0 +1,18 @@ +--- CMakeLists.txt.orig 2017-02-23 18:44:09 UTC ++++ CMakeLists.txt +@@ -71,11 +71,11 @@ endif() + + file( GLOB_RECURSE SOURCES "src/*.cpp" ) + +-add_executable( sviewgl ${SOURCES} ) ++link_directories( ++ ${EXIF_LIBRARY_DIRS} ++ ) + +-#link_directories( +- #${FREETYPE_LIBRARY_DIRS} +- #) ++add_executable( sviewgl ${SOURCES} ) + + target_link_libraries( sviewgl + ${RT_LIBRARY} Added: head/graphics/simpleviewer/files/patch-sanitize-fontsize ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/simpleviewer/files/patch-sanitize-fontsize Mon Feb 27 23:04:39 2017 (r434996) @@ -0,0 +1,38 @@ +--- src/exifpopup.cpp.orig 2017-02-23 18:44:09 UTC ++++ src/exifpopup.cpp +@@ -32,7 +32,7 @@ void cExifPopup::setRatio(float ratio) + // if (m_ratio != ratio) + { + m_ratio = ratio; +- const int DesiredFontSize = 26; ++ const int DesiredFontSize = 16; + createFont(DesiredFontSize * ratio); + } + } +--- src/infobar.cpp.orig 2017-02-23 18:44:09 UTC ++++ src/infobar.cpp +@@ -48,11 +48,11 @@ void cInfoBar::setRatio(float scale) + { + m_scale = scale; + +- const int DesiredFontSize = 30; ++ const int DesiredFontSize = 16; + createFont(DesiredFontSize * scale); + } + +- const float DesiredHeight = 36; ++ const float DesiredHeight = 16 + 6; + m_height = DesiredHeight * scale; + } + +--- src/pixelpopup.cpp.orig 2017-02-23 18:44:09 UTC ++++ src/pixelpopup.cpp +@@ -58,7 +58,7 @@ void cPixelPopup::setRatio(float ratio) + const float Border = 10.0f; + m_border = Border * ratio; + +- const int desiredFontSize = 30; ++ const int desiredFontSize = 16; + createFont(desiredFontSize * ratio); + + m_ratio = ratio; Added: head/graphics/simpleviewer/files/patch-src_common_config.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/simpleviewer/files/patch-src_common_config.cpp Mon Feb 27 23:04:39 2017 (r434996) @@ -0,0 +1,10 @@ +--- src/common/config.cpp.orig 2017-02-23 18:44:09 UTC ++++ src/common/config.cpp +@@ -11,6 +11,7 @@ + #include "../viewer.h" + #include "Ini.h" + ++#include + #include + #include + Added: head/graphics/simpleviewer/files/patch-src_viewer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/simpleviewer/files/patch-src_viewer.cpp Mon Feb 27 23:04:39 2017 (r434996) @@ -0,0 +1,10 @@ +--- src/viewer.cpp.orig 2017-02-23 18:44:09 UTC ++++ src/viewer.cpp +@@ -345,6 +345,7 @@ void cViewer::fnKeyboard(int key, int /* + switch (key) + { + case GLFW_KEY_ESCAPE: ++ case GLFW_KEY_Q: + glfwSetWindowShouldClose(cRenderer::getWindow(), 1); + break; + Modified: head/graphics/simpleviewer/pkg-descr ============================================================================== --- head/graphics/simpleviewer/pkg-descr Mon Feb 27 22:23:16 2017 (r434995) +++ head/graphics/simpleviewer/pkg-descr Mon Feb 27 23:04:39 2017 (r434996) @@ -1,9 +1,10 @@ Simple Viewer is small and simple OpenGL based image viewer. Its features: - Lightweight and fast: utilizes hardware-accelerated video card + - GIF animation, embedded ICC profiles, and Exif tags support - Very simple interface, minimum dependencies - Suitable for default image viewer of desktop - Desktop independent: does not require any specific desktop environment - Open source, licensed under GNU GPLv2 -WWW: http://simpleviewer.sourceforge.net/ +WWW: https://bitbucket.org/andreyu/simple-viewer-gl