[arch-commits] Commit in blender/repos (5 files)
Date: Friday, December 18, 2020 @ 01:04:25
Author: svenstaro
Revision: 778374
archrelease: copy trunk to community-staging-x86_64
Added:
blender/repos/community-staging-x86_64/
blender/repos/community-staging-x86_64/D8063-cuda11.diff
(from rev 778373, blender/trunk/D8063-cuda11.diff)
blender/repos/community-staging-x86_64/PKGBUILD
(from rev 778373, blender/trunk/PKGBUILD)
blender/repos/community-staging-x86_64/cuda11.patch
(from rev 778373, blender/trunk/cuda11.patch)
blender/repos/community-staging-x86_64/embree.patch
(from rev 778373, blender/trunk/embree.patch)
---+
D8063-cuda11.diff | 105
PKGBUILD | 80 +++
cuda11.patch | 91 +
embree.patch | 43 +
4 files changed, 319 insertions(+)
Copied: blender/repos/community-staging-x86_64/D8063-cuda11.diff (from rev
778373, blender/trunk/D8063-cuda11.diff)
===
--- community-staging-x86_64/D8063-cuda11.diff (rev 0)
+++ community-staging-x86_64/D8063-cuda11.diff 2020-12-18 01:04:25 UTC (rev
778374)
@@ -0,0 +1,105 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -375,7 +375,7 @@
+ option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler
instead of nvcc" OFF)
+ option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful
on machines with limited RAM)" OFF)
+ mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
+-set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70
sm_75 CACHE STRING "CUDA architectures to build binaries for")
++set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70
sm_75 sm_80 CACHE STRING "CUDA architectures to build binaries for")
+ mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+ unset(PLATFORM_DEFAULT)
+ option(WITH_CYCLES_LOGGING "Build Cycles with logging support" ON)
+diff --git a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
+--- a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
+@@ -52,7 +52,7 @@
+ set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUDA_BINARIES ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE)
+-set(CYCLES_CUDA_BINARIES_ARCH
sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75 CACHE STRING "" FORCE)
++set(CYCLES_CUDA_BINARIES_ARCH
sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;sm_80 CACHE STRING ""
FORCE)
+ set(WITH_CYCLES_DEVICE_OPTIX ON CACHE BOOL "" FORCE)
+
+ # platform dependent options
+diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
+--- a/intern/cycles/CMakeLists.txt
b/intern/cycles/CMakeLists.txt
+@@ -313,7 +313,7 @@
+ set(MAX_MSVC 1910)
+ elseif(${CUDA_VERSION} EQUAL "9.1")
+ set(MAX_MSVC 1911)
+-elseif(${CUDA_VERSION} LESS "11.0")
++elseif(${CUDA_VERSION} LESS "12.0")
+ set(MAX_MSVC 1999)
+ endif()
+ if(NOT MSVC_VERSION LESS ${MAX_MSVC} OR CMAKE_C_COMPILER_ID MATCHES
"Clang")
+diff --git a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
+--- a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
+@@ -485,8 +485,12 @@
+ foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
+ if(${arch} MATCHES "sm_2.")
+ message(STATUS "CUDA binaries for ${arch} are no longer supported,
skipped.")
++elseif(${arch} MATCHES "sm_30" AND ${CUDA_VERSION} GREATER 109)
++ message(STATUS "CUDA binaries for ${arch} are no longer supported,
skipped.")
+ elseif(${arch} MATCHES "sm_7." AND ${CUDA_VERSION} LESS 100)
+ message(STATUS "CUDA binaries for ${arch} require CUDA 10.0+, skipped.")
++elseif(${arch} MATCHES "sm_8." AND ${CUDA_VERSION} LESS 110)
++ message(STATUS "CUDA binaries for ${arch} require CUDA 11.0+, skipped.")
+ else()
+ # Compile regular kernel
+ CYCLES_CUDA_KERNEL_ADD(${arch} ${prev_arch} filter ""
"${cuda_filter_sources}" FALSE)
+@@ -525,6 +529,11 @@
+ set(cuda_flags ${cuda_flags}
+ -D __KERNEL_DEBUG__)
+ endif()
++set(OPTIX_TARGET 30)
++if(${CUDA_VERSION} GREATER 109) #cuda 11
++ set(OPTIX_TARGET 52)
++endif()
++
+ if(WITH_CYCLES_CUBIN_COMPILER)
+
+ # Needed to find libnvrtc-builtins.so. Can't do it from inside
+@@ -536,7 +545,6 @@
+ set(CUBIN_CC_ENV ${CMAKE_COMMAND}
+ -E env LD_LIBRARY_PATH="${CUDA_TOOLKIT_ROOT_DIR}/lib64")
+ endif()
+-
+ add_custom_command(
+ OUTPUT ${output}
+ DEPENDS
+@@ -551,7 +559,7 @@
+ ${SRC_UTIL_HEADERS}
+ COMMAND ${CUBIN_CC_ENV}
+ "$"
+--target 30
++-target
[arch-commits] Commit in blender/repos (5 files)
Date: Saturday, December 12, 2020 @ 15:50:35
Author: felixonmars
Revision: 773347
archrelease: copy trunk to community-staging-x86_64
Added:
blender/repos/community-staging-x86_64/
blender/repos/community-staging-x86_64/D8063-cuda11.diff
(from rev 773346, blender/trunk/D8063-cuda11.diff)
blender/repos/community-staging-x86_64/PKGBUILD
(from rev 773346, blender/trunk/PKGBUILD)
blender/repos/community-staging-x86_64/cuda11.patch
(from rev 773346, blender/trunk/cuda11.patch)
blender/repos/community-staging-x86_64/embree.patch
(from rev 773346, blender/trunk/embree.patch)
---+
D8063-cuda11.diff | 105
PKGBUILD | 80 +++
cuda11.patch | 91 +
embree.patch | 43 +
4 files changed, 319 insertions(+)
Copied: blender/repos/community-staging-x86_64/D8063-cuda11.diff (from rev
773346, blender/trunk/D8063-cuda11.diff)
===
--- community-staging-x86_64/D8063-cuda11.diff (rev 0)
+++ community-staging-x86_64/D8063-cuda11.diff 2020-12-12 15:50:35 UTC (rev
773347)
@@ -0,0 +1,105 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -375,7 +375,7 @@
+ option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler
instead of nvcc" OFF)
+ option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful
on machines with limited RAM)" OFF)
+ mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
+-set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70
sm_75 CACHE STRING "CUDA architectures to build binaries for")
++set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70
sm_75 sm_80 CACHE STRING "CUDA architectures to build binaries for")
+ mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+ unset(PLATFORM_DEFAULT)
+ option(WITH_CYCLES_LOGGING "Build Cycles with logging support" ON)
+diff --git a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
+--- a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
+@@ -52,7 +52,7 @@
+ set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUDA_BINARIES ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE)
+-set(CYCLES_CUDA_BINARIES_ARCH
sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75 CACHE STRING "" FORCE)
++set(CYCLES_CUDA_BINARIES_ARCH
sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;sm_80 CACHE STRING ""
FORCE)
+ set(WITH_CYCLES_DEVICE_OPTIX ON CACHE BOOL "" FORCE)
+
+ # platform dependent options
+diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
+--- a/intern/cycles/CMakeLists.txt
b/intern/cycles/CMakeLists.txt
+@@ -313,7 +313,7 @@
+ set(MAX_MSVC 1910)
+ elseif(${CUDA_VERSION} EQUAL "9.1")
+ set(MAX_MSVC 1911)
+-elseif(${CUDA_VERSION} LESS "11.0")
++elseif(${CUDA_VERSION} LESS "12.0")
+ set(MAX_MSVC 1999)
+ endif()
+ if(NOT MSVC_VERSION LESS ${MAX_MSVC} OR CMAKE_C_COMPILER_ID MATCHES
"Clang")
+diff --git a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
+--- a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
+@@ -485,8 +485,12 @@
+ foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
+ if(${arch} MATCHES "sm_2.")
+ message(STATUS "CUDA binaries for ${arch} are no longer supported,
skipped.")
++elseif(${arch} MATCHES "sm_30" AND ${CUDA_VERSION} GREATER 109)
++ message(STATUS "CUDA binaries for ${arch} are no longer supported,
skipped.")
+ elseif(${arch} MATCHES "sm_7." AND ${CUDA_VERSION} LESS 100)
+ message(STATUS "CUDA binaries for ${arch} require CUDA 10.0+, skipped.")
++elseif(${arch} MATCHES "sm_8." AND ${CUDA_VERSION} LESS 110)
++ message(STATUS "CUDA binaries for ${arch} require CUDA 11.0+, skipped.")
+ else()
+ # Compile regular kernel
+ CYCLES_CUDA_KERNEL_ADD(${arch} ${prev_arch} filter ""
"${cuda_filter_sources}" FALSE)
+@@ -525,6 +529,11 @@
+ set(cuda_flags ${cuda_flags}
+ -D __KERNEL_DEBUG__)
+ endif()
++set(OPTIX_TARGET 30)
++if(${CUDA_VERSION} GREATER 109) #cuda 11
++ set(OPTIX_TARGET 52)
++endif()
++
+ if(WITH_CYCLES_CUBIN_COMPILER)
+
+ # Needed to find libnvrtc-builtins.so. Can't do it from inside
+@@ -536,7 +545,6 @@
+ set(CUBIN_CC_ENV ${CMAKE_COMMAND}
+ -E env LD_LIBRARY_PATH="${CUDA_TOOLKIT_ROOT_DIR}/lib64")
+ endif()
+-
+ add_custom_command(
+ OUTPUT ${output}
+ DEPENDS
+@@ -551,7 +559,7 @@
+ ${SRC_UTIL_HEADERS}
+ COMMAND ${CUBIN_CC_ENV}
+ "$"
+--target 30
++-target
[arch-commits] Commit in blender/repos (5 files)
Date: Sunday, December 6, 2020 @ 21:55:18
Author: felixonmars
Revision: 771221
archrelease: copy trunk to community-staging-x86_64
Added:
blender/repos/community-staging-x86_64/
blender/repos/community-staging-x86_64/D8063-cuda11.diff
(from rev 771220, blender/trunk/D8063-cuda11.diff)
blender/repos/community-staging-x86_64/PKGBUILD
(from rev 771220, blender/trunk/PKGBUILD)
blender/repos/community-staging-x86_64/cuda11.patch
(from rev 771220, blender/trunk/cuda11.patch)
blender/repos/community-staging-x86_64/embree.patch
(from rev 771220, blender/trunk/embree.patch)
---+
D8063-cuda11.diff | 105
PKGBUILD | 80 +++
cuda11.patch | 91 +
embree.patch | 43 +
4 files changed, 319 insertions(+)
Copied: blender/repos/community-staging-x86_64/D8063-cuda11.diff (from rev
771220, blender/trunk/D8063-cuda11.diff)
===
--- community-staging-x86_64/D8063-cuda11.diff (rev 0)
+++ community-staging-x86_64/D8063-cuda11.diff 2020-12-06 21:55:18 UTC (rev
771221)
@@ -0,0 +1,105 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -375,7 +375,7 @@
+ option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler
instead of nvcc" OFF)
+ option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful
on machines with limited RAM)" OFF)
+ mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
+-set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70
sm_75 CACHE STRING "CUDA architectures to build binaries for")
++set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70
sm_75 sm_80 CACHE STRING "CUDA architectures to build binaries for")
+ mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+ unset(PLATFORM_DEFAULT)
+ option(WITH_CYCLES_LOGGING "Build Cycles with logging support" ON)
+diff --git a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
+--- a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
+@@ -52,7 +52,7 @@
+ set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUDA_BINARIES ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE)
+-set(CYCLES_CUDA_BINARIES_ARCH
sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75 CACHE STRING "" FORCE)
++set(CYCLES_CUDA_BINARIES_ARCH
sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;sm_80 CACHE STRING ""
FORCE)
+ set(WITH_CYCLES_DEVICE_OPTIX ON CACHE BOOL "" FORCE)
+
+ # platform dependent options
+diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
+--- a/intern/cycles/CMakeLists.txt
b/intern/cycles/CMakeLists.txt
+@@ -313,7 +313,7 @@
+ set(MAX_MSVC 1910)
+ elseif(${CUDA_VERSION} EQUAL "9.1")
+ set(MAX_MSVC 1911)
+-elseif(${CUDA_VERSION} LESS "11.0")
++elseif(${CUDA_VERSION} LESS "12.0")
+ set(MAX_MSVC 1999)
+ endif()
+ if(NOT MSVC_VERSION LESS ${MAX_MSVC} OR CMAKE_C_COMPILER_ID MATCHES
"Clang")
+diff --git a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
+--- a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
+@@ -485,8 +485,12 @@
+ foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
+ if(${arch} MATCHES "sm_2.")
+ message(STATUS "CUDA binaries for ${arch} are no longer supported,
skipped.")
++elseif(${arch} MATCHES "sm_30" AND ${CUDA_VERSION} GREATER 109)
++ message(STATUS "CUDA binaries for ${arch} are no longer supported,
skipped.")
+ elseif(${arch} MATCHES "sm_7." AND ${CUDA_VERSION} LESS 100)
+ message(STATUS "CUDA binaries for ${arch} require CUDA 10.0+, skipped.")
++elseif(${arch} MATCHES "sm_8." AND ${CUDA_VERSION} LESS 110)
++ message(STATUS "CUDA binaries for ${arch} require CUDA 11.0+, skipped.")
+ else()
+ # Compile regular kernel
+ CYCLES_CUDA_KERNEL_ADD(${arch} ${prev_arch} filter ""
"${cuda_filter_sources}" FALSE)
+@@ -525,6 +529,11 @@
+ set(cuda_flags ${cuda_flags}
+ -D __KERNEL_DEBUG__)
+ endif()
++set(OPTIX_TARGET 30)
++if(${CUDA_VERSION} GREATER 109) #cuda 11
++ set(OPTIX_TARGET 52)
++endif()
++
+ if(WITH_CYCLES_CUBIN_COMPILER)
+
+ # Needed to find libnvrtc-builtins.so. Can't do it from inside
+@@ -536,7 +545,6 @@
+ set(CUBIN_CC_ENV ${CMAKE_COMMAND}
+ -E env LD_LIBRARY_PATH="${CUDA_TOOLKIT_ROOT_DIR}/lib64")
+ endif()
+-
+ add_custom_command(
+ OUTPUT ${output}
+ DEPENDS
+@@ -551,7 +559,7 @@
+ ${SRC_UTIL_HEADERS}
+ COMMAND ${CUBIN_CC_ENV}
+ "$"
+--target 30
++-target
[arch-commits] Commit in blender/repos (5 files)
Date: Tuesday, September 29, 2020 @ 00:33:07
Author: svenstaro
Revision: 713596
archrelease: copy trunk to community-staging-x86_64
Added:
blender/repos/community-staging-x86_64/
blender/repos/community-staging-x86_64/D8063-cuda11.diff
(from rev 713595, blender/trunk/D8063-cuda11.diff)
blender/repos/community-staging-x86_64/PKGBUILD
(from rev 713595, blender/trunk/PKGBUILD)
blender/repos/community-staging-x86_64/cuda11.patch
(from rev 713595, blender/trunk/cuda11.patch)
blender/repos/community-staging-x86_64/embree.patch
(from rev 713595, blender/trunk/embree.patch)
---+
D8063-cuda11.diff | 105
PKGBUILD | 86 ++
cuda11.patch | 91 +
embree.patch | 43 +
4 files changed, 325 insertions(+)
Copied: blender/repos/community-staging-x86_64/D8063-cuda11.diff (from rev
713595, blender/trunk/D8063-cuda11.diff)
===
--- community-staging-x86_64/D8063-cuda11.diff (rev 0)
+++ community-staging-x86_64/D8063-cuda11.diff 2020-09-29 00:33:07 UTC (rev
713596)
@@ -0,0 +1,105 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -375,7 +375,7 @@
+ option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler
instead of nvcc" OFF)
+ option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful
on machines with limited RAM)" OFF)
+ mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
+-set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70
sm_75 CACHE STRING "CUDA architectures to build binaries for")
++set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70
sm_75 sm_80 CACHE STRING "CUDA architectures to build binaries for")
+ mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+ unset(PLATFORM_DEFAULT)
+ option(WITH_CYCLES_LOGGING "Build Cycles with logging support" ON)
+diff --git a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
+--- a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
+@@ -52,7 +52,7 @@
+ set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUDA_BINARIES ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE)
+-set(CYCLES_CUDA_BINARIES_ARCH
sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75 CACHE STRING "" FORCE)
++set(CYCLES_CUDA_BINARIES_ARCH
sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;sm_80 CACHE STRING ""
FORCE)
+ set(WITH_CYCLES_DEVICE_OPTIX ON CACHE BOOL "" FORCE)
+
+ # platform dependent options
+diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
+--- a/intern/cycles/CMakeLists.txt
b/intern/cycles/CMakeLists.txt
+@@ -313,7 +313,7 @@
+ set(MAX_MSVC 1910)
+ elseif(${CUDA_VERSION} EQUAL "9.1")
+ set(MAX_MSVC 1911)
+-elseif(${CUDA_VERSION} LESS "11.0")
++elseif(${CUDA_VERSION} LESS "12.0")
+ set(MAX_MSVC 1999)
+ endif()
+ if(NOT MSVC_VERSION LESS ${MAX_MSVC} OR CMAKE_C_COMPILER_ID MATCHES
"Clang")
+diff --git a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
+--- a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
+@@ -485,8 +485,12 @@
+ foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
+ if(${arch} MATCHES "sm_2.")
+ message(STATUS "CUDA binaries for ${arch} are no longer supported,
skipped.")
++elseif(${arch} MATCHES "sm_30" AND ${CUDA_VERSION} GREATER 109)
++ message(STATUS "CUDA binaries for ${arch} are no longer supported,
skipped.")
+ elseif(${arch} MATCHES "sm_7." AND ${CUDA_VERSION} LESS 100)
+ message(STATUS "CUDA binaries for ${arch} require CUDA 10.0+, skipped.")
++elseif(${arch} MATCHES "sm_8." AND ${CUDA_VERSION} LESS 110)
++ message(STATUS "CUDA binaries for ${arch} require CUDA 11.0+, skipped.")
+ else()
+ # Compile regular kernel
+ CYCLES_CUDA_KERNEL_ADD(${arch} ${prev_arch} filter ""
"${cuda_filter_sources}" FALSE)
+@@ -525,6 +529,11 @@
+ set(cuda_flags ${cuda_flags}
+ -D __KERNEL_DEBUG__)
+ endif()
++set(OPTIX_TARGET 30)
++if(${CUDA_VERSION} GREATER 109) #cuda 11
++ set(OPTIX_TARGET 52)
++endif()
++
+ if(WITH_CYCLES_CUBIN_COMPILER)
+
+ # Needed to find libnvrtc-builtins.so. Can't do it from inside
+@@ -536,7 +545,6 @@
+ set(CUBIN_CC_ENV ${CMAKE_COMMAND}
+ -E env LD_LIBRARY_PATH="${CUDA_TOOLKIT_ROOT_DIR}/lib64")
+ endif()
+-
+ add_custom_command(
+ OUTPUT ${output}
+ DEPENDS
+@@ -551,7 +559,7 @@
+ ${SRC_UTIL_HEADERS}
+ COMMAND ${CUBIN_CC_ENV}
+ "$"
+--target 30
++-target
[arch-commits] Commit in blender/repos (5 files)
Date: Friday, September 4, 2020 @ 21:25:30
Author: svenstaro
Revision: 698653
archrelease: copy trunk to community-staging-x86_64
Added:
blender/repos/community-staging-x86_64/
blender/repos/community-staging-x86_64/D8063-cuda11.diff
(from rev 698652, blender/trunk/D8063-cuda11.diff)
blender/repos/community-staging-x86_64/PKGBUILD
(from rev 698652, blender/trunk/PKGBUILD)
blender/repos/community-staging-x86_64/cuda11.patch
(from rev 698652, blender/trunk/cuda11.patch)
blender/repos/community-staging-x86_64/embree.patch
(from rev 698652, blender/trunk/embree.patch)
---+
D8063-cuda11.diff | 105
PKGBUILD | 86 ++
cuda11.patch | 91 +
embree.patch | 43 +
4 files changed, 325 insertions(+)
Copied: blender/repos/community-staging-x86_64/D8063-cuda11.diff (from rev
698652, blender/trunk/D8063-cuda11.diff)
===
--- community-staging-x86_64/D8063-cuda11.diff (rev 0)
+++ community-staging-x86_64/D8063-cuda11.diff 2020-09-04 21:25:30 UTC (rev
698653)
@@ -0,0 +1,105 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -375,7 +375,7 @@
+ option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler
instead of nvcc" OFF)
+ option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful
on machines with limited RAM)" OFF)
+ mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
+-set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70
sm_75 CACHE STRING "CUDA architectures to build binaries for")
++set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70
sm_75 sm_80 CACHE STRING "CUDA architectures to build binaries for")
+ mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+ unset(PLATFORM_DEFAULT)
+ option(WITH_CYCLES_LOGGING "Build Cycles with logging support" ON)
+diff --git a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
+--- a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
+@@ -52,7 +52,7 @@
+ set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUDA_BINARIES ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE)
+-set(CYCLES_CUDA_BINARIES_ARCH
sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75 CACHE STRING "" FORCE)
++set(CYCLES_CUDA_BINARIES_ARCH
sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;sm_80 CACHE STRING ""
FORCE)
+ set(WITH_CYCLES_DEVICE_OPTIX ON CACHE BOOL "" FORCE)
+
+ # platform dependent options
+diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
+--- a/intern/cycles/CMakeLists.txt
b/intern/cycles/CMakeLists.txt
+@@ -313,7 +313,7 @@
+ set(MAX_MSVC 1910)
+ elseif(${CUDA_VERSION} EQUAL "9.1")
+ set(MAX_MSVC 1911)
+-elseif(${CUDA_VERSION} LESS "11.0")
++elseif(${CUDA_VERSION} LESS "12.0")
+ set(MAX_MSVC 1999)
+ endif()
+ if(NOT MSVC_VERSION LESS ${MAX_MSVC} OR CMAKE_C_COMPILER_ID MATCHES
"Clang")
+diff --git a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
+--- a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
+@@ -485,8 +485,12 @@
+ foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
+ if(${arch} MATCHES "sm_2.")
+ message(STATUS "CUDA binaries for ${arch} are no longer supported,
skipped.")
++elseif(${arch} MATCHES "sm_30" AND ${CUDA_VERSION} GREATER 109)
++ message(STATUS "CUDA binaries for ${arch} are no longer supported,
skipped.")
+ elseif(${arch} MATCHES "sm_7." AND ${CUDA_VERSION} LESS 100)
+ message(STATUS "CUDA binaries for ${arch} require CUDA 10.0+, skipped.")
++elseif(${arch} MATCHES "sm_8." AND ${CUDA_VERSION} LESS 110)
++ message(STATUS "CUDA binaries for ${arch} require CUDA 11.0+, skipped.")
+ else()
+ # Compile regular kernel
+ CYCLES_CUDA_KERNEL_ADD(${arch} ${prev_arch} filter ""
"${cuda_filter_sources}" FALSE)
+@@ -525,6 +529,11 @@
+ set(cuda_flags ${cuda_flags}
+ -D __KERNEL_DEBUG__)
+ endif()
++set(OPTIX_TARGET 30)
++if(${CUDA_VERSION} GREATER 109) #cuda 11
++ set(OPTIX_TARGET 52)
++endif()
++
+ if(WITH_CYCLES_CUBIN_COMPILER)
+
+ # Needed to find libnvrtc-builtins.so. Can't do it from inside
+@@ -536,7 +545,6 @@
+ set(CUBIN_CC_ENV ${CMAKE_COMMAND}
+ -E env LD_LIBRARY_PATH="${CUDA_TOOLKIT_ROOT_DIR}/lib64")
+ endif()
+-
+ add_custom_command(
+ OUTPUT ${output}
+ DEPENDS
+@@ -551,7 +559,7 @@
+ ${SRC_UTIL_HEADERS}
+ COMMAND ${CUBIN_CC_ENV}
+ "$"
+--target 30
++-target
[arch-commits] Commit in blender/repos (5 files)
Date: Saturday, November 12, 2011 @ 12:15:05
Author: ibiru
Revision: 142615
db-move: moved blender from [testing] to [extra] (i686)
Added:
blender/repos/extra-i686/PKGBUILD
(from rev 142606, blender/repos/testing-i686/PKGBUILD)
blender/repos/extra-i686/blender.install
(from rev 142606, blender/repos/testing-i686/blender.install)
Deleted:
blender/repos/extra-i686/PKGBUILD
blender/repos/extra-i686/blender.install
blender/repos/testing-i686/
-+
PKGBUILD| 186 +++---
blender.install | 26 +++
2 files changed, 106 insertions(+), 106 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-12 17:15:04 UTC (rev 142614)
+++ extra-i686/PKGBUILD 2011-11-12 17:15:05 UTC (rev 142615)
@@ -1,93 +0,0 @@
-# $Id$
-# Contributor: John Sowiak j...@archlinux.org
-# Maintainer: tobias tob...@archlinux.org
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only, we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.60a
-pkgrel=1
-epoch=3
-pkgdesc=A fully integrated 3D graphics creation suite
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://www.blender.org;
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
- 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
- 'freetype2' 'openal' 'libsndfile' 'ffmpeg')
-makedepends=('cmake')
-install=blender.install
-if [ $_svn = false ]; then
- source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
- md5sums=('cc7e4a56c9f7941c33c958ff0338f9a6')
-else
- source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
- md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD mksource
-mksource() {
- [[ -x /usr/bin/svn ]] || (echo svn not found. Install subversion.
return 1)
- _svnver=38016
- _svntrunk=https://svn.blender.org/svnroot/bf-blender/trunk/blender;
- _svnmod=$pkgname-$pkgver
- mkdir ${pkgname}-$pkgver
- pushd ${pkgname}-$pkgver
- svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
- find . -depth -type d -name .svn -exec rm -rf {} \;
- tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
- popd
-}
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- mkdir build
- cd build
-
- [[ $CARCH == i686 ]] ENABLESSE2=-DSUPPORT_SSE2_BUILD:BOOL=OFF
-
- cmake .. \
--DCMAKE_INSTALL_PREFIX:PATH=/usr \
--DCMAKE_BUILD_TYPE:STRING=Release \
--DWITH_INSTALL_PORTABLE:BOOL=OFF \
--DWITH_PYTHON_INSTALL:BOOL=OFF \
--DWITH_OPENCOLLADA:BOOL=OFF \
--DWITH_GAMEENGINE:BOOL=ON \
--DWITH_PLAYER:BOOL=ON \
--DWITH_BUILTIN_GLEW:BOOL=OFF \
--DWITH_CODEC_FFMPEG:BOOL=ON \
--DWITH_CODEC_SNDFILE:BOOL=ON \
--DPYTHON_VERSION:STRING=3.2 \
--DPYTHON_LIBPATH:STRING=/usr/lib \
--DPYTHON_LIBRARY:STRING=python3.2mu \
--DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-$ENABLESSE2
-
- make $MAKEFLAGS
-
- cp -rf $srcdir/${pkgname}-$pkgver/release/plugins/* \
-$srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/
- cd $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi
- chmod 755 bmake
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver/build
- make DESTDIR=${pkgdir} install
- python -m compileall ${pkgdir}/usr/share/blender
-
-# install plugins
- install -d -m755
$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
Copied: blender/repos/extra-i686/PKGBUILD (from rev 142606,
blender/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-12 17:15:05 UTC (rev 142615)
@@ -0,0 +1,93 @@
+# $Id$
+# Contributor: John Sowiak j...@archlinux.org
+# Maintainer: tobias tob...@archlinux.org
+
+# Apparently, the blender guys refuse to release source tarballs for
+# intermediate releases that deal mainly with binaries but incorporate tiny
+# minor changes from svn. Since I'm sick and tired of the urges of users that
+# look for release numbers only, we make a messy PKGBUILD that can checkout svn
+# release if necessary.
+
+#_svn=true
+_svn=false
+
+pkgname=blender
+pkgver=2.60a
+pkgrel=2
+epoch=3
+pkgdesc=A fully integrated 3D graphics creation suite
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://www.blender.org;
+depends=('libpng' 'libtiff' 'openexr'
[arch-commits] Commit in blender/repos (5 files)
Date: Saturday, November 12, 2011 @ 12:15:07
Author: ibiru
Revision: 142616
db-move: moved blender from [testing] to [extra] (x86_64)
Added:
blender/repos/extra-x86_64/PKGBUILD
(from rev 142606, blender/repos/testing-x86_64/PKGBUILD)
blender/repos/extra-x86_64/blender.install
(from rev 142606, blender/repos/testing-x86_64/blender.install)
Deleted:
blender/repos/extra-x86_64/PKGBUILD
blender/repos/extra-x86_64/blender.install
blender/repos/testing-x86_64/
-+
PKGBUILD| 186 +++---
blender.install | 26 +++
2 files changed, 106 insertions(+), 106 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2011-11-12 17:15:05 UTC (rev 142615)
+++ extra-x86_64/PKGBUILD 2011-11-12 17:15:07 UTC (rev 142616)
@@ -1,93 +0,0 @@
-# $Id$
-# Contributor: John Sowiak j...@archlinux.org
-# Maintainer: tobias tob...@archlinux.org
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only, we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.60a
-pkgrel=1
-epoch=3
-pkgdesc=A fully integrated 3D graphics creation suite
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://www.blender.org;
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
- 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
- 'freetype2' 'openal' 'libsndfile' 'ffmpeg')
-makedepends=('cmake')
-install=blender.install
-if [ $_svn = false ]; then
- source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
- md5sums=('cc7e4a56c9f7941c33c958ff0338f9a6')
-else
- source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
- md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD mksource
-mksource() {
- [[ -x /usr/bin/svn ]] || (echo svn not found. Install subversion.
return 1)
- _svnver=38016
- _svntrunk=https://svn.blender.org/svnroot/bf-blender/trunk/blender;
- _svnmod=$pkgname-$pkgver
- mkdir ${pkgname}-$pkgver
- pushd ${pkgname}-$pkgver
- svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
- find . -depth -type d -name .svn -exec rm -rf {} \;
- tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
- popd
-}
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- mkdir build
- cd build
-
- [[ $CARCH == i686 ]] ENABLESSE2=-DSUPPORT_SSE2_BUILD:BOOL=OFF
-
- cmake .. \
--DCMAKE_INSTALL_PREFIX:PATH=/usr \
--DCMAKE_BUILD_TYPE:STRING=Release \
--DWITH_INSTALL_PORTABLE:BOOL=OFF \
--DWITH_PYTHON_INSTALL:BOOL=OFF \
--DWITH_OPENCOLLADA:BOOL=OFF \
--DWITH_GAMEENGINE:BOOL=ON \
--DWITH_PLAYER:BOOL=ON \
--DWITH_BUILTIN_GLEW:BOOL=OFF \
--DWITH_CODEC_FFMPEG:BOOL=ON \
--DWITH_CODEC_SNDFILE:BOOL=ON \
--DPYTHON_VERSION:STRING=3.2 \
--DPYTHON_LIBPATH:STRING=/usr/lib \
--DPYTHON_LIBRARY:STRING=python3.2mu \
--DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-$ENABLESSE2
-
- make $MAKEFLAGS
-
- cp -rf $srcdir/${pkgname}-$pkgver/release/plugins/* \
-$srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/
- cd $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi
- chmod 755 bmake
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver/build
- make DESTDIR=${pkgdir} install
- python -m compileall ${pkgdir}/usr/share/blender
-
-# install plugins
- install -d -m755
$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
Copied: blender/repos/extra-x86_64/PKGBUILD (from rev 142606,
blender/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-11-12 17:15:07 UTC (rev 142616)
@@ -0,0 +1,93 @@
+# $Id$
+# Contributor: John Sowiak j...@archlinux.org
+# Maintainer: tobias tob...@archlinux.org
+
+# Apparently, the blender guys refuse to release source tarballs for
+# intermediate releases that deal mainly with binaries but incorporate tiny
+# minor changes from svn. Since I'm sick and tired of the urges of users that
+# look for release numbers only, we make a messy PKGBUILD that can checkout svn
+# release if necessary.
+
+#_svn=true
+_svn=false
+
+pkgname=blender
+pkgver=2.60a
+pkgrel=2
+epoch=3
+pkgdesc=A fully integrated 3D graphics creation suite
+arch=('i686' 'x86_64')
+license=('GPL')
[arch-commits] Commit in blender/repos (5 files)
Date: Saturday, September 24, 2011 @ 12:46:29
Author: stephane
Revision: 138475
db-move: moved blender from [testing] to [extra] (i686)
Added:
blender/repos/extra-i686/PKGBUILD
(from rev 138474, blender/repos/testing-i686/PKGBUILD)
blender/repos/extra-i686/blender.install
(from rev 138474, blender/repos/testing-i686/blender.install)
Deleted:
blender/repos/extra-i686/PKGBUILD
blender/repos/extra-i686/blender.install
blender/repos/testing-i686/
-+
PKGBUILD| 184 +++---
blender.install | 34 -
2 files changed, 109 insertions(+), 109 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-09-24 15:33:33 UTC (rev 138474)
+++ extra-i686/PKGBUILD 2011-09-24 16:46:29 UTC (rev 138475)
@@ -1,92 +0,0 @@
-# $Id$
-# Contributor: John Sowiak j...@archlinux.org
-# Maintainer: tobias tob...@archlinux.org
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only, we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.59
-pkgrel=2
-epoch=2
-pkgdesc=A fully integrated 3D graphics creation suite
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://www.blender.org;
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
- 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
- 'freetype2' 'openal' 'libsamplerate' 'ffmpeg')
-makedepends=('cmake') # 'subversion'
-install=blender.install
-if [ $_svn = false ]; then
- source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
- md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe')
-else
- source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
- md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD mksource
-mksource() {
- _svnver=38016
- _svntrunk=https://svn.blender.org/svnroot/bf-blender/trunk/blender;
- _svnmod=$pkgname-$pkgver
- mkdir ${pkgname}-$pkgver
- pushd ${pkgname}-$pkgver
- svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
- find . -depth -type d -name .svn -exec rm -rf {} \;
- tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
- popd
-}
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- mkdir build
- cd build
-
- [[ $CARCH == i686 ]] ENABLESSE2=-DSUPPORT_SSE2_BUILD:BOOL=OFF
-
- cmake .. \
--DCMAKE_INSTALL_PREFIX:PATH=/usr \
--DCMAKE_BUILD_TYPE:STRING=Release \
--DWITH_INSTALL_PORTABLE:BOOL=OFF \
--DWITH_PYTHON_INSTALL:BOOL=OFF \
--DWITH_OPENCOLLADA:BOOL=OFF \
--DWITH_GAMEENGINE:BOOL=ON \
--DWITH_PLAYER:BOOL=ON \
--DWITH_BUILTIN_GLEW:BOOL=OFF \
--DWITH_CODEC_FFMPEG:BOOL=ON \
--DWITH_CODEC_SNDFILE:BOOL=ON \
--DPYTHON_VERSION:STRING=3.2 \
--DPYTHON_LIBPATH:STRING=/usr/lib \
--DPYTHON_LIBRARY:STRING=python3.2mu \
--DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-$ENABLESSE2
-
- make $MAKEFLAGS
-
- cp -rf $srcdir/${pkgname}-$pkgver/release/plugins/* \
-$srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/
- cd $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi
- chmod 755 bmake
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver/build
- make DESTDIR=${pkgdir} install
- python -m compileall ${pkgdir}/usr/share/blender
-
-# install plugins
- install -d -m755
$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
Copied: blender/repos/extra-i686/PKGBUILD (from rev 138474,
blender/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-24 16:46:29 UTC (rev 138475)
@@ -0,0 +1,92 @@
+# $Id$
+# Contributor: John Sowiak j...@archlinux.org
+# Maintainer: tobias tob...@archlinux.org
+
+# Apparently, the blender guys refuse to release source tarballs for
+# intermediate releases that deal mainly with binaries but incorporate tiny
+# minor changes from svn. Since I'm sick and tired of the urges of users that
+# look for release numbers only, we make a messy PKGBUILD that can checkout svn
+# release if necessary.
+
+#_svn=true
+_svn=false
+
+pkgname=blender
+pkgver=2.59
+pkgrel=3
+epoch=2
+pkgdesc=A fully integrated 3D graphics creation suite
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://www.blender.org;
+depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
+ 'shared-mime-info'
[arch-commits] Commit in blender/repos (5 files)
Date: Saturday, September 24, 2011 @ 12:46:30
Author: stephane
Revision: 138476
db-move: moved blender from [testing] to [extra] (x86_64)
Added:
blender/repos/extra-x86_64/PKGBUILD
(from rev 138474, blender/repos/testing-x86_64/PKGBUILD)
blender/repos/extra-x86_64/blender.install
(from rev 138474, blender/repos/testing-x86_64/blender.install)
Deleted:
blender/repos/extra-x86_64/PKGBUILD
blender/repos/extra-x86_64/blender.install
blender/repos/testing-x86_64/
-+
PKGBUILD| 184 +++---
blender.install | 34 -
2 files changed, 109 insertions(+), 109 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2011-09-24 16:46:29 UTC (rev 138475)
+++ extra-x86_64/PKGBUILD 2011-09-24 16:46:30 UTC (rev 138476)
@@ -1,92 +0,0 @@
-# $Id$
-# Contributor: John Sowiak j...@archlinux.org
-# Maintainer: tobias tob...@archlinux.org
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only, we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.59
-pkgrel=2
-epoch=2
-pkgdesc=A fully integrated 3D graphics creation suite
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://www.blender.org;
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
- 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
- 'freetype2' 'openal' 'libsamplerate' 'ffmpeg')
-makedepends=('cmake') # 'subversion'
-install=blender.install
-if [ $_svn = false ]; then
- source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
- md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe')
-else
- source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
- md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD mksource
-mksource() {
- _svnver=38016
- _svntrunk=https://svn.blender.org/svnroot/bf-blender/trunk/blender;
- _svnmod=$pkgname-$pkgver
- mkdir ${pkgname}-$pkgver
- pushd ${pkgname}-$pkgver
- svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
- find . -depth -type d -name .svn -exec rm -rf {} \;
- tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
- popd
-}
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- mkdir build
- cd build
-
- [[ $CARCH == i686 ]] ENABLESSE2=-DSUPPORT_SSE2_BUILD:BOOL=OFF
-
- cmake .. \
--DCMAKE_INSTALL_PREFIX:PATH=/usr \
--DCMAKE_BUILD_TYPE:STRING=Release \
--DWITH_INSTALL_PORTABLE:BOOL=OFF \
--DWITH_PYTHON_INSTALL:BOOL=OFF \
--DWITH_OPENCOLLADA:BOOL=OFF \
--DWITH_GAMEENGINE:BOOL=ON \
--DWITH_PLAYER:BOOL=ON \
--DWITH_BUILTIN_GLEW:BOOL=OFF \
--DWITH_CODEC_FFMPEG:BOOL=ON \
--DWITH_CODEC_SNDFILE:BOOL=ON \
--DPYTHON_VERSION:STRING=3.2 \
--DPYTHON_LIBPATH:STRING=/usr/lib \
--DPYTHON_LIBRARY:STRING=python3.2mu \
--DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-$ENABLESSE2
-
- make $MAKEFLAGS
-
- cp -rf $srcdir/${pkgname}-$pkgver/release/plugins/* \
-$srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/
- cd $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi
- chmod 755 bmake
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver/build
- make DESTDIR=${pkgdir} install
- python -m compileall ${pkgdir}/usr/share/blender
-
-# install plugins
- install -d -m755
$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
Copied: blender/repos/extra-x86_64/PKGBUILD (from rev 138474,
blender/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-24 16:46:30 UTC (rev 138476)
@@ -0,0 +1,92 @@
+# $Id$
+# Contributor: John Sowiak j...@archlinux.org
+# Maintainer: tobias tob...@archlinux.org
+
+# Apparently, the blender guys refuse to release source tarballs for
+# intermediate releases that deal mainly with binaries but incorporate tiny
+# minor changes from svn. Since I'm sick and tired of the urges of users that
+# look for release numbers only, we make a messy PKGBUILD that can checkout svn
+# release if necessary.
+
+#_svn=true
+_svn=false
+
+pkgname=blender
+pkgver=2.59
+pkgrel=3
+epoch=2
+pkgdesc=A fully integrated 3D graphics creation suite
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://www.blender.org;
+depends=('libpng' 'libtiff' 'openexr' 'python'
[arch-commits] Commit in blender/repos (5 files)
Date: Saturday, September 10, 2011 @ 06:56:26
Author: pierre
Revision: 137651
db-move: moved blender from [staging] to [extra] (i686)
Added:
blender/repos/extra-i686/PKGBUILD
(from rev 137650, blender/repos/staging-i686/PKGBUILD)
blender/repos/extra-i686/blender.install
(from rev 137650, blender/repos/staging-i686/blender.install)
Deleted:
blender/repos/extra-i686/PKGBUILD
blender/repos/extra-i686/blender.install
blender/repos/staging-i686/
-+
PKGBUILD| 184 +++---
blender.install | 34 -
2 files changed, 109 insertions(+), 109 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-09-10 10:16:37 UTC (rev 137650)
+++ extra-i686/PKGBUILD 2011-09-10 10:56:26 UTC (rev 137651)
@@ -1,92 +0,0 @@
-# $Id$
-# Contributor: John Sowiak j...@archlinux.org
-# Maintainer: tobias tob...@archlinux.org
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only, we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.59
-pkgrel=1
-epoch=2
-pkgdesc=A fully integrated 3D graphics creation suite
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://www.blender.org;
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
- 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
- 'freetype2' 'openal' 'libsamplerate' 'ffmpeg')
-makedepends=('cmake') # 'subversion'
-install=blender.install
-if [ $_svn = false ]; then
- source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
- md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe')
-else
- source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
- md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD mksource
-mksource() {
- _svnver=38016
- _svntrunk=https://svn.blender.org/svnroot/bf-blender/trunk/blender;
- _svnmod=$pkgname-$pkgver
- mkdir ${pkgname}-$pkgver
- pushd ${pkgname}-$pkgver
- svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
- find . -depth -type d -name .svn -exec rm -rf {} \;
- tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
- popd
-}
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- mkdir build
- cd build
-
- [[ $CARCH == i686 ]] ENABLESSE2=-DSUPPORT_SSE2_BUILD:BOOL=OFF
-
- cmake .. \
--DCMAKE_INSTALL_PREFIX:PATH=/usr \
--DCMAKE_BUILD_TYPE:STRING=Release \
--DWITH_INSTALL_PORTABLE:BOOL=OFF \
--DWITH_PYTHON_INSTALL:BOOL=OFF \
--DWITH_OPENCOLLADA:BOOL=OFF \
--DWITH_GAMEENGINE:BOOL=ON \
--DWITH_PLAYER:BOOL=ON \
--DWITH_BUILTIN_GLEW:BOOL=OFF \
--DWITH_CODEC_FFMPEG:BOOL=ON \
--DWITH_CODEC_SNDFILE:BOOL=ON \
--DPYTHON_VERSION:STRING=3.2 \
--DPYTHON_LIBPATH:STRING=/usr/lib \
--DPYTHON_LIBRARY:STRING=python3.2mu \
--DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-$ENABLESSE2
-
- make $MAKEFLAGS
-
- cp -rf $srcdir/${pkgname}-$pkgver/release/plugins/* \
-$srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/
- cd $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi
- chmod 755 bmake
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver/build
- make DESTDIR=${pkgdir} install
- python -m compileall ${pkgdir}/usr/share/blender
-
-# install plugins
- install -d -m755
$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
Copied: blender/repos/extra-i686/PKGBUILD (from rev 137650,
blender/repos/staging-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-10 10:56:26 UTC (rev 137651)
@@ -0,0 +1,92 @@
+# $Id$
+# Contributor: John Sowiak j...@archlinux.org
+# Maintainer: tobias tob...@archlinux.org
+
+# Apparently, the blender guys refuse to release source tarballs for
+# intermediate releases that deal mainly with binaries but incorporate tiny
+# minor changes from svn. Since I'm sick and tired of the urges of users that
+# look for release numbers only, we make a messy PKGBUILD that can checkout svn
+# release if necessary.
+
+#_svn=true
+_svn=false
+
+pkgname=blender
+pkgver=2.59
+pkgrel=2
+epoch=2
+pkgdesc=A fully integrated 3D graphics creation suite
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://www.blender.org;
+depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
+ 'shared-mime-info'
[arch-commits] Commit in blender/repos (5 files)
Date: Saturday, September 10, 2011 @ 06:56:27
Author: pierre
Revision: 137652
db-move: moved blender from [staging] to [extra] (x86_64)
Added:
blender/repos/extra-x86_64/PKGBUILD
(from rev 137650, blender/repos/staging-x86_64/PKGBUILD)
blender/repos/extra-x86_64/blender.install
(from rev 137650, blender/repos/staging-x86_64/blender.install)
Deleted:
blender/repos/extra-x86_64/PKGBUILD
blender/repos/extra-x86_64/blender.install
blender/repos/staging-x86_64/
-+
PKGBUILD| 184 +++---
blender.install | 34 -
2 files changed, 109 insertions(+), 109 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2011-09-10 10:56:26 UTC (rev 137651)
+++ extra-x86_64/PKGBUILD 2011-09-10 10:56:27 UTC (rev 137652)
@@ -1,92 +0,0 @@
-# $Id$
-# Contributor: John Sowiak j...@archlinux.org
-# Maintainer: tobias tob...@archlinux.org
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only, we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.59
-pkgrel=1
-epoch=2
-pkgdesc=A fully integrated 3D graphics creation suite
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://www.blender.org;
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
- 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
- 'freetype2' 'openal' 'libsamplerate' 'ffmpeg')
-makedepends=('cmake') # 'subversion'
-install=blender.install
-if [ $_svn = false ]; then
- source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
- md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe')
-else
- source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
- md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD mksource
-mksource() {
- _svnver=38016
- _svntrunk=https://svn.blender.org/svnroot/bf-blender/trunk/blender;
- _svnmod=$pkgname-$pkgver
- mkdir ${pkgname}-$pkgver
- pushd ${pkgname}-$pkgver
- svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
- find . -depth -type d -name .svn -exec rm -rf {} \;
- tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
- popd
-}
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- mkdir build
- cd build
-
- [[ $CARCH == i686 ]] ENABLESSE2=-DSUPPORT_SSE2_BUILD:BOOL=OFF
-
- cmake .. \
--DCMAKE_INSTALL_PREFIX:PATH=/usr \
--DCMAKE_BUILD_TYPE:STRING=Release \
--DWITH_INSTALL_PORTABLE:BOOL=OFF \
--DWITH_PYTHON_INSTALL:BOOL=OFF \
--DWITH_OPENCOLLADA:BOOL=OFF \
--DWITH_GAMEENGINE:BOOL=ON \
--DWITH_PLAYER:BOOL=ON \
--DWITH_BUILTIN_GLEW:BOOL=OFF \
--DWITH_CODEC_FFMPEG:BOOL=ON \
--DWITH_CODEC_SNDFILE:BOOL=ON \
--DPYTHON_VERSION:STRING=3.2 \
--DPYTHON_LIBPATH:STRING=/usr/lib \
--DPYTHON_LIBRARY:STRING=python3.2mu \
--DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-$ENABLESSE2
-
- make $MAKEFLAGS
-
- cp -rf $srcdir/${pkgname}-$pkgver/release/plugins/* \
-$srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/
- cd $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi
- chmod 755 bmake
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver/build
- make DESTDIR=${pkgdir} install
- python -m compileall ${pkgdir}/usr/share/blender
-
-# install plugins
- install -d -m755
$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
Copied: blender/repos/extra-x86_64/PKGBUILD (from rev 137650,
blender/repos/staging-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-10 10:56:27 UTC (rev 137652)
@@ -0,0 +1,92 @@
+# $Id$
+# Contributor: John Sowiak j...@archlinux.org
+# Maintainer: tobias tob...@archlinux.org
+
+# Apparently, the blender guys refuse to release source tarballs for
+# intermediate releases that deal mainly with binaries but incorporate tiny
+# minor changes from svn. Since I'm sick and tired of the urges of users that
+# look for release numbers only, we make a messy PKGBUILD that can checkout svn
+# release if necessary.
+
+#_svn=true
+_svn=false
+
+pkgname=blender
+pkgver=2.59
+pkgrel=2
+epoch=2
+pkgdesc=A fully integrated 3D graphics creation suite
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://www.blender.org;
+depends=('libpng' 'libtiff' 'openexr' 'python'
[arch-commits] Commit in blender/repos (5 files)
Date: Monday, August 15, 2011 @ 17:13:24
Author: eric
Revision: 135565
db-move: moved blender from [testing] to [extra] (i686)
Added:
blender/repos/extra-i686/PKGBUILD
(from rev 135564, blender/repos/testing-i686/PKGBUILD)
blender/repos/extra-i686/blender.install
(from rev 135564, blender/repos/testing-i686/blender.install)
Deleted:
blender/repos/extra-i686/PKGBUILD
blender/repos/extra-i686/blender.install
blender/repos/testing-i686/
-+
PKGBUILD| 184 +++---
blender.install | 34 -
2 files changed, 109 insertions(+), 109 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-08-15 21:08:52 UTC (rev 135564)
+++ extra-i686/PKGBUILD 2011-08-15 21:13:24 UTC (rev 135565)
@@ -1,92 +0,0 @@
-# $Id$
-# Contributor: John Sowiak j...@archlinux.org
-# Maintainer: tobias tob...@archlinux.org
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-_svn=true
-#_svn=false
-
-pkgname=blender
-pkgver=2.58a
-pkgrel=1
-epoch=2
-pkgdesc=A fully integrated 3D graphics creation suite
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://www.blender.org;
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
- 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
- 'freetype2' 'openal' 'libsamplerate' 'ffmpeg')
-makedepends=('cmake') # 'subversion'
-install=blender.install
-if [ $_svn = false ]; then
- source=(http://download.blender.org/source/$pkgname-$pkgver.tgz)
- md5sums=('04a0d43ff27aa0abf14ca559f6a6bf67')
-else
- source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
- md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD mksource
-mksource() {
- _svnver=38016
- _svntrunk=https://svn.blender.org/svnroot/bf-blender/trunk/blender;
- _svnmod=$pkgname-$pkgver
- mkdir ${pkgname}-$pkgver
- pushd ${pkgname}-$pkgver
- svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
- find . -depth -type d -name .svn -exec rm -rf {} \;
- tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
- popd
-}
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- mkdir build
- cd build
-
- [[ $CARCH == i686 ]] ENABLESSE2=-DSUPPORT_SSE2_BUILD:BOOL=OFF
-
- cmake .. \
--DCMAKE_INSTALL_PREFIX:PATH=/usr \
--DCMAKE_BUILD_TYPE:STRING=Release \
--DWITH_INSTALL_PORTABLE:BOOL=OFF \
--DWITH_PYTHON_INSTALL:BOOL=OFF \
--DWITH_OPENCOLLADA:BOOL=OFF \
--DWITH_GAMEENGINE:BOOL=ON \
--DWITH_PLAYER:BOOL=ON \
--DWITH_BUILTIN_GLEW:BOOL=OFF \
--DWITH_CODEC_FFMPEG:BOOL=ON \
--DWITH_CODEC_SNDFILE:BOOL=ON \
--DPYTHON_VERSION:STRING=3.2 \
--DPYTHON_LIBPATH:STRING=/usr/lib \
--DPYTHON_LIBRARY:STRING=python3.2mu \
--DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-$ENABLESSE2
-
- make $MAKEFLAGS
-
- cp -rf $srcdir/${pkgname}-$pkgver/release/plugins/* \
-$srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/
- cd $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi
- chmod 755 bmake
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver/build
- make DESTDIR=${pkgdir} install
- python -m compileall ${pkgdir}/usr/share/blender
-
-# install plugins
- install -d -m755
$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
Copied: blender/repos/extra-i686/PKGBUILD (from rev 135564,
blender/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-08-15 21:13:24 UTC (rev 135565)
@@ -0,0 +1,92 @@
+# $Id$
+# Contributor: John Sowiak j...@archlinux.org
+# Maintainer: tobias tob...@archlinux.org
+
+# Apparently, the blender guys refuse to release source tarballs for
+# intermediate releases that deal mainly with binaries but incorporate tiny
+# minor changes from svn. Since I'm sick and tired of the urges of users that
+# look for release numbers only, we make a messy PKGBUILD that can checkout svn
+# release if necessary.
+
+#_svn=true
+_svn=false
+
+pkgname=blender
+pkgver=2.59
+pkgrel=1
+epoch=2
+pkgdesc=A fully integrated 3D graphics creation suite
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://www.blender.org;
+depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
+ 'shared-mime-info'
[arch-commits] Commit in blender/repos (5 files)
Date: Monday, August 15, 2011 @ 17:13:25
Author: eric
Revision: 135566
db-move: moved blender from [testing] to [extra] (x86_64)
Added:
blender/repos/extra-x86_64/PKGBUILD
(from rev 135564, blender/repos/testing-x86_64/PKGBUILD)
blender/repos/extra-x86_64/blender.install
(from rev 135564, blender/repos/testing-x86_64/blender.install)
Deleted:
blender/repos/extra-x86_64/PKGBUILD
blender/repos/extra-x86_64/blender.install
blender/repos/testing-x86_64/
-+
PKGBUILD| 184 +++---
blender.install | 34 -
2 files changed, 109 insertions(+), 109 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2011-08-15 21:13:24 UTC (rev 135565)
+++ extra-x86_64/PKGBUILD 2011-08-15 21:13:25 UTC (rev 135566)
@@ -1,92 +0,0 @@
-# $Id$
-# Contributor: John Sowiak j...@archlinux.org
-# Maintainer: tobias tob...@archlinux.org
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-_svn=true
-#_svn=false
-
-pkgname=blender
-pkgver=2.58a
-pkgrel=1
-epoch=2
-pkgdesc=A fully integrated 3D graphics creation suite
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://www.blender.org;
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
- 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
- 'freetype2' 'openal' 'libsamplerate' 'ffmpeg')
-makedepends=('cmake') # 'subversion'
-install=blender.install
-if [ $_svn = false ]; then
- source=(http://download.blender.org/source/$pkgname-$pkgver.tgz)
- md5sums=('04a0d43ff27aa0abf14ca559f6a6bf67')
-else
- source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
- md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD mksource
-mksource() {
- _svnver=38016
- _svntrunk=https://svn.blender.org/svnroot/bf-blender/trunk/blender;
- _svnmod=$pkgname-$pkgver
- mkdir ${pkgname}-$pkgver
- pushd ${pkgname}-$pkgver
- svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
- find . -depth -type d -name .svn -exec rm -rf {} \;
- tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
- popd
-}
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- mkdir build
- cd build
-
- [[ $CARCH == i686 ]] ENABLESSE2=-DSUPPORT_SSE2_BUILD:BOOL=OFF
-
- cmake .. \
--DCMAKE_INSTALL_PREFIX:PATH=/usr \
--DCMAKE_BUILD_TYPE:STRING=Release \
--DWITH_INSTALL_PORTABLE:BOOL=OFF \
--DWITH_PYTHON_INSTALL:BOOL=OFF \
--DWITH_OPENCOLLADA:BOOL=OFF \
--DWITH_GAMEENGINE:BOOL=ON \
--DWITH_PLAYER:BOOL=ON \
--DWITH_BUILTIN_GLEW:BOOL=OFF \
--DWITH_CODEC_FFMPEG:BOOL=ON \
--DWITH_CODEC_SNDFILE:BOOL=ON \
--DPYTHON_VERSION:STRING=3.2 \
--DPYTHON_LIBPATH:STRING=/usr/lib \
--DPYTHON_LIBRARY:STRING=python3.2mu \
--DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-$ENABLESSE2
-
- make $MAKEFLAGS
-
- cp -rf $srcdir/${pkgname}-$pkgver/release/plugins/* \
-$srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/
- cd $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi
- chmod 755 bmake
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver/build
- make DESTDIR=${pkgdir} install
- python -m compileall ${pkgdir}/usr/share/blender
-
-# install plugins
- install -d -m755
$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
- cp $srcdir/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-$pkgdir/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
Copied: blender/repos/extra-x86_64/PKGBUILD (from rev 135564,
blender/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-08-15 21:13:25 UTC (rev 135566)
@@ -0,0 +1,92 @@
+# $Id$
+# Contributor: John Sowiak j...@archlinux.org
+# Maintainer: tobias tob...@archlinux.org
+
+# Apparently, the blender guys refuse to release source tarballs for
+# intermediate releases that deal mainly with binaries but incorporate tiny
+# minor changes from svn. Since I'm sick and tired of the urges of users that
+# look for release numbers only, we make a messy PKGBUILD that can checkout svn
+# release if necessary.
+
+#_svn=true
+_svn=false
+
+pkgname=blender
+pkgver=2.59
+pkgrel=1
+epoch=2
+pkgdesc=A fully integrated 3D graphics creation suite
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://www.blender.org;
+depends=('libpng' 'libtiff' 'openexr' 'python'
