diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 67 | ||||
-rw-r--r-- | build.patch | 103 | ||||
-rw-r--r-- | install-UI-headers.patch | 13 |
4 files changed, 62 insertions, 127 deletions
@@ -1,6 +1,6 @@ pkgbase = seexpr-git pkgdesc = An embeddable expression evaluation engine (git version) - pkgver = 3.0.beta.2.r37.g176c8eb + pkgver = 3.0.beta.2.r76.gdb4cfca pkgrel = 1 url = http://www.disneyanimation.com/technology/seexpr.html arch = i686 @@ -14,9 +14,9 @@ pkgbase = seexpr-git provides = seexpr conflicts = seexpr source = git+https://github.com/wdas/SeExpr.git - source = build.patch + source = install-UI-headers.patch md5sums = SKIP - md5sums = d83afd628601603e8120ac7613526634 + md5sums = 4ca54b352f6aec08e7ef0e54e57d2e2d pkgname = seexpr-git @@ -1,46 +1,71 @@ # Maintainer: Alex Dahl <adahl1@umbc.edu> -pkgname=seexpr-git -pkgver=3.0.beta.2.r37.g176c8eb +pkgname=('seexpr-git' 'seexpr-git-doc') +pkgver=3.0.beta.2.r76.gdb4cfca pkgrel=1 pkgdesc="An embeddable expression evaluation engine (git version)" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://www.disneyanimation.com/technology/seexpr.html" -license=('custom') -optdepends=('llvm>=3.8.0: LLVM backend support' - 'python2-pyqt4: Editor support') -makedepends=('cmake>=2.4.6' 'git' 'python2-sip') +license=('custom:Apache') +depends=('python' 'qt4' 'boost-libs') +optdepends=('llvm-libs: LLVM backend support' + 'python-pyqt4: Editor support') +makedepends=('python-pyqt4' 'kdelibs' 'doxygen' 'glew' 'libpng' 'cmake>=2.4.6' 'git' 'python-sip' 'boost' 'llvm') provides=("${pkgname%-git}") conflicts=("${pkgname%-git}") source=('git+https://github.com/wdas/SeExpr.git' - 'build.patch') + 'install-UI-headers.patch') md5sums=('SKIP' - 'd83afd628601603e8120ac7613526634') - + '4ca54b352f6aec08e7ef0e54e57d2e2d') + +CMAKEFLAGS=( -DLLVM_ENABLE_EH=OFF + -DLLVM_ENABLE_LTO=OFF + -DLLVM_ENABLE_RTTI=ON + ) + pkgver() { cd "$srcdir/SeExpr" # Cutting off 'v' prefix that presents in the git tag git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } - + prepare() { - cd "$srcdir/SeExpr" - patch -p0 -i "../build.patch" - mkdir -p "$srcdir/SeExpr/src/SeExpr/generated" - touch "$srcdir/SeExpr/src/SeExpr/generated/ExprParser.tab.h" - touch "$srcdir/SeExpr/src/SeExpr/generated/ExprParser.cpp" + cd ${srcdir} +# llvm50 compatibility fix + sed -i 's/AttributeSet/AttributeList/' SeExpr/src/SeExpr/Evaluator.h + sed -i '/dump()/d' SeExpr/src/SeExpr/Evaluator.h +# install UI headers for appleseed + cd SeExpr + patch -Np1 -i ../install-UI-headers.patch } - + build() { cd "$srcdir/SeExpr" mkdir -p build cd build - cmake -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' .. + cmake ${CMAKEFLAGS[@]} -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' .. make } - -package() { + +package_seexpr-git() { cd "$srcdir/SeExpr/build" make DESTDIR="$pkgdir/" install + # remove doc + mkdir -p ${pkgdir}/../tmp/usr/share/ + mv ${pkgdir}/usr/share/doc ${pkgdir}/../tmp/usr/share/ # Copy custom Apache license - sudo install -D -m644 "../LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 "../LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } + +package_seexpr-git-doc() { +#reset defs + arch=('any') + depends=() + optdepends=() + provides=() + conflicts=() + + cd ${srcdir}/SeExpr/build + mkdir -p ${pkgdir}/usr/share/ + mv ${pkgdir}/../tmp/usr/share/doc ${pkgdir}/usr/share/ + install -D -m644 "../LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +}
\ No newline at end of file diff --git a/build.patch b/build.patch deleted file mode 100644 index a9d8dbd3922b..000000000000 --- a/build.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git CMakeLists.txt CMakeLists.txt -index 0e054ca..fe2b3f6 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -144,7 +144,7 @@ else() - - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g -std=c++11 -msse4.1") - if (NOT APPLE) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic -Wno-date-time") - else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-date-time") - endif() -diff --git src/build/build-info src/build/build-info -index de58622..1016417 100755 ---- src/build/build-info -+++ src/build/build-info -@@ -11,7 +11,7 @@ if 'MACOSX_DEPLOYMENT_TARGET' in os.environ: - from distutils import sysconfig as sc - - import sipconfig --from PyQt4 import pyqtconfig -+#from PyQt4 import pyqtconfig - - def main(): - parser = argparse.ArgumentParser() -@@ -56,8 +56,9 @@ def python_site(args): - - - def pyqt4_sip(args): -- pkg_cfg = pyqtconfig._pkg_config -- return pkg_cfg['pyqt_sip_dir'] -+ #pkg_cfg = pyqtconfig._pkg_config -+ #return pkg_cfg['pyqt_sip_dir'] -+ return os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt4') - - - def sip_inc(args): -diff --git src/py/CMakeLists.txt src/py/CMakeLists.txt -index a3552f9..c4beb8c 100644 ---- src/py/CMakeLists.txt -+++ src/py/CMakeLists.txt -@@ -25,7 +25,7 @@ if (USE_PYTHON) - IF (NOT DEFINED PYTHON_VERSION) - execute_process( - COMMAND -- python -c "import sys; print('%s.%s' % sys.version_info[:2])" -+ python2 -c "import sys; print('%s.%s' % sys.version_info[:2])" - OUTPUT_VARIABLE PYTHON_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - endif() -@@ -34,7 +34,7 @@ if (USE_PYTHON) - if (NOT DEFINED PYTHON_INCLUDE_DIR) - execute_process( - COMMAND -- sh -c "python-config --includes | sed -e s,-I,,g" -+ sh -c "python2-config --includes | sed -e s,-I,,g" - OUTPUT_VARIABLE PYTHON_INCLUDE_DIR - OUTPUT_STRIP_TRAILING_WHITESPACE) - separate_arguments(PYTHON_INCLUDE_DIR) -@@ -45,7 +45,7 @@ if (USE_PYTHON) - if (NOT DEFINED PYTHON_LIB_DIRS) - execute_process( - COMMAND -- sh -c "python-config --ldflags | tr ' ' '\\n' | grep ^-L | sed -e s,-L,, | tr '\\n' ' '" -+ sh -c "python2-config --ldflags | tr ' ' '\\n' | grep ^-L | sed -e s,-L,, | tr '\\n' ' '" - OUTPUT_VARIABLE PYTHON_LIB_DIRS - OUTPUT_STRIP_TRAILING_WHITESPACE) - if (NOT ${PYTHON_LIB_DIRS} STREQUAL "") -@@ -61,7 +61,7 @@ if (USE_PYTHON) - if (NOT DEFINED PYTHON_LIBRARIES) - execute_process( - COMMAND -- sh -c "python-config --ldflags | tr ' ' '\\n' | grep ^-l | sed -e s,-l,, | tr '\\n' ' '" -+ sh -c "python2-config --ldflags | tr ' ' '\\n' | grep ^-l | sed -e s,-l,, | tr '\\n' ' '" - OUTPUT_VARIABLE PYTHON_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE) - separate_arguments(PYTHON_LIBRARIES) - endif() - -diff --git src/ui/CMakeLists.txt src/ui/CMakeLists.txt -index d40c02e..b3a541e 100644 ---- src/ui/CMakeLists.txt -+++ src/ui/CMakeLists.txt -@@ -15,9 +15,11 @@ - - # Find python includes and libs. cmake doesn't seem to handle automatically - -+set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5 2.4) - find_package(PythonInterp) - find_package(PythonLibs) - -+if(PYTHONLIBS_FOUND) - macro(get_build_info NAME STORAGE) - execute_process( - COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/build/build-info ${NAME} -@@ -148,4 +150,5 @@ if(QT4_FOUND) - install(TARGETS expreditor2 DESTINATION ${CMAKE_INSTALL_PYTHON}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py - DESTINATION ${CMAKE_INSTALL_PYTHON}) --endif() -+endif(QT4_FOUND) -+endif(PYTHONLIBS_FOUND) -\ No newline at end of file diff --git a/install-UI-headers.patch b/install-UI-headers.patch new file mode 100644 index 000000000000..749362b9788e --- /dev/null +++ b/install-UI-headers.patch @@ -0,0 +1,13 @@ +diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt +index 9e978c9..ba4ef9c 100644 +--- a/src/ui/CMakeLists.txt ++++ b/src/ui/CMakeLists.txt +@@ -121,6 +121,8 @@ if(QT4_FOUND) + endif() + + install(TARGETS SeExpr2Editor DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION include/SeExpr2/UI ++ FILES_MATCHING PATTERN "*.h") + + # Setup header files + file(GLOB public_includes "*.h")
\ No newline at end of file |