Compare commits
No commits in common. "master" and "openmw" have entirely different histories.
@ -1,7 +1,7 @@
|
|||||||
# Copyright 2017 Julian Ospald <hasufell@posteo.de>
|
# Copyright 2017 Julian Ospald <hasufell@posteo.de>
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
require autotools [ supported_autoconf=[ 2.7 ] supported_automake=[ 1.16 ] ]
|
require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
|
||||||
require github [ user="olafvdspek" tag="${PNV}" ]
|
require github [ user="olafvdspek" tag="${PNV}" ]
|
||||||
|
|
||||||
SUMMARY="A simple but powerful template language for C++"
|
SUMMARY="A simple but powerful template language for C++"
|
@ -0,0 +1,80 @@
|
|||||||
|
# Copyright 2013-2014 Thomas Witt
|
||||||
|
# Copyright 2016 Julian Ospald <hasufell@posteo.de>
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
MY_PN="OpenSceneGraph"
|
||||||
|
MY_PNV=${MY_PN}-${PV}
|
||||||
|
|
||||||
|
require github [ user=openscenegraph project=${MY_PN} tag=${MY_PNV} ]
|
||||||
|
require cmake [ api=2 ]
|
||||||
|
|
||||||
|
SUMMARY="High performance 3D graphics toolkit"
|
||||||
|
DESCRIPTION="
|
||||||
|
The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application
|
||||||
|
developers in fields such as visual simulation, games, virtual reality, scientific visualization
|
||||||
|
and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX,
|
||||||
|
GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well
|
||||||
|
established as the world leading scene graph technology, used widely in the vis-sim, space,
|
||||||
|
scientific, oil-gas, games and virtual reality industries.
|
||||||
|
"
|
||||||
|
HOMEPAGE+=" http://${PN}.org"
|
||||||
|
|
||||||
|
LICENCES="wxWinLL-3 LGPL-2.1"
|
||||||
|
SLOT="0"
|
||||||
|
PLATFORMS="~amd64 ~x86"
|
||||||
|
MYOPTIONS="
|
||||||
|
( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]]
|
||||||
|
"
|
||||||
|
|
||||||
|
DEPENDENCIES="
|
||||||
|
build:
|
||||||
|
virtual/unzip
|
||||||
|
build+run:
|
||||||
|
app-text/poppler[cairo]
|
||||||
|
dev-libs/glib:2
|
||||||
|
media/ffmpeg
|
||||||
|
media-libs/freetype:2
|
||||||
|
media-libs/giflib:=
|
||||||
|
media-libs/gstreamer:1.0
|
||||||
|
media-libs/imath
|
||||||
|
media-libs/jasper
|
||||||
|
media-libs/libpng:=
|
||||||
|
media-libs/openexr[>=3]
|
||||||
|
media-libs/SDL:0
|
||||||
|
media-libs/tiff
|
||||||
|
media-plugins/gst-plugins-base:1.0
|
||||||
|
net-misc/curl
|
||||||
|
sys-libs/zlib
|
||||||
|
x11-dri/mesa
|
||||||
|
x11-libs/cairo
|
||||||
|
x11-libs/libX11
|
||||||
|
x11-libs/libXrandr
|
||||||
|
providers:ijg-jpeg? ( media-libs/jpeg:= )
|
||||||
|
providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
|
||||||
|
"
|
||||||
|
|
||||||
|
DEFAULT_SRC_PREPARE_PATCHES=(
|
||||||
|
"${FILES}"/${PN}-3.6.5-openexr3.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
CMAKE_SRC_CONFIGURE_PARAMS=(
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_Asio=1
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=1
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_FBX=
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_Performer=1
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_GDAL=1
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=1
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_OurDCMTK=1
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_RSVG=1
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_NVTT=1
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=1
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_Lua51=1
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_Lua52=1
|
||||||
|
-DCMAKE_DISABLE_FIND_PACKAGE_SDL2=1
|
||||||
|
-DOSG_USE_LOCAL_LUA_SOURCE=OFF
|
||||||
|
-DOPENGL_PROFILE=GL2
|
||||||
|
-DDYNAMIC_OPENSCENEGRAPH=ON
|
||||||
|
-DLIB_POSTFIX=""
|
||||||
|
)
|
||||||
|
|
@ -0,0 +1,86 @@
|
|||||||
|
Source: Arch, https://github.com/archlinux/svntogit-community/blob/packages/openscenegraph/trunk/openscenegraph-openexr3.patch
|
||||||
|
Upstream: Reported, https://github.com/openscenegraph/OpenSceneGraph/issues/1075
|
||||||
|
Reason: Fix build with OpenEXR >= 3
|
||||||
|
|
||||||
|
diff --git a/CMakeModules/FindOpenEXR.cmake b/CMakeModules/FindOpenEXR.cmake
|
||||||
|
index 233be972b..d1b022881 100644
|
||||||
|
--- a/CMakeModules/FindOpenEXR.cmake
|
||||||
|
+++ b/CMakeModules/FindOpenEXR.cmake
|
||||||
|
@@ -51,11 +51,11 @@ MACRO(OPENEXR_FIND libname)
|
||||||
|
OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY_DEBUG ${libname}d)
|
||||||
|
ENDMACRO(OPENEXR_FIND)
|
||||||
|
|
||||||
|
-OPENEXR_FIND(IlmImf)
|
||||||
|
+OPENEXR_FIND(OpenEXR)
|
||||||
|
|
||||||
|
SET(OPENEXR_FOUND "NO")
|
||||||
|
-IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY)
|
||||||
|
- SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} )
|
||||||
|
- SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY )
|
||||||
|
+IF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY)
|
||||||
|
+ SET(OPENEXR_LIBRARIES ${OPENEXR_OpenEXR_LIBRARY} )
|
||||||
|
+ SET(OPENEXR_LIBRARIES_VARS OPENEXR_OpenEXR_LIBRARY )
|
||||||
|
SET(OPENEXR_FOUND "YES")
|
||||||
|
-ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY)
|
||||||
|
+ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY)
|
||||||
|
diff --git a/CMakeModules/Findilmbase.cmake b/CMakeModules/Findilmbase.cmake
|
||||||
|
index 4b076c7c9..4610497fa 100644
|
||||||
|
--- a/CMakeModules/Findilmbase.cmake
|
||||||
|
+++ b/CMakeModules/Findilmbase.cmake
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
# Created by Robert Osfield.
|
||||||
|
|
||||||
|
|
||||||
|
-FIND_PATH(ILMBASE_INCLUDE_DIR OpenEXR/ImathVec.h
|
||||||
|
+FIND_PATH(ILMBASE_INCLUDE_DIR Imath/ImathVec.h
|
||||||
|
$ENV{ILMBASE_DIR}/include
|
||||||
|
$ENV{ILMBASE_DIR}
|
||||||
|
~/Library/Frameworks
|
||||||
|
@@ -28,7 +28,7 @@ FIND_PATH(ILMBASE_INCLUDE_DIR OpenEXR/ImathVec.h
|
||||||
|
# example: ILMBASE_FIND_VAR(OPENEXR_IlmThread_LIBRARY IlmThread)
|
||||||
|
MACRO(ILMBASE_FIND_VAR varname libname)
|
||||||
|
FIND_LIBRARY( ${varname}
|
||||||
|
- NAMES ${libname} ${libname}-2_1 ${libname}-2_2
|
||||||
|
+ NAMES ${libname} ${libname}-2_1 ${libname}-2_2 ${libname}-3_0
|
||||||
|
PATHS
|
||||||
|
$ENV{ILMBASE_DIR}/lib
|
||||||
|
$ENV{ILMBASE_DIR}
|
||||||
|
@@ -53,11 +53,11 @@ ENDMACRO(ILMBASE_FIND)
|
||||||
|
|
||||||
|
ILMBASE_FIND(IlmThread)
|
||||||
|
ILMBASE_FIND(Iex)
|
||||||
|
-ILMBASE_FIND(Half)
|
||||||
|
+ILMBASE_FIND(Imath)
|
||||||
|
|
||||||
|
SET(ILMBASE_FOUND "NO")
|
||||||
|
-IF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Half_LIBRARY)
|
||||||
|
- SET(ILMBASE_LIBRARIES ${ILMBASE_IlmThread_LIBRARY} ${ILMBASE_Half_LIBRARY} ${ILMBASE_Iex_LIBRARY} )
|
||||||
|
- SET(ILMBASE_LIBRARIES_VARS ILMBASE_IlmThread_LIBRARY ILMBASE_Half_LIBRARY ILMBASE_Iex_LIBRARY )
|
||||||
|
+IF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Imath_LIBRARY)
|
||||||
|
+ SET(ILMBASE_LIBRARIES ${ILMBASE_IlmThread_LIBRARY} ${ILMBASE_Imath_LIBRARY} ${ILMBASE_Iex_LIBRARY} )
|
||||||
|
+ SET(ILMBASE_LIBRARIES_VARS ILMBASE_IlmThread_LIBRARY ILMBASE_Imath_LIBRARY ILMBASE_Iex_LIBRARY )
|
||||||
|
SET(ILMBASE_FOUND "YES")
|
||||||
|
-ENDIF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Half_LIBRARY)
|
||||||
|
+ENDIF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Imath_LIBRARY)
|
||||||
|
diff --git a/src/osgPlugins/exr/CMakeLists.txt b/src/osgPlugins/exr/CMakeLists.txt
|
||||||
|
index 6191ed18f..9a368b2c2 100644
|
||||||
|
--- a/src/osgPlugins/exr/CMakeLists.txt
|
||||||
|
+++ b/src/osgPlugins/exr/CMakeLists.txt
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-INCLUDE_DIRECTORIES( ${ILMBASE_INCLUDE_DIR}/OpenEXR )
|
||||||
|
+INCLUDE_DIRECTORIES( ${ILMBASE_INCLUDE_DIR}/Imath )
|
||||||
|
INCLUDE_DIRECTORIES( ${OPENEXR_INCLUDE_DIR}/OpenEXR )
|
||||||
|
|
||||||
|
SET(TARGET_SRC ReaderWriterEXR.cpp )
|
||||||
|
diff --git a/src/osgPlugins/exr/ReaderWriterEXR.cpp b/src/osgPlugins/exr/ReaderWriterEXR.cpp
|
||||||
|
index 7132e97f8..96c5507ef 100644
|
||||||
|
--- a/src/osgPlugins/exr/ReaderWriterEXR.cpp
|
||||||
|
+++ b/src/osgPlugins/exr/ReaderWriterEXR.cpp
|
||||||
|
@@ -13,6 +13,7 @@
|
||||||
|
#include <osgDB/FileNameUtils>
|
||||||
|
#include <osgDB/FileUtils>
|
||||||
|
|
||||||
|
+#include <ImfInt64.h>
|
||||||
|
#include <ImfRgbaFile.h>
|
||||||
|
#include <ImfIO.h>
|
||||||
|
#include <ImfArray.h>
|
@ -0,0 +1,168 @@
|
|||||||
|
From fbdfac84763ce525e7d243eefbb23c013db93e32 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Julian Ospald <hasufell@posteo.de>
|
||||||
|
Date: Tue, 24 May 2016 18:06:54 +0200
|
||||||
|
Subject: [PATCH] Use GNUInstallDirs
|
||||||
|
|
||||||
|
This will probably not make it upstream since they try to
|
||||||
|
be windows compatible.
|
||||||
|
---
|
||||||
|
CMake/ConfigureBuild.cmake | 2 +-
|
||||||
|
CMake/Utils/MyGUIConfigTargets.cmake | 40 +++++++++++++-------------
|
||||||
|
CMakeLists.txt | 1 +
|
||||||
|
MyGUIEngine/CMakeLists.txt | 2 +-
|
||||||
|
Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt | 2 +-
|
||||||
|
5 files changed, 24 insertions(+), 23 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake
|
||||||
|
index 9c6aad9..b655848 100644
|
||||||
|
--- a/CMake/ConfigureBuild.cmake
|
||||||
|
+++ b/CMake/ConfigureBuild.cmake
|
||||||
|
@@ -47,7 +47,7 @@ if (UNIX)
|
||||||
|
else ()
|
||||||
|
configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
|
||||||
|
endif ()
|
||||||
|
- install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
|
||||||
|
+ install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||||
|
|
||||||
|
# configure additional packages
|
||||||
|
|
||||||
|
diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
|
||||||
|
index d48d2a3..61b80a5 100644
|
||||||
|
--- a/CMake/Utils/MyGUIConfigTargets.cmake
|
||||||
|
+++ b/CMake/Utils/MyGUIConfigTargets.cmake
|
||||||
|
@@ -60,27 +60,27 @@ endfunction(mygui_create_vcproj_userfile)
|
||||||
|
# install targets according to current build type
|
||||||
|
function(mygui_install_target TARGETNAME SUFFIX)
|
||||||
|
install(TARGETS ${TARGETNAME}
|
||||||
|
- RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
|
||||||
|
- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
|
||||||
|
- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
|
||||||
|
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
|
||||||
|
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
|
||||||
|
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
|
||||||
|
FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None ""
|
||||||
|
)
|
||||||
|
install(TARGETS ${TARGETNAME}
|
||||||
|
- RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
|
||||||
|
- LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
|
||||||
|
- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
|
||||||
|
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
|
||||||
|
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
|
||||||
|
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
|
||||||
|
FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo
|
||||||
|
)
|
||||||
|
install(TARGETS ${TARGETNAME}
|
||||||
|
- RUNTIME DESTINATION "bin${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel
|
||||||
|
- LIBRARY DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
|
||||||
|
- ARCHIVE DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
|
||||||
|
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel
|
||||||
|
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
|
||||||
|
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
|
||||||
|
FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS MinSizeRel
|
||||||
|
)
|
||||||
|
install(TARGETS ${TARGETNAME}
|
||||||
|
- RUNTIME DESTINATION "bin${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug
|
||||||
|
- LIBRARY DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
|
||||||
|
- ARCHIVE DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
|
||||||
|
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug
|
||||||
|
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
|
||||||
|
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
|
||||||
|
FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Debug
|
||||||
|
)
|
||||||
|
endfunction(mygui_install_target)
|
||||||
|
@@ -364,11 +364,11 @@ function(mygui_install_app PROJECTNAME)
|
||||||
|
if (MYGUI_INSTALL_PDB)
|
||||||
|
# install debug pdb files
|
||||||
|
install(FILES ${MYGUI_BINARY_DIR}/bin${MYGUI_DEBUG_PATH}/${PROJECTNAME}.pdb
|
||||||
|
- DESTINATION bin${MYGUI_DEBUG_PATH}
|
||||||
|
+ DESTINATION ${CMAKE_INSTALL_BINDIR}${MYGUI_DEBUG_PATH}
|
||||||
|
CONFIGURATIONS Debug
|
||||||
|
)
|
||||||
|
install(FILES ${MYGUI_BINARY_DIR}/bin${MYGUI_RELWDBG_PATH}/${PROJECTNAME}.pdb
|
||||||
|
- DESTINATION bin${MYGUI_RELWDBG_PATH}
|
||||||
|
+ DESTINATION ${CMAKE_INSTALL_BINDIR}${MYGUI_RELWDBG_PATH}
|
||||||
|
CONFIGURATIONS RelWithDebInfo
|
||||||
|
)
|
||||||
|
endif ()
|
||||||
|
@@ -400,7 +400,7 @@ function(mygui_plugin PROJECTNAME)
|
||||||
|
set_target_properties(${PROJECTNAME} PROPERTIES PREFIX "")
|
||||||
|
|
||||||
|
install(FILES ${HEADER_FILES}
|
||||||
|
- DESTINATION include/MYGUI
|
||||||
|
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/MYGUI
|
||||||
|
)
|
||||||
|
endfunction(mygui_plugin)
|
||||||
|
|
||||||
|
@@ -431,20 +431,20 @@ function(mygui_config_lib PROJECTNAME)
|
||||||
|
# install debug pdb files
|
||||||
|
if (MYGUI_STATIC)
|
||||||
|
install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb
|
||||||
|
- DESTINATION lib${MYGUI_LIB_DEBUG_PATH}
|
||||||
|
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_DEBUG_PATH}
|
||||||
|
CONFIGURATIONS Debug
|
||||||
|
)
|
||||||
|
install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb
|
||||||
|
- DESTINATION lib${MYGUI_LIB_RELWDBG_PATH}
|
||||||
|
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELWDBG_PATH}
|
||||||
|
CONFIGURATIONS RelWithDebInfo
|
||||||
|
)
|
||||||
|
else ()
|
||||||
|
install(FILES ${MYGUI_BINARY_DIR}/bin${MYGUI_DEBUG_PATH}/${PROJECTNAME}_d.pdb
|
||||||
|
- DESTINATION bin${MYGUI_DEBUG_PATH}
|
||||||
|
+ DESTINATION ${CMAKE_INSTALL_BINDIR}${MYGUI_DEBUG_PATH}
|
||||||
|
CONFIGURATIONS Debug
|
||||||
|
)
|
||||||
|
install(FILES ${MYGUI_BINARY_DIR}/bin${MYGUI_RELWDBG_PATH}/${PROJECTNAME}.pdb
|
||||||
|
- DESTINATION bin${MYGUI_RELWDBG_PATH}
|
||||||
|
+ DESTINATION ${CMAKE_INSTALL_BINDIR}${MYGUI_RELWDBG_PATH}
|
||||||
|
CONFIGURATIONS RelWithDebInfo
|
||||||
|
)
|
||||||
|
endif ()
|
||||||
|
@@ -459,7 +459,7 @@ function(mygui_config_sample PROJECTNAME)
|
||||||
|
# set install RPATH for Unix systems
|
||||||
|
if (UNIX AND MYGUI_FULL_RPATH)
|
||||||
|
set_property(TARGET ${PROJECTNAME} APPEND PROPERTY
|
||||||
|
- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
|
||||||
|
+ INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR})
|
||||||
|
set_property(TARGET ${PROJECTNAME} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||||
|
endif ()
|
||||||
|
endfunction(mygui_config_sample)
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 9fc5694..0cddafa 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -17,6 +17,7 @@ set(CMAKE_MODULE_PATH
|
||||||
|
"${MYGUI_SOURCE_DIR}/CMake/Utils"
|
||||||
|
"${MYGUI_SOURCE_DIR}/CMake/Packages"
|
||||||
|
)
|
||||||
|
+include(GNUInstallDirs)
|
||||||
|
include(CMakeDependentOption)
|
||||||
|
include(MacroLogFeature)
|
||||||
|
include(MyGUIConfigTargets)
|
||||||
|
diff --git a/MyGUIEngine/CMakeLists.txt b/MyGUIEngine/CMakeLists.txt
|
||||||
|
index c5eab54..839ff43 100644
|
||||||
|
--- a/MyGUIEngine/CMakeLists.txt
|
||||||
|
+++ b/MyGUIEngine/CMakeLists.txt
|
||||||
|
@@ -64,5 +64,5 @@ endif ()
|
||||||
|
|
||||||
|
# install MyGUIEngine headers
|
||||||
|
install(FILES ${HEADER_FILES}
|
||||||
|
- DESTINATION include/MYGUI
|
||||||
|
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/MYGUI"
|
||||||
|
)
|
||||||
|
diff --git a/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt b/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
|
||||||
|
index 169ad05..4bd7cd1 100644
|
||||||
|
--- a/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
|
||||||
|
+++ b/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
|
||||||
|
@@ -30,7 +30,7 @@ link_directories(${OPENGL_LIB_DIR} ${PNG_LIBRARY})
|
||||||
|
|
||||||
|
# installation rules
|
||||||
|
install(FILES ${HEADER_FILES}
|
||||||
|
- DESTINATION include/MYGUI
|
||||||
|
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/MYGUI
|
||||||
|
)
|
||||||
|
mygui_install_target(${PROJECTNAME} "")
|
||||||
|
|
||||||
|
--
|
||||||
|
2.8.3
|
||||||
|
|
@ -0,0 +1,21 @@
|
|||||||
|
From: Julian Ospald <hasufell@gentoo.org>
|
||||||
|
Date: Fri Jun 15 10:42:42 UTC 2012
|
||||||
|
Subject: build system
|
||||||
|
Upstream: no
|
||||||
|
|
||||||
|
fix underlinking
|
||||||
|
|
||||||
|
--- MyGUIEngine/CMakeLists.txt
|
||||||
|
+++ MyGUIEngine/CMakeLists.txt
|
||||||
|
@@ -48,7 +48,10 @@
|
||||||
|
if (MYGUI_USE_FREETYPE)
|
||||||
|
target_link_libraries(${PROJECTNAME}
|
||||||
|
${FREETYPE_LIBRARIES}
|
||||||
|
- )
|
||||||
|
+ dl)
|
||||||
|
+else()
|
||||||
|
+ target_link_libraries(${PROJECTNAME}
|
||||||
|
+ dl)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# platform specific dependencies
|
61
packages/dev-games/mygui/mygui-3.2.2-r1.exheres-0
Normal file
61
packages/dev-games/mygui/mygui-3.2.2-r1.exheres-0
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
# Copyright 2016 Julian Ospald <hasufell@posteo.de>
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
MY_PNV=MyGUI${PV}
|
||||||
|
WORK="${WORKBASE}/${PN}-${MY_PNV}"
|
||||||
|
|
||||||
|
require cmake [ api=2 ]
|
||||||
|
require github [ user=MyGUI tag=${MY_PNV} ]
|
||||||
|
|
||||||
|
SUMMARY="A library for creating GUIs for games"
|
||||||
|
HOMEPAGE="http://mygui.info/"
|
||||||
|
|
||||||
|
LICENCES="MIT"
|
||||||
|
SLOT="0"
|
||||||
|
PLATFORMS="~amd64 ~x86"
|
||||||
|
|
||||||
|
DEPENDENCIES="
|
||||||
|
build:
|
||||||
|
virtual/pkg-config
|
||||||
|
build+run:
|
||||||
|
media-libs/freetype:2
|
||||||
|
media-libs/glew
|
||||||
|
x11-dri/mesa
|
||||||
|
"
|
||||||
|
|
||||||
|
|
||||||
|
DEFAULT_SRC_PREPARE_PATCHES=(
|
||||||
|
-p0 "${FILES}"/${PNV}-underlinking.patch
|
||||||
|
-p1 "${FILES}"/${PNV}-Use-GNUInstallDirs.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
CMAKE_SRC_CONFIGURE_PARAMS=(
|
||||||
|
-DCMAKE_INSTALL_BINDIR="/usr$(exhost --target)/bin"
|
||||||
|
-DCMAKE_INSTALL_INCLUDEDIR="/usr/$(exhost --target)/include"
|
||||||
|
-DCMAKE_INSTALL_LIBDIR="/usr/$(exhost --target)/lib"
|
||||||
|
-DCMAKE_INSTALL_PREFIX="/usr"
|
||||||
|
-DMYGUI_BUILD_DEMOS=OFF
|
||||||
|
-DMYGUI_BUILD_DOCS=OFF
|
||||||
|
-DMYGUI_BUILD_PLUGINS=ON
|
||||||
|
-DMYGUI_BUILD_TOOLS=OFF
|
||||||
|
-DCMAKE_BUILD_TYPE=Release
|
||||||
|
-DMYGUI_BUILD_WRAPPER=OFF
|
||||||
|
-DMYGUI_INSTALL_DOCS=OFF
|
||||||
|
-DMYGUI_INSTALL_MEDIA=ON
|
||||||
|
-DMYGUI_INSTALL_SAMPLES=OFF
|
||||||
|
-DMYGUI_INSTALL_TOOLS=OFF
|
||||||
|
-DMYGUI_RENDERSYSTEM=4
|
||||||
|
-DMYGUI_STATIC=OFF
|
||||||
|
-DMYGUI_USE_FREETYPE=ON
|
||||||
|
-DMYGUI_USE_SYSTEM_GLEW=ON
|
||||||
|
)
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
cmake_src_install
|
||||||
|
|
||||||
|
# test media not needed at runtime
|
||||||
|
edo rm -r "${IMAGE}"/usr/share/MYGUI/Media/UnitTests
|
||||||
|
# wrapper not available for linux, remove related media
|
||||||
|
edo rm -r "${IMAGE}"/usr/share/MYGUI/Media/Wrapper
|
||||||
|
}
|
||||||
|
|
94
packages/dev-libs/mbedtls/mbedtls-2.16.0-r1.exheres-0
Normal file
94
packages/dev-libs/mbedtls/mbedtls-2.16.0-r1.exheres-0
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
# Copyright 2016 Julian Ospald <hasufell@posteo.de>
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
|
||||||
|
require github [ user=ARMmbed tag=mbedtls-${PV} ]
|
||||||
|
WORK="${WORKBASE}/${PNV}" # because github.exlib is broken
|
||||||
|
require cmake [ api=2 ]
|
||||||
|
|
||||||
|
|
||||||
|
SUMMARY="Cryptographic library for embedded systems"
|
||||||
|
HOMEPAGE="https://tls.mbed.org/"
|
||||||
|
DOWNLOADS="https://tls.mbed.org/download/${PNV}-gpl.tgz"
|
||||||
|
|
||||||
|
LICENCES="|| ( Apache-2.0 GPL-2 )"
|
||||||
|
SLOT="0"
|
||||||
|
PLATFORMS="~amd64 ~x86"
|
||||||
|
|
||||||
|
MYOPTIONS="
|
||||||
|
doc
|
||||||
|
havege [[ description = [ Enable the HAVEGE random generator,
|
||||||
|
not suitable for virtualized environments! ] ]]
|
||||||
|
threads [[ description = [ Enables the threading abstraction layer
|
||||||
|
via pthread. This is used if you do intend
|
||||||
|
to use contexts between threads. ] ]]
|
||||||
|
x86_cpu_features:
|
||||||
|
sse2
|
||||||
|
"
|
||||||
|
|
||||||
|
DEPENDENCIES="
|
||||||
|
build:
|
||||||
|
doc? (
|
||||||
|
app-doc/doxygen[>=1.8.4]
|
||||||
|
media-gfx/graphviz
|
||||||
|
)
|
||||||
|
build+run:
|
||||||
|
sys-libs/zlib
|
||||||
|
test:
|
||||||
|
dev-lang/perl:*
|
||||||
|
dev-lang/python:*[>=3]
|
||||||
|
"
|
||||||
|
|
||||||
|
CMAKE_SRC_CONFIGURE_PARAMS=(
|
||||||
|
-DENABLE_PROGRAMS=OFF
|
||||||
|
-DUSE_SHARED_MBEDTLS_LIBRARY=ON
|
||||||
|
-DINSTALL_MBEDTLS_HEADERS=ON
|
||||||
|
-DLIB_INSTALL_DIR="/usr/$(exhost --target)/lib"
|
||||||
|
-DUSE_STATIC_MBEDTLS_LIBRARY=OFF
|
||||||
|
-DENABLE_ZLIB_SUPPORT=ON
|
||||||
|
)
|
||||||
|
|
||||||
|
CMAKE_SRC_CONFIGURE_TESTS=(
|
||||||
|
'-DENABLE_TESTING=ON'
|
||||||
|
)
|
||||||
|
|
||||||
|
enable_mbedtls_option() {
|
||||||
|
local myopt="$@"
|
||||||
|
# check that config.h syntax is the same at version bump
|
||||||
|
edo sed -i \
|
||||||
|
-e "s://#define ${myopt}:#define ${myopt}:" \
|
||||||
|
"${CMAKE_SOURCE}"/include/mbedtls/config.h
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
option x86_cpu_features:sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
|
||||||
|
enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
|
||||||
|
option havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
|
||||||
|
option threads && enable_mbedtls_option MBEDTLS_THREADING_C
|
||||||
|
option threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
|
||||||
|
enable_mbedtls_option MBEDTLS_MD4_C
|
||||||
|
cmake_src_prepare
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
default
|
||||||
|
|
||||||
|
if option doc ; then
|
||||||
|
emake apidoc
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_test() {
|
||||||
|
LD_LIBRARY_PATH="${ECMAKE_BUILD_DIR}/library" \
|
||||||
|
emake test
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
cmake_src_install
|
||||||
|
|
||||||
|
if option doc ; then
|
||||||
|
docinto html
|
||||||
|
dodoc -r "${CMAKE_SOURCE}"/apidoc/*
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
@ -1,25 +0,0 @@
|
|||||||
Upstream: Yes
|
|
||||||
|
|
||||||
From 08c503bdd1e128118e45fa50be256e27415bbd41 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adrian Georgescu <ag@ag-projects.com>
|
|
||||||
Date: Sat, 1 Jan 2022 15:19:37 +0000
|
|
||||||
Subject: [PATCH] collections.MutableMapping was deprecated since Python 3.3
|
|
||||||
|
|
||||||
---
|
|
||||||
application/python/weakref.py | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/application/python/weakref.py b/application/python/weakref.py
|
|
||||||
index a785a7e..38fd664 100644
|
|
||||||
--- a/application/python/weakref.py
|
|
||||||
+++ b/application/python/weakref.py
|
|
||||||
@@ -1,7 +1,8 @@
|
|
||||||
|
|
||||||
import weakref
|
|
||||||
|
|
||||||
-from collections import MutableMapping, deque
|
|
||||||
+from collections.abc import MutableMapping
|
|
||||||
+from collections import deque
|
|
||||||
from copy import deepcopy
|
|
||||||
from threading import local
|
|
||||||
|
|
@ -15,7 +15,4 @@ MYOPTIONS=""
|
|||||||
DEPENDENCIES="
|
DEPENDENCIES="
|
||||||
dev-python/zopeinterface[python_abis:*(-)?]
|
dev-python/zopeinterface[python_abis:*(-)?]
|
||||||
"
|
"
|
||||||
DEFAULT_SRC_PREPARE_PATCHES=(
|
|
||||||
"${FILES}"/08c503bdd1e128118e45fa50be256e27415bbd41.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
|
@ -0,0 +1,46 @@
|
|||||||
|
# Copyright 2016 Julian Ospald <hasufell@posteo.de>
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
require scons
|
||||||
|
|
||||||
|
SUMMARY="A simple converter to create Ogg Theora files"
|
||||||
|
HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
|
||||||
|
DOWNLOADS="http://www.v2v.cc/~j/${PN}/downloads/${PNV}.tar.bz2"
|
||||||
|
|
||||||
|
LICENCES="GPL-3"
|
||||||
|
SLOT="0"
|
||||||
|
PLATFORMS="~amd64 ~x86"
|
||||||
|
MYOPTIONS="
|
||||||
|
( providers: ffmpeg libav ) [[ number-selected = exactly-one ]]
|
||||||
|
"
|
||||||
|
|
||||||
|
DEPENDENCIES="
|
||||||
|
build:
|
||||||
|
virtual/pkg-config
|
||||||
|
build+run:
|
||||||
|
media-libs/libvorbis
|
||||||
|
media-libs/libogg
|
||||||
|
media-libs/libtheora
|
||||||
|
providers:ffmpeg? ( media/ffmpeg )
|
||||||
|
providers:libav? ( media/libav )
|
||||||
|
"
|
||||||
|
|
||||||
|
DEFAULT_SRC_PREPARE_PATCHES=(
|
||||||
|
-p0 "${FILES}"/${PN}-0.30-underlinking.patch
|
||||||
|
-p1 "${FILES}"/${PN}-0.30-build.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
SCONS_SRC_CONFIGURE_PARAMS=(
|
||||||
|
libkate=0
|
||||||
|
bindir="${IMAGE}/usr/$(exhost --target)/bin"
|
||||||
|
destdir=${IMAGE}
|
||||||
|
prefix=/usr
|
||||||
|
)
|
||||||
|
SCONS_SRC_COMPILE_PARAMS=( "${SCONS_SRC_CONFIGURE_PARAMS[@]}" )
|
||||||
|
SCONS_SRC_INSTALL_PARAMS=( "${SCONS_SRC_CONFIGURE_PARAMS[@]}" )
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
scons_src_install
|
||||||
|
dodoc AUTHORS ChangeLog README subtitles.txt TODO
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,76 @@
|
|||||||
|
Source: Julian Ospald <hasufell@posteo.de>
|
||||||
|
Upstream: no
|
||||||
|
Reason: fix build by respecting pkg-config, CC etc
|
||||||
|
|
||||||
|
diff --git a/SConstruct b/SConstruct
|
||||||
|
index 2458096..eda1c41 100644
|
||||||
|
--- a/SConstruct
|
||||||
|
+++ b/SConstruct
|
||||||
|
@@ -4,6 +4,7 @@ from glob import glob
|
||||||
|
import os
|
||||||
|
|
||||||
|
import SCons
|
||||||
|
+import SCons.Util
|
||||||
|
|
||||||
|
def version():
|
||||||
|
#return "0.29"
|
||||||
|
@@ -41,6 +42,27 @@ opts.AddVariables(
|
||||||
|
env = Environment(options = opts)
|
||||||
|
Help(opts.GenerateHelpText(env))
|
||||||
|
|
||||||
|
+if os.environ.has_key('AR'):
|
||||||
|
+ env['AR'] = os.environ['AR']
|
||||||
|
+if os.environ.has_key('RANLIB'):
|
||||||
|
+ env['RANLIB'] = os.environ['RANLIB']
|
||||||
|
+if os.environ.has_key('CC'):
|
||||||
|
+ env['CC'] = os.environ['CC']
|
||||||
|
+if os.environ.has_key('CFLAGS'):
|
||||||
|
+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
|
||||||
|
+if os.environ.has_key('CXX'):
|
||||||
|
+ env['CXX'] = os.environ['CXX']
|
||||||
|
+if os.environ.has_key('CXXFLAGS'):
|
||||||
|
+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
|
||||||
|
+if os.environ.has_key('CPPFLAGS'):
|
||||||
|
+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
|
||||||
|
+if os.environ.has_key('LDFLAGS'):
|
||||||
|
+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
|
||||||
|
+if os.environ.has_key('PKG_CONFIG'):
|
||||||
|
+ env['PKG_CONFIG'] = os.environ['PKG_CONFIG']
|
||||||
|
+else:
|
||||||
|
+ env['PKG_CONFIG'] = 'pkg-config'
|
||||||
|
+
|
||||||
|
pkg_flags="--cflags --libs"
|
||||||
|
if env['static']:
|
||||||
|
pkg_flags+=" --static"
|
||||||
|
@@ -75,9 +97,9 @@ if GetOption("help"):
|
||||||
|
|
||||||
|
def ParsePKGConfig(env, name):
|
||||||
|
if os.environ.get('PKG_CONFIG_PATH', ''):
|
||||||
|
- action = 'PKG_CONFIG_PATH=%s pkg-config %s "%s"' % (os.environ['PKG_CONFIG_PATH'], pkg_flags, name)
|
||||||
|
+ action = 'PKG_CONFIG_PATH=%s %s %s "%s"' % (os.environ['PKG_CONFIG_PATH'], env['PKG_CONFIG'], pkg_flags, name)
|
||||||
|
else:
|
||||||
|
- action = 'pkg-config %s "%s"' % (pkg_flags, name)
|
||||||
|
+ action = '%s %s "%s"' % (env['PKG_CONFIG'], pkg_flags, name)
|
||||||
|
return env.ParseConfig(action)
|
||||||
|
|
||||||
|
def TryAction(action):
|
||||||
|
@@ -89,16 +111,16 @@ def TryAction(action):
|
||||||
|
|
||||||
|
def CheckPKGConfig(context, version):
|
||||||
|
context.Message( 'Checking for pkg-config... ' )
|
||||||
|
- ret = TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0]
|
||||||
|
+ ret = TryAction('%s --atleast-pkgconfig-version=%s' % (env['PKG_CONFIG'], version))[0]
|
||||||
|
context.Result( ret )
|
||||||
|
return ret
|
||||||
|
|
||||||
|
def CheckPKG(context, name):
|
||||||
|
context.Message( 'Checking for %s... ' % name )
|
||||||
|
if os.environ.get('PKG_CONFIG_PATH', ''):
|
||||||
|
- action = 'PKG_CONFIG_PATH=%s pkg-config --exists "%s"' % (os.environ['PKG_CONFIG_PATH'], name)
|
||||||
|
+ action = 'PKG_CONFIG_PATH=%s %s --exists "%s"' % (os.environ['PKG_CONFIG_PATH'], env['PKG_CONFIG'], name)
|
||||||
|
else:
|
||||||
|
- action = 'pkg-config --exists "%s"' % name
|
||||||
|
+ action = '%s --exists "%s"' % (env['PKG_CONFIG'], name)
|
||||||
|
ret = TryAction(action)[0]
|
||||||
|
context.Result( ret )
|
||||||
|
return ret
|
@ -0,0 +1,17 @@
|
|||||||
|
Source: Gentoo
|
||||||
|
Upstream: unknown
|
||||||
|
Reason: fix underlinking
|
||||||
|
|
||||||
|
--- SConstruct
|
||||||
|
+++ SConstruct
|
||||||
|
@@ -206,9 +206,8 @@
|
||||||
|
if env['crossmingw']:
|
||||||
|
env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
|
||||||
|
env.Append(LIBS=['m'])
|
||||||
|
- elif env['static']:
|
||||||
|
- env.Append(LIBS=['m', 'dl'])
|
||||||
|
|
||||||
|
+ env.Append(LIBS=['m', 'dl'])
|
||||||
|
|
||||||
|
env = conf.Finish()
|
||||||
|
|
@ -70,7 +70,6 @@ src_install() {
|
|||||||
insinto /opt/slack
|
insinto /opt/slack
|
||||||
doins -r usr/lib/slack/.
|
doins -r usr/lib/slack/.
|
||||||
edo chmod +x "${IMAGE}"/opt/slack/slack
|
edo chmod +x "${IMAGE}"/opt/slack/slack
|
||||||
edo chmod +x "${IMAGE}"/opt/slack/chrome_crashpad_handler
|
|
||||||
dodir /usr/$(exhost --target)/bin
|
dodir /usr/$(exhost --target)/bin
|
||||||
dosym ../../../opt/slack/slack /usr/$(exhost --target)/bin/slack
|
dosym ../../../opt/slack/slack /usr/$(exhost --target)/bin/slack
|
||||||
}
|
}
|
@ -3,10 +3,10 @@
|
|||||||
|
|
||||||
require desktop-utils gtk-icon-cache
|
require desktop-utils gtk-icon-cache
|
||||||
require setup-py [ import=distutils blacklist="2" multibuild=false ]
|
require setup-py [ import=distutils blacklist="2" multibuild=false ]
|
||||||
|
require github [ user="AGProjects" pn="blink-qt" tag="${PV}" ]
|
||||||
|
|
||||||
SUMMARY="A state of the art, easy to use SIP client"
|
SUMMARY="A state of the art, easy to use SIP client"
|
||||||
HOMEPAGE="http://iCanBlink.com"
|
HOMEPAGE="http://iCanBlink.com"
|
||||||
DOWNLOADS="http://download.ag-projects.com/Blink/Linux/${PNV}.tar.gz"
|
|
||||||
|
|
||||||
LICENCES="GPL-3"
|
LICENCES="GPL-3"
|
||||||
SLOT="0"
|
SLOT="0"
|
||||||
@ -25,14 +25,13 @@ DEPENDENCIES="
|
|||||||
dev-python/python-application[>=3.0.3][python_abis:*(-)?]
|
dev-python/python-application[>=3.0.3][python_abis:*(-)?]
|
||||||
dev-python/python-dateutil[python_abis:*(-)?]
|
dev-python/python-dateutil[python_abis:*(-)?]
|
||||||
dev-python/python-eventlib[>=0.3.0][python_abis:*(-)?]
|
dev-python/python-eventlib[>=0.3.0][python_abis:*(-)?]
|
||||||
dev-python/python-sipsimple[>=5.2.5][python_abis:*(-)?]
|
dev-python/python-sipsimple[>=5.2.2][python_abis:*(-)?]
|
||||||
dev-python/zopeinterface[python_abis:*(-)?]
|
dev-python/zopeinterface[python_abis:*(-)?]
|
||||||
net-twisted/Twisted[python_abis:*(-)?]
|
net-twisted/Twisted[python_abis:*(-)?]
|
||||||
"
|
"
|
||||||
|
|
||||||
DEFAULT_SRC_PREPARE_PATCHES=(
|
DEFAULT_SRC_PREPARE_PATCHES=(
|
||||||
"${FILES}/${PN}-data-path.patch"
|
"${FILES}/${PN}-data-path.patch"
|
||||||
"${FILES}/33c7f377d173d27b4611d061ca36077805250e78.patch"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
src_install() {
|
src_install() {
|
@ -1,122 +0,0 @@
|
|||||||
Upstream: Yes
|
|
||||||
|
|
||||||
From 33c7f377d173d27b4611d061ca36077805250e78 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jose Lopes <josemslopes@gmail.com>
|
|
||||||
Date: Tue, 8 Feb 2022 08:11:57 +0000
|
|
||||||
Subject: [PATCH] Solve issues with python 3.10
|
|
||||||
|
|
||||||
GH-3
|
|
||||||
---
|
|
||||||
blink/chatwindow.py | 3 ++-
|
|
||||||
blink/sessions.py | 6 +++---
|
|
||||||
blink/widgets/buttons.py | 4 ++--
|
|
||||||
blink/widgets/lineedit.py | 14 +++++++-------
|
|
||||||
blink/widgets/video.py | 2 +-
|
|
||||||
5 files changed, 15 insertions(+), 14 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/blink/chatwindow.py b/blink/chatwindow.py
|
|
||||||
index e55f590..40da6de 100644
|
|
||||||
--- a/blink/chatwindow.py
|
|
||||||
+++ b/blink/chatwindow.py
|
|
||||||
@@ -18,7 +18,8 @@
|
|
||||||
from application.python.descriptor import WriteOnceAttribute
|
|
||||||
from application.python.types import MarkerType
|
|
||||||
from application.system import makedirs
|
|
||||||
-from collections import MutableSet, deque
|
|
||||||
+from collections.abc import MutableSet
|
|
||||||
+from collections import deque
|
|
||||||
from datetime import datetime, timedelta
|
|
||||||
from itertools import count
|
|
||||||
from lxml import etree, html
|
|
||||||
diff --git a/blink/sessions.py b/blink/sessions.py
|
|
||||||
index 9805515..9928831 100644
|
|
||||||
--- a/blink/sessions.py
|
|
||||||
+++ b/blink/sessions.py
|
|
||||||
@@ -5094,13 +5094,13 @@ def showEvent(self, event):
|
|
||||||
total_width = width + window_frame_size.width()
|
|
||||||
total_height = height + window_frame_size.height()
|
|
||||||
|
|
||||||
- x = limit(screen_geometry.center().x() - total_width/2, min=available_geometry.left(), max=available_geometry.right()-total_width)
|
|
||||||
+ x = int(limit(screen_geometry.center().x() - total_width/2, min=available_geometry.left(), max=available_geometry.right()-total_width))
|
|
||||||
if slot is None:
|
|
||||||
y = -1
|
|
||||||
elif slot % 2 == 0:
|
|
||||||
- y = screen_geometry.center().y() + (slot-1)*total_height/2
|
|
||||||
+ y = int(screen_geometry.center().y() + (slot-1)*total_height/2)
|
|
||||||
else:
|
|
||||||
- y = screen_geometry.center().y() - slot*total_height/2
|
|
||||||
+ y = int(screen_geometry.center().y() - slot*total_height/2)
|
|
||||||
|
|
||||||
if available_geometry.top() <= y <= available_geometry.bottom() - total_height:
|
|
||||||
self.setGeometry(x, y, width, height)
|
|
||||||
diff --git a/blink/widgets/buttons.py b/blink/widgets/buttons.py
|
|
||||||
index c3b18bf..72aefd5 100644
|
|
||||||
--- a/blink/widgets/buttons.py
|
|
||||||
+++ b/blink/widgets/buttons.py
|
|
||||||
@@ -620,8 +620,8 @@ def pixmap(self, mode=QIcon.Normal, state=QIcon.Off):
|
|
||||||
return pixmap
|
|
||||||
|
|
||||||
size = max(pixmap.width(), pixmap.height())
|
|
||||||
- offset_x = (size - pixmap.width())/2
|
|
||||||
- offset_y = (size - pixmap.height())/2
|
|
||||||
+ offset_x = int((size - pixmap.width())/2)
|
|
||||||
+ offset_y = int((size - pixmap.height())/2)
|
|
||||||
|
|
||||||
new_pixmap = QPixmap(size, size)
|
|
||||||
new_pixmap.fill(Qt.transparent)
|
|
||||||
diff --git a/blink/widgets/lineedit.py b/blink/widgets/lineedit.py
|
|
||||||
index ee63e81..f03ac54 100644
|
|
||||||
--- a/blink/widgets/lineedit.py
|
|
||||||
+++ b/blink/widgets/lineedit.py
|
|
||||||
@@ -68,13 +68,13 @@ def _update_side_widget_locations(self):
|
|
||||||
text_rect.adjust(spacing, 0, -spacing, 0)
|
|
||||||
mid_height = text_rect.center().y() + 1 - (text_rect.height() % 2) # need -1 correction for odd heights -Dan
|
|
||||||
if self.left_layout.count() > 0:
|
|
||||||
- left_height = mid_height - self.left_widget.height()/2
|
|
||||||
+ left_height = int(mid_height - self.left_widget.height()/2)
|
|
||||||
left_width = self.left_widget.width()
|
|
||||||
if left_width == 0:
|
|
||||||
- left_height = mid_height - self.left_widget.sizeHint().height()/2
|
|
||||||
+ left_height = int(mid_height - self.left_widget.sizeHint().height()/2)
|
|
||||||
self.left_widget.move(text_rect.x(), left_height)
|
|
||||||
text_rect.setX(self.left_margin)
|
|
||||||
- text_rect.setY(mid_height - self.right_widget.sizeHint().height()/2.0)
|
|
||||||
+ text_rect.setY(int(mid_height - self.right_widget.sizeHint().height()/2.0))
|
|
||||||
text_rect.setHeight(self.right_widget.sizeHint().height())
|
|
||||||
self.right_widget.setGeometry(text_rect)
|
|
||||||
|
|
||||||
@@ -201,8 +201,8 @@ def __init__(self, parent=None, size=16):
|
|
||||||
def paintEvent(self, event):
|
|
||||||
painter = QPainter(self)
|
|
||||||
if self.icon is not None:
|
|
||||||
- x = (self.width() - self.icon.width()) / 2
|
|
||||||
- y = (self.height() - self.icon.height()) / 2
|
|
||||||
+ x = int((self.width() - self.icon.width()) / 2)
|
|
||||||
+ y = int((self.height() - self.icon.height()) / 2)
|
|
||||||
painter.drawPixmap(x, y, self.icon)
|
|
||||||
|
|
||||||
|
|
||||||
@@ -232,8 +232,8 @@ def paintEvent(self, event):
|
|
||||||
painter = QPainter(self)
|
|
||||||
icon = self.icon_pressed if self.isDown() else self.icon
|
|
||||||
if icon is not None:
|
|
||||||
- x = (self.width() - icon.width()) / 2
|
|
||||||
- y = (self.height() - icon.height()) / 2
|
|
||||||
+ x = int((self.width() - icon.width()) / 2)
|
|
||||||
+ y = int((self.height() - icon.height()) / 2)
|
|
||||||
painter.drawPixmap(x, y, icon)
|
|
||||||
else:
|
|
||||||
width = self.width()
|
|
||||||
diff --git a/blink/widgets/video.py b/blink/widgets/video.py
|
|
||||||
index eff4f7c..5ecab6a 100644
|
|
||||||
--- a/blink/widgets/video.py
|
|
||||||
+++ b/blink/widgets/video.py
|
|
||||||
@@ -56,7 +56,7 @@ def __init__(self, parent=None, framerate=None):
|
|
||||||
self.cursors.resize_bottom = QCursor(QIcon(Resources.get('icons/resize-bottom.svg')).pixmap(16), hotX=8, hotY=16)
|
|
||||||
if framerate is not None:
|
|
||||||
self._clock = QTimer()
|
|
||||||
- self._clock.setInterval(1000/framerate)
|
|
||||||
+ self._clock.setInterval(int(1000/framerate))
|
|
||||||
self._clock.timeout.connect(self.update)
|
|
||||||
else:
|
|
||||||
self._clock = None
|
|
@ -40,6 +40,7 @@ DEPENDENCIES="
|
|||||||
x11-dri/mesa
|
x11-dri/mesa
|
||||||
)
|
)
|
||||||
run:
|
run:
|
||||||
|
dev-lang/python:*[>3.5] [[ note = [ bin/compton-convgen.py ] ]]
|
||||||
x11-apps/xprop
|
x11-apps/xprop
|
||||||
x11-apps/xwininfo
|
x11-apps/xwininfo
|
||||||
"
|
"
|
||||||
@ -49,7 +50,6 @@ DEFAULT_SRC_INSTALL_EXTRA_DOCS=(
|
|||||||
)
|
)
|
||||||
|
|
||||||
MESON_SRC_CONFIGURE_PARAMS=(
|
MESON_SRC_CONFIGURE_PARAMS=(
|
||||||
"-Dcompton=false"
|
|
||||||
"-Dunittest=true"
|
"-Dunittest=true"
|
||||||
"-Dwith_docs=true"
|
"-Dwith_docs=true"
|
||||||
)
|
)
|
||||||
@ -59,6 +59,13 @@ MESON_SRC_CONFIGURE_OPTION_SWITCHES=(
|
|||||||
"opengl"
|
"opengl"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
meson_src_prepare
|
||||||
|
# don't install compat symlink
|
||||||
|
# this script is also broken
|
||||||
|
echo "#!/bin/sh" > meson/install.sh
|
||||||
|
}
|
||||||
|
|
||||||
src_install() {
|
src_install() {
|
||||||
meson_src_install
|
meson_src_install
|
||||||
option dbus && dodoc -r dbus-examples
|
option dbus && dodoc -r dbus-examples
|
@ -27,6 +27,7 @@ DEPENDENCIES="
|
|||||||
suggestion:
|
suggestion:
|
||||||
app-text/dvipng [[ note = [ equation plugin ] ]]
|
app-text/dvipng [[ note = [ equation plugin ] ]]
|
||||||
app-text/texlive-core [[ note = [ equation plugin ] ]]
|
app-text/texlive-core [[ note = [ equation plugin ] ]]
|
||||||
|
dev-libs/zeitgeist:2.0
|
||||||
dev-scm/bzr [[ note = [ version control plugin ] ]]
|
dev-scm/bzr [[ note = [ version control plugin ] ]]
|
||||||
media-gfx/graphviz [[ note = [ diagram editor plugin ] ]]
|
media-gfx/graphviz [[ note = [ diagram editor plugin ] ]]
|
||||||
media-gfx/ImageMagick [[ note = [ screenshot plugin ] ]]
|
media-gfx/ImageMagick [[ note = [ screenshot plugin ] ]]
|
Loading…
Reference in New Issue
Block a user