diff --git a/portage/win32libs/glew/glew-1.9.0-20130124.diff b/portage/win32libs/glew/glew-1.9.0-20130124.diff new file mode 100644 index 000000000..9f73a055d --- /dev/null +++ b/portage/win32libs/glew/glew-1.9.0-20130124.diff @@ -0,0 +1,129 @@ +diff -Nru -x '*~' glew-1.9.0.orig/CMakeLists.txt glew-1.9.0/CMakeLists.txt +--- glew-1.9.0.orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ glew-1.9.0/CMakeLists.txt 2013-01-24 14:13:44.485778700 +0100 +@@ -0,0 +1,40 @@ ++project (glew) ++ ++cmake_minimum_required (VERSION 2.6) ++ ++option(BUILD_mx "Build glew with multiple rendering contexts (glew mx)" ON) ++option(BUILD_STATIC "Build glew as a static library" OFF) ++option(BUILD_tools "Build glewinfo and visualinfo" ON) ++ ++if(MSVC) ++ add_definitions(-D_CRT_SECURE_NO_WARNINGS) ++endif(MSVC) ++ ++# determine glew version from config/version ++# we have some assumptions on this file, but I don't think it will ever change ++file(READ config/version _versioncontents) ++STRING(REGEX REPLACE ";" "\\\\;" _versioncontents "${_versioncontents}") ++STRING(REGEX REPLACE "\n" ";" _versioncontents "${_versioncontents}") ++file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.cmake) ++ ++foreach(_line ${_versioncontents}) ++ string(REGEX REPLACE "([^ ]*) = (.*)" "set(\\1 \\2)" _replaced ${_line}) ++ string(REGEX REPLACE "\\$\\(([^ \\)]*)\\)" "\${\\1}" _replaced ${_replaced}) ++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/version.cmake "${_replaced}\n") ++endforeach(_line ${_versioncontents}) ++ ++include(${CMAKE_CURRENT_BINARY_DIR}/version.cmake) ++ ++add_subdirectory(include) ++add_subdirectory(src) ++ ++set(prefix ${CMAKE_INSTALL_PREFIX}) ++set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin) ++set(libdir ${CMAKE_INSTALL_PREFIX}/lib) ++set(includedir ${CMAKE_INSTALL_PREFIX}/include) ++set(version ${GLEW_VERSION}) ++set(cflags) ++set(libname glew) ++ ++configure_file(glew.pc.in ${CMAKE_CURRENT_BINARY_DIR}/glew.pc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/glew.pc DESTINATION lib/pkgconfig) +diff -Nru -x '*~' glew-1.9.0.orig/include/CMakeLists.txt glew-1.9.0/include/CMakeLists.txt +--- glew-1.9.0.orig/include/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ glew-1.9.0/include/CMakeLists.txt 2013-01-24 14:13:44.485778700 +0100 +@@ -0,0 +1 @@ ++install(FILES GL/glew.h GL/glxew.h GL/wglew.h DESTINATION include/GL) +\ Kein Zeilenumbruch am Dateiende. +diff -Nru -x '*~' glew-1.9.0.orig/include/GL/glew.h glew-1.9.0/include/GL/glew.h +--- glew-1.9.0.orig/include/GL/glew.h 2013-01-24 14:15:45.217420400 +0100 ++++ glew-1.9.0/include/GL/glew.h 2013-01-24 14:13:44.510778800 +0100 +@@ -155,7 +155,11 @@ + #endif + #if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_) && !defined(__MINGW64__) + # ifdef _WIN64 +-typedef __int64 ptrdiff_t; ++# ifdef __MINGW64__ ++# include ++# else ++ typedef __int64 ptrdiff_t; ++# endif + # else + typedef _W64 int ptrdiff_t; + # endif +diff -Nru -x '*~' glew-1.9.0.orig/src/CMakeLists.txt glew-1.9.0/src/CMakeLists.txt +--- glew-1.9.0.orig/src/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ glew-1.9.0/src/CMakeLists.txt 2013-01-24 14:15:14.130229800 +0100 +@@ -0,0 +1,58 @@ ++set(glew_SRCS ++ glew.c ++ ../build/glew.rc ++) ++ ++set(glewinfo_SRCS ++ glewinfo.c ++ ../build/glewinfo.rc ++) ++ ++set(visualinfo_SRCS ++ visualinfo.c ++ ../build/visualinfo.rc ++) ++ ++include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ../include) ++ ++if(BUILD_STATIC) ++ set(_SHARED STATIC) ++else(BUILD_STATIC) ++ set(_SHARED SHARED) ++endif(BUILD_STATIC) ++ ++add_library(glew ${_SHARED} ${glew_SRCS}) ++if(NOT BUILD_STATIC) ++ set_target_properties(glew PROPERTIES DEFINE_SYMBOL "GLEW_BUILD" ++ VERSION ${SO_MAJOR} ++ SOVERSION ${SO_VERSION}) ++endif(NOT BUILD_STATIC) ++set_target_properties(glew PROPERTIES COMPILE_FLAGS "-DGLEW_NO_GLU") ++target_link_libraries(glew opengl32) ++set(_targets glew) ++ ++if(BUILD_mx) ++ add_library(glewmx ${_SHARED} ${glew_SRCS}) ++ if(NOT BUILD_STATIC) ++ set_target_properties(glewmx PROPERTIES DEFINE_SYMBOL "GLEW_BUILD" ++ VERSION ${SO_MAJOR} ++ SOVERSION ${SO_VERSION}) ++ endif(NOT BUILD_STATIC) ++ set_target_properties(glewmx PROPERTIES COMPILE_FLAGS "-DGLEW_NO_GLU -DGLEW_MX") ++ target_link_libraries(glewmx opengl32) ++ list(APPEND _targets glewmx) ++endif(BUILD_mx) ++ ++if(BUILD_tools) ++ add_executable(glewinfo ${glewinfo_SRCS}) ++ target_link_libraries(glewinfo glew) ++ ++ add_executable(visualinfo ${visualinfo_SRCS}) ++ target_link_libraries(visualinfo glew opengl32 glu32) ++ ++ list(APPEND _targets glewinfo visualinfo) ++endif(BUILD_tools) ++ ++install(TARGETS glew ${_targets} RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) +\ Kein Zeilenumbruch am Dateiende. diff --git a/portage/win32libs/glew/glew-20100708.py b/portage/win32libs/glew/glew-20100708.py index 53f4188cc..f6a811c79 100644 --- a/portage/win32libs/glew/glew-20100708.py +++ b/portage/win32libs/glew/glew-20100708.py @@ -1,25 +1,27 @@ # -*- coding: utf-8 -*- import info from Package.CMakePackageBase import * class subinfo(info.infoclass): def setTargets( self ): - for ver in ['1.5.4', '1.7.0']: + for ver in ['1.5.4', '1.7.0', '1.9.0']: self.targets[ ver ] = 'http://downloads.sourceforge.net/project/glew/glew/' + ver + '/glew-'+ ver + '.zip' self.targetInstSrc[ ver ] = 'glew-' + ver - self.patchToApply['1.5.4'] = ('glew-1.5.4-20100708.diff', 1) - self.patchToApply['1.7.0'] = ('glew-1.7.0-20120320.diff', 1) + self.patchToApply['1.5.4'] = [('glew-1.5.4-20100708.diff', 1)] + self.patchToApply['1.7.0'] = [('glew-1.7.0-20120320.diff', 1)] + self.patchToApply['1.9.0'] = [('glew-1.9.0-20130124.diff', 1)] self.targetDigests['1.7.0'] = '107c155ff5b69d97b9c530b40e4e8da571aaf729' - self.defaultTarget = '1.7.0' + self.targetDigests['1.9.0'] = '6c0dd8d6af14db93868bb5482b55e784b2dc1127' + self.defaultTarget = '1.9.0' def setDependencies( self ): - self.hardDependencies['virtual/bin-base'] = 'default' + self.hardDependencies['virtual/base'] = 'default' class Package(CMakePackageBase): def __init__( self, **args ): self.subinfo = subinfo() CMakePackageBase.__init__(self) if __name__ == '__main__': Package().execute()