Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Apr 2014 02:35:38 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r351746 - in head/x11-toolkits/mygui: . files
Message-ID:  <201404220235.s3M2Zcsc068692@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Apr 22 02:35:38 2014
New Revision: 351746
URL: http://svnweb.freebsd.org/changeset/ports/351746
QAT: https://qat.redports.org/buildarchive/r351746/

Log:
  - Update to latest git version, unbreak with ogre3d 1.9.0

Added:
  head/x11-toolkits/mygui/files/patch-CMake__Packages__FindFreetype.cmake   (contents, props changed)
  head/x11-toolkits/mygui/files/patch-Common__FileSystemInfo__FileSystemInfo.h   (contents, props changed)
Deleted:
  head/x11-toolkits/mygui/files/patch-CMake-Packages-FindFreetype.cmake
  head/x11-toolkits/mygui/files/patch-Common-FileSystemInfo-FileSystemInfo.h
Modified:
  head/x11-toolkits/mygui/Makefile
  head/x11-toolkits/mygui/distinfo
  head/x11-toolkits/mygui/pkg-plist

Modified: head/x11-toolkits/mygui/Makefile
==============================================================================
--- head/x11-toolkits/mygui/Makefile	Tue Apr 22 01:43:41 2014	(r351745)
+++ head/x11-toolkits/mygui/Makefile	Tue Apr 22 02:35:38 2014	(r351746)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mygui
-PORTVERSION=	3.2.0
-PORTREVISION=	3
+PORTVERSION=	3.2.0.git20140422
 CATEGORIES=	x11-toolkits graphics devel
 MASTER_SITES=	SF/my-gui/MyGUI/MyGUI_${PORTVERSION}
 DISTNAME=	MyGUI_${PORTVERSION}
@@ -15,13 +14,13 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/
 		libOgreMain.so:${PORTSDIR}/graphics/ogre3d \
 		libOIS.so:${PORTSDIR}/devel/ois
 
-BROKEN=		Does not compile with graphics/ogre3d 1.9.0
-
-USES=		cmake pkgconfig zip
+USES=		cmake pkgconfig zip dos2unix compiler:c++11-lib
 CMAKE_ARGS=	-DMYGUI_BUILD_DEMOS=OFF -DMYGUI_BUILD_DOCS=OFF
 USE_LDCONFIG=	yes
-USE_GCC=	yes
-USE_DOS2UNIX=	*.cpp *.h
+DOS2UNIX_GLOB=	*.cpp *.h *.cmake
+
+USE_CXXSTD=	c++11
+CXXFLAGS+=	-fPIC
 
 post-patch:
 	@${REINPLACE_CMD} -e '/install/ s|lib/pkgconfig|libdata/pkgconfig|' \

Modified: head/x11-toolkits/mygui/distinfo
==============================================================================
--- head/x11-toolkits/mygui/distinfo	Tue Apr 22 01:43:41 2014	(r351745)
+++ head/x11-toolkits/mygui/distinfo	Tue Apr 22 02:35:38 2014	(r351746)
@@ -1,2 +1,2 @@
-SHA256 (MyGUI_3.2.0.zip) = 1704006f364b733b2d2cc6807c6dc10833cf695542b797aee50b8fd061eea19a
-SIZE (MyGUI_3.2.0.zip) = 14383788
+SHA256 (MyGUI_3.2.0.git20140422.zip) = 56cefd283d70d4f48766ee5a34a3ddc1412d3247974cb9cfeb5f5494bea1ae98
+SIZE (MyGUI_3.2.0.git20140422.zip) = 23170181

Added: head/x11-toolkits/mygui/files/patch-CMake__Packages__FindFreetype.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/mygui/files/patch-CMake__Packages__FindFreetype.cmake	Tue Apr 22 02:35:38 2014	(r351746)
@@ -0,0 +1,11 @@
+--- CMake/Packages/FindFreetype.cmake.orig	2013-12-09 04:56:26.000000000 +0400
++++ CMake/Packages/FindFreetype.cmake	2014-04-22 05:18:05.042699865 +0400
+@@ -33,7 +33,7 @@
+ findpkg_framework(FREETYPE)
+ message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
+ 
+-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
++find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
+ find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
+ find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
+ find_library(FREETYPE_LIBRARY_DBG NAMES ${FREETYPE_LIBRARY_NAMES_DBG} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)

Added: head/x11-toolkits/mygui/files/patch-Common__FileSystemInfo__FileSystemInfo.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/mygui/files/patch-Common__FileSystemInfo__FileSystemInfo.h	Tue Apr 22 02:35:38 2014	(r351746)
@@ -0,0 +1,10 @@
+--- Common/FileSystemInfo/FileSystemInfo.h.orig	2014-04-22 06:12:03.384476313 +0400
++++ Common/FileSystemInfo/FileSystemInfo.h	2014-04-22 06:12:29.104475139 +0400
+@@ -14,6 +14,7 @@
+ #else
+ #include <unistd.h>
+ #include <dirent.h>
++#include <sys/syslimits.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>

Modified: head/x11-toolkits/mygui/pkg-plist
==============================================================================
--- head/x11-toolkits/mygui/pkg-plist	Tue Apr 22 01:43:41 2014	(r351745)
+++ head/x11-toolkits/mygui/pkg-plist	Tue Apr 22 02:35:38 2014	(r351746)
@@ -27,7 +27,9 @@ include/MYGUI/MyGUI_DDContainer.h
 include/MYGUI/MyGUI_DDItemInfo.h
 include/MYGUI/MyGUI_DataFileStream.h
 include/MYGUI/MyGUI_DataManager.h
+include/MYGUI/MyGUI_DataMemoryStream.h
 include/MYGUI/MyGUI_DataStream.h
+include/MYGUI/MyGUI_DataStreamHolder.h
 include/MYGUI/MyGUI_Delegate.h
 include/MYGUI/MyGUI_DelegateImplement.h
 include/MYGUI/MyGUI_DeprecatedTypes.h
@@ -178,6 +180,7 @@ include/MYGUI/MyGUI_Window.h
 include/MYGUI/MyGUI_XmlDocument.h
 include/MYGUI/Plugin.h
 include/MYGUI/StrangeButton.h
+lib/libEditorFramework.so
 lib/libMyGUI.OgrePlatform.a
 lib/libMyGUIEngine.so
 lib/libMyGUIEngine.so.3



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404220235.s3M2Zcsc068692>