sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (2bf6dd3cae0a36bd01984a7d3308fa8bcbb32903)
- From: Thomas Orgis <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (2bf6dd3cae0a36bd01984a7d3308fa8bcbb32903)
- Date: Wed, 19 Aug 2015 22:00:36 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
audio-creation/ardour4/DETAILS | 4
audio-creation/ardour4/HISTORY | 3
devel/llvm/HISTORY | 6
devel/llvm/PRE_BUILD | 4
devel/llvm/lldb-3.6.2-fix-shared-lib-build.patch | 332
++++++++++++++++++
devel/llvm/lldb-shared-libs.patch | 94 -----
devel/valgrind/HISTORY | 4
devel/valgrind/PRE_BUILD | 3
devel/valgrind/valgrind-3.10.1-linuxfromscratch.patch | 29 +
graphics/xsane/DETAILS | 4
graphics/xsane/HISTORY | 5
graphics/xsane/PRE_BUILD | 3
graphics/xsane/xsane-0.998-libpng.patch | 41 ++
libs/libva/HISTORY | 6
libs/libva/PRE_BUILD | 4
libs/libva/libva-1.6.0-no-wayland.patch | 22 +
video-libs/libtheora/HISTORY | 6
video-libs/libtheora/PRE_BUILD | 3
video-libs/libtheora/libtheora-1.1.1-libpng16.patch | 16
xorg-driver/xf86-video-nouveau/HISTORY | 4
xorg-driver/xf86-video-nouveau/PRE_BUILD | 3
xorg-driver/xf86-video-nouveau/no-glamor.patch | 18
22 files changed, 514 insertions(+), 100 deletions(-)
New commits:
commit 2bf6dd3cae0a36bd01984a7d3308fa8bcbb32903
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
xsane: version 0.999 and png 1.6 buildfix
commit 32c1c0b8bb6669199bf06e55ad14710e9ab7bb0b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
valgrind: make it build with current kernel and boost
commit 1429de94a626f8cd68915eaf3284506fecba559e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
nouveau: glamor-less future
commit 0c3061ae22ac96dd2a896b77b7def694534d824b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
llvm: fix lldb build again, presumably the next release has the fix, too
(and we should use autotools build anyway(
commit 644e22a52768fc909d8ff97f616afaa897e2b9b9
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
libva: fix build without wayland
commit 9564ea49a131edc82ab7a5189cdf0b2c9ba7aed1
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
libtheora: fix with libpng-1.6
commit b16dc0cd91a4ec68216e4cbf4f61c1acc7c47aab
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
ardour4: version 4.2.0
diff --git a/audio-creation/ardour4/DETAILS b/audio-creation/ardour4/DETAILS
index dcfffdc..7fefbac 100755
--- a/audio-creation/ardour4/DETAILS
+++ b/audio-creation/ardour4/DETAILS
@@ -1,11 +1,11 @@
SPELL=ardour4
SPELLX=Ardour
- VERSION=4.1.0
+ VERSION=4.2.0
SOURCE="${SPELLX}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://download.sourcemage.org/grimoire/distro/${SOURCE}
SOURCE_URL[1]=http://sourcemage.ru/mirror/$SOURCE
SOURCE_URL[2]=http://sobukus.de/ardour/$SOURCE
-
SOURCE_HASH=sha512:cf9381e831cdf317d5b313d5a7ab2238a29c4cbeddf5c40540e860987e43366c78ffa514b409a5460867fc4359d5cee5788a1520100711e3c22a7b18b92e0d61
+
SOURCE_HASH=sha512:3d464db6990168a9b14a6e78732905f1197539da6fc2a6bae39a221223b09a2974a4c5408f3a6d59c0289ee7d4bb11e430e5a0334c264d742c6100a09c4014c5
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE="http://ardour.org";
LICENSE[0]=GPLv2
diff --git a/audio-creation/ardour4/HISTORY b/audio-creation/ardour4/HISTORY
index 45ab061..9716828 100644
--- a/audio-creation/ardour4/HISTORY
+++ b/audio-creation/ardour4/HISTORY
@@ -1,3 +1,6 @@
+2015-08-15 Thomas Orgis <sobukus AT souremage.org>
+ * DETAILS: bump to 4.2
+
2015-06-26 Thomas Orgis <sobukus AT souremage.org>
* DETAILS: bump to 4.1
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 4ff43f5..02a2347 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,9 @@
+2015-08-18 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, lldb-3.6.2-fix-shared-lib-build.patch: Again fixup,
+ adapted from https://llvm.org/bugs/show_bug.cgi?id=21670 .
+ Is this a joke? Anyone laughing?
+ * lldb-shared-libs.patch: gone, got a new one now
+
2015-07-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.6.2
diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
index 22a9421..d8f8b97 100755
--- a/devel/llvm/PRE_BUILD
+++ b/devel/llvm/PRE_BUILD
@@ -20,7 +20,9 @@ if [[ "$LLVM_WITH_LLDB" == y ]]; then
unpack_file 7 &&
mv lldb-${VERSION}.src lldb &&
cd lldb &&
- patch -p1 < ${SPELL_DIRECTORY}/lldb-shared-libs.patch
+ # still not settled: https://llvm.org/bugs/show_bug.cgi?id=21670
+ # adapted for 3.6.2
+ patch -p1 < ${SPELL_DIRECTORY}/lldb-3.6.2-fix-shared-lib-build.patch
fi &&
# small cmake related fix for libffi
diff --git a/devel/llvm/lldb-3.6.2-fix-shared-lib-build.patch
b/devel/llvm/lldb-3.6.2-fix-shared-lib-build.patch
new file mode 100644
index 0000000..f0631cb
--- /dev/null
+++ b/devel/llvm/lldb-3.6.2-fix-shared-lib-build.patch
@@ -0,0 +1,332 @@
+diff -ruN lldb-3.6.2.src/cmake/LLDBDependencies.cmake
lldb-3.6.2.src.patched/cmake/LLDBDependencies.cmake
+--- lldb-3.6.2.src/cmake/LLDBDependencies.cmake 2015-06-22
18:43:42.000000000 +0200
++++ lldb-3.6.2.src.patched/cmake/LLDBDependencies.cmake 2015-08-19
01:37:54.659931842 +0200
+@@ -170,6 +170,7 @@
+ mcdisassembler
+ executionengine
+ option
++ support
+ )
+
+ if ( NOT LLDB_DISABLE_PYTHON )
+diff -ruN lldb-3.6.2.src/cmake/LLDBDependencies.cmake.orig
lldb-3.6.2.src.patched/cmake/LLDBDependencies.cmake.orig
+--- lldb-3.6.2.src/cmake/LLDBDependencies.cmake.orig 1970-01-01
01:00:00.000000000 +0100
++++ lldb-3.6.2.src.patched/cmake/LLDBDependencies.cmake.orig 2015-06-22
18:43:42.000000000 +0200
+@@ -0,0 +1,184 @@
++set( LLDB_USED_LIBS
++ lldbBreakpoint
++ lldbCommands
++ lldbDataFormatters
++ lldbHost
++ lldbCore
++ lldbExpression
++ lldbInterpreter
++ lldbSymbol
++ lldbTarget
++ lldbUtility
++
++ # Plugins
++ lldbPluginDisassemblerLLVM
++ lldbPluginSymbolFileDWARF
++ lldbPluginSymbolFileSymtab
++ lldbPluginDynamicLoaderStatic
++ lldbPluginDynamicLoaderPosixDYLD
++ lldbPluginDynamicLoaderHexagonDYLD
++
++ lldbPluginObjectFileMachO
++ lldbPluginObjectFileELF
++ lldbPluginObjectFileJIT
++ lldbPluginSymbolVendorELF
++ lldbPluginObjectContainerBSDArchive
++ lldbPluginObjectContainerMachOArchive
++ lldbPluginProcessGDBRemote
++ lldbPluginProcessMachCore
++ lldbPluginProcessUtility
++ lldbPluginPlatformGDB
++ lldbPluginPlatformFreeBSD
++ lldbPluginPlatformKalimba
++ lldbPluginPlatformLinux
++ lldbPluginPlatformPOSIX
++ lldbPluginPlatformWindows
++ lldbPluginObjectFileMachO
++ lldbPluginObjectContainerMachOArchive
++ lldbPluginObjectContainerBSDArchive
++ lldbPluginPlatformMacOSX
++ lldbPluginDynamicLoaderMacOSXDYLD
++ lldbPluginUnwindAssemblyInstEmulation
++ lldbPluginUnwindAssemblyX86
++ lldbPluginAppleObjCRuntime
++ lldbPluginCXXItaniumABI
++ lldbPluginABIMacOSX_arm
++ lldbPluginABIMacOSX_arm64
++ lldbPluginABIMacOSX_i386
++ lldbPluginABISysV_x86_64
++ lldbPluginABISysV_hexagon
++ lldbPluginABISysV_ppc
++ lldbPluginABISysV_ppc64
++ lldbPluginInstructionARM
++ lldbPluginInstructionARM64
++ lldbPluginObjectFilePECOFF
++ lldbPluginOSPython
++ lldbPluginMemoryHistoryASan
++ lldbPluginInstrumentationRuntimeAddressSanitizer
++ )
++
++# Need to export the API in the liblldb.dll for Windows
++# The lldbAPI source files are added directly in liblldb
++if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows" )
++ list(APPEND LLDB_USED_LIBS
++ lldbAPI
++ )
++endif ()
++
++# Windows-only libraries
++if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
++ list(APPEND LLDB_USED_LIBS
++ lldbPluginProcessWindows
++ lldbPluginProcessElfCore
++ lldbPluginJITLoaderGDB
++ Ws2_32
++ )
++endif ()
++
++# Linux-only libraries
++if ( CMAKE_SYSTEM_NAME MATCHES "Linux" )
++ list(APPEND LLDB_USED_LIBS
++ lldbPluginProcessLinux
++ lldbPluginProcessPOSIX
++ lldbPluginProcessElfCore
++ lldbPluginJITLoaderGDB
++ )
++endif ()
++
++# FreeBSD-only libraries
++if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" )
++ list(APPEND LLDB_USED_LIBS
++ lldbPluginProcessFreeBSD
++ lldbPluginProcessPOSIX
++ lldbPluginProcessElfCore
++ lldbPluginJITLoaderGDB
++ )
++endif ()
++
++# Darwin-only libraries
++if ( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
++ set(LLDB_VERS_GENERATED_FILE ${LLDB_BINARY_DIR}/source/LLDB_vers.c)
++ add_custom_command(OUTPUT ${LLDB_VERS_GENERATED_FILE}
++ COMMAND ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl
++ ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj liblldb_core
++ > ${LLDB_VERS_GENERATED_FILE})
++
++ set_source_files_properties(${LLDB_VERS_GENERATED_FILE} PROPERTIES
GENERATED 1)
++ list(APPEND LLDB_USED_LIBS
++ lldbPluginDynamicLoaderDarwinKernel
++ lldbPluginProcessMacOSXKernel
++ lldbPluginSymbolVendorMacOSX
++ lldbPluginSystemRuntimeMacOSX
++ lldbPluginProcessElfCore
++ lldbPluginJITLoaderGDB
++ )
++endif()
++
++set( CLANG_USED_LIBS
++ clangAnalysis
++ clangAST
++ clangBasic
++ clangCodeGen
++ clangDriver
++ clangEdit
++ clangFrontend
++ clangLex
++ clangParse
++ clangRewrite
++ clangRewriteFrontend
++ clangSema
++ clangSerialization
++ )
++
++set(LLDB_SYSTEM_LIBS)
++if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows" AND NOT __ANDROID_NDK__)
++ if (NOT LLDB_DISABLE_LIBEDIT)
++ list(APPEND LLDB_SYSTEM_LIBS edit)
++ endif()
++ if (NOT LLDB_DISABLE_CURSES)
++ list(APPEND LLDB_SYSTEM_LIBS panel ncurses)
++ endif()
++endif()
++# On FreeBSD backtrace() is provided by libexecinfo, not libc.
++if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
++ list(APPEND LLDB_SYSTEM_LIBS execinfo)
++endif()
++
++if (NOT LLDB_DISABLE_PYTHON AND NOT LLVM_BUILD_STATIC)
++ list(APPEND LLDB_SYSTEM_LIBS ${PYTHON_LIBRARIES})
++endif()
++
++list(APPEND LLDB_SYSTEM_LIBS ${system_libs})
++
++if (LLVM_BUILD_STATIC)
++ list(APPEND LLDB_SYSTEM_LIBS python2.7 z util termcap gpm ssl crypto bsd)
++endif()
++
++set( LLVM_LINK_COMPONENTS
++ ${LLVM_TARGETS_TO_BUILD}
++ interpreter
++ asmparser
++ bitreader
++ bitwriter
++ codegen
++ ipo
++ selectiondag
++ bitreader
++ mc
++ mcjit
++ core
++ mcdisassembler
++ executionengine
++ option
++ )
++
++if ( NOT LLDB_DISABLE_PYTHON )
++ set(LLDB_WRAP_PYTHON ${LLDB_BINARY_DIR}/scripts/LLDBWrapPython.cpp)
++
++ set_source_files_properties(${LLDB_WRAP_PYTHON} PROPERTIES GENERATED 1)
++ if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND
++ NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
++ set_property(SOURCE ${LLDB_WRAP_PYTHON}
++ APPEND_STRING PROPERTY COMPILE_FLAGS "
-Wno-sequence-point")
++ endif ()
++endif()
+diff -ruN lldb-3.6.2.src/source/CMakeLists.txt
lldb-3.6.2.src.patched/source/CMakeLists.txt
+--- lldb-3.6.2.src/source/CMakeLists.txt 2014-12-29 13:42:33.000000000
+0100
++++ lldb-3.6.2.src.patched/source/CMakeLists.txt 2015-08-19
01:37:54.659931842 +0200
+@@ -30,6 +30,10 @@
+ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows" )
+ add_subdirectory(API)
+ endif ()
++
++if (BUILD_SHARED_LIBS)
++ set(SHARED_LIBRARY 1)
++endif()
+ add_subdirectory(Breakpoint)
+ add_subdirectory(Commands)
+ add_subdirectory(Core)
+diff -ruN lldb-3.6.2.src/tools/lldb-gdbserver/CMakeLists.txt
lldb-3.6.2.src.patched/tools/lldb-gdbserver/CMakeLists.txt
+--- lldb-3.6.2.src/tools/lldb-gdbserver/CMakeLists.txt 2015-06-23
17:40:10.000000000 +0200
++++ lldb-3.6.2.src.patched/tools/lldb-gdbserver/CMakeLists.txt 2015-08-19
01:49:17.983969729 +0200
+@@ -16,28 +16,35 @@
+ include_directories(../../source)
+
+ include(../../cmake/LLDBDependencies.cmake)
+-
+-# have to include lldb and lldb-log files since those are not libraries and
llgs depends on them
+-add_lldb_executable(lldb-gdbserver
+- lldb-gdbserver.cpp
+- ../../source/lldb-log.cpp
+- ../../source/lldb.cpp
+- )
+-
+-# The Darwin linker doesn't understand --start-group/--end-group.
+-if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES
"Darwin")
+- target_link_libraries(lldb-gdbserver
+- -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)
+- target_link_libraries(lldb-gdbserver
+- -Wl,--start-group ${CLANG_USED_LIBS}
-Wl,--end-group)
+-else()
+- target_link_libraries(lldb-gdbserver ${LLDB_USED_LIBS})
++
++if ( BUILD_SHARED_LIBS )
++ add_lldb_executable(lldb-gdbserver
++ lldb-gdbserver.cpp
++ )
++
++ target_link_libraries(lldb-gdbserver liblldb)
++ else()
++
++ # have to include lldb and lldb-log files since those are not libraries
and llgs depends on them
++ add_lldb_executable(lldb-gdbserver
++ lldb-gdbserver.cpp
++ ../../source/lldb-log.cpp
++ ../../source/lldb.cpp
++ )
++
++ # The Darwin linker doesn't understand --start-group/--end-group.
++ if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND NOT "${CMAKE_SYSTEM_NAME}"
MATCHES "Darwin")
++ target_link_libraries(lldb-gdbserver
++ -Wl,--start-group ${LLDB_USED_LIBS}
-Wl,--end-group)
++ else()
++ target_link_libraries(lldb-gdbserver ${LLDB_USED_LIBS})
++ endif()
+ target_link_libraries(lldb-gdbserver ${CLANG_USED_LIBS})
+-endif()
+-llvm_config(lldb-gdbserver ${LLVM_LINK_COMPONENTS})
+-
+-target_link_libraries(lldb-gdbserver ${LLDB_SYSTEM_LIBS})
++ llvm_config(lldb-gdbserver ${LLVM_LINK_COMPONENTS})
+
++ target_link_libraries(lldb-gdbserver ${LLDB_SYSTEM_LIBS})
++endif()
++
+ set_target_properties(lldb-gdbserver PROPERTIES VERSION ${LLDB_VERSION})
+
+ install(TARGETS lldb-gdbserver
+diff -ruN lldb-3.6.2.src/tools/lldb-gdbserver/CMakeLists.txt.orig
lldb-3.6.2.src.patched/tools/lldb-gdbserver/CMakeLists.txt.orig
+--- lldb-3.6.2.src/tools/lldb-gdbserver/CMakeLists.txt.orig 1970-01-01
01:00:00.000000000 +0100
++++ lldb-3.6.2.src.patched/tools/lldb-gdbserver/CMakeLists.txt.orig
2015-08-19 01:37:54.659931842 +0200
+@@ -0,0 +1,44 @@
++set(LLVM_NO_RTTI 1)
++
++if ( CMAKE_SYSTEM_NAME MATCHES "Linux" )
++include_directories(
++ ../../source/Plugins/Process/Linux
++ ../../source/Plugins/Process/POSIX
++ )
++endif ()
++
++if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" )
++include_directories(
++ ../../source/Plugins/Process/FreeBSD
++ ../../source/Plugins/Process/POSIX
++ )
++endif ()
++include_directories(../../source)
++
++include(../../cmake/LLDBDependencies.cmake)
++
++# have to include lldb and lldb-log files since those are not libraries and
llgs depends on them
++add_lldb_executable(lldb-gdbserver
++ lldb-gdbserver.cpp
++ ../../source/lldb-log.cpp
++ ../../source/lldb.cpp
++ )
++
++# The Darwin linker doesn't understand --start-group/--end-group.
++if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES
"Darwin")
++ target_link_libraries(lldb-gdbserver
++ -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)
++ target_link_libraries(lldb-gdbserver
++ -Wl,--start-group ${CLANG_USED_LIBS}
-Wl,--end-group)
++else()
++ target_link_libraries(lldb-gdbserver ${LLDB_USED_LIBS})
++ target_link_libraries(lldb-gdbserver ${CLANG_USED_LIBS})
++endif()
++llvm_config(lldb-gdbserver ${LLVM_LINK_COMPONENTS})
++
++target_link_libraries(lldb-gdbserver ${LLDB_SYSTEM_LIBS})
++
++set_target_properties(lldb-gdbserver PROPERTIES VERSION ${LLDB_VERSION})
++
++install(TARGETS lldb-gdbserver
++ RUNTIME DESTINATION bin)
+diff -ruN lldb-3.6.2.src/tools/lldb-mi/CMakeLists.txt
lldb-3.6.2.src.patched/tools/lldb-mi/CMakeLists.txt
+--- lldb-3.6.2.src/tools/lldb-mi/CMakeLists.txt 2014-08-08
18:47:42.000000000 +0200
++++ lldb-3.6.2.src.patched/tools/lldb-mi/CMakeLists.txt 2015-08-19
01:37:54.659931842 +0200
+@@ -164,7 +164,7 @@
+ )
+ endif ()
+
+-target_link_libraries(lldb-mi liblldb)
++target_link_libraries(lldb-mi liblldb pthread)
+ # TODO: why isn't this done by add_lldb_executable?
+ #target_link_libraries(lldb-mi ${LLDB_USED_LIBS})
+ #llvm_config(lldb-mi ${LLVM_LINK_COMPONENTS})
diff --git a/devel/llvm/lldb-shared-libs.patch
b/devel/llvm/lldb-shared-libs.patch
deleted file mode 100644
index f267336..0000000
--- a/devel/llvm/lldb-shared-libs.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/cmake/LLDBDependencies.cmake b/cmake/LLDBDependencies.cmake
-index 9416a67..86c83d5 100644
---- a/cmake/LLDBDependencies.cmake
-+++ b/cmake/LLDBDependencies.cmake
-@@ -161,6 +161,7 @@ set( LLVM_LINK_COMPONENTS
- mcdisassembler
- executionengine
- option
-+ support
- )
-
- if ( NOT LLDB_DISABLE_PYTHON )
-diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index d551ebb..37ffb8f 100644
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -30,6 +30,10 @@ endif ()
- if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows" )
- add_subdirectory(API)
- endif ()
-+
-+if (BUILD_SHARED_LIBS)
-+ set(SHARED_LIBRARY 1)
-+endif()
- add_subdirectory(Breakpoint)
- add_subdirectory(Commands)
- add_subdirectory(Core)
-diff --git a/tools/lldb-gdbserver/CMakeLists.txt
b/tools/lldb-gdbserver/CMakeLists.txt
-index 1dc2e1c..e38e69d 100644
---- a/tools/lldb-gdbserver/CMakeLists.txt
-+++ b/tools/lldb-gdbserver/CMakeLists.txt
-@@ -17,26 +17,33 @@ include_directories(../../source)
-
- include(../../cmake/LLDBDependencies.cmake)
-
--# have to include lldb and lldb-log files since those are not libraries and
llgs depends on them
--add_lldb_executable(lldb-gdbserver
-- lldb-gdbserver.cpp
-- ../../source/lldb-log.cpp
-- ../../source/lldb.cpp
-- )
-+if ( BUILD_SHARED_LIBS )
-+ add_lldb_executable(lldb-gdbserver
-+ lldb-gdbserver.cpp
-+ )
-
--# The Darwin linker doesn't understand --start-group/--end-group.
--if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES
"Darwin")
-- target_link_libraries(lldb-gdbserver
-- -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)
-+ target_link_libraries(lldb-gdbserver liblldb)
- else()
-- target_link_libraries(lldb-gdbserver ${LLDB_USED_LIBS})
-+ # have to include lldb and lldb-log files since those are not libraries
and llgs depends on them
-+ add_lldb_executable(lldb-gdbserver
-+ lldb-gdbserver.cpp
-+ ../../source/lldb-log.cpp
-+ ../../source/lldb.cpp
-+ )
-+
-+ # The Darwin linker doesn't understand --start-group/--end-group.
-+ if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND NOT "${CMAKE_SYSTEM_NAME}"
MATCHES "Darwin")
-+ target_link_libraries(lldb-gdbserver
-+ -Wl,--start-group ${LLDB_USED_LIBS}
-Wl,--end-group)
-+ else()
-+ target_link_libraries(lldb-gdbserver ${LLDB_USED_LIBS})
-+ endif()
-+ target_link_libraries(lldb-gdbserver ${CLANG_USED_LIBS})
-+ llvm_config(lldb-gdbserver ${LLVM_LINK_COMPONENTS})
-+
-+ target_link_libraries(lldb-gdbserver ${LLDB_SYSTEM_LIBS})
- endif()
--target_link_libraries(lldb-gdbserver ${CLANG_USED_LIBS})
--llvm_config(lldb-gdbserver ${LLVM_LINK_COMPONENTS})
--
--target_link_libraries(lldb-gdbserver ${LLDB_SYSTEM_LIBS})
-
- set_target_properties(lldb-gdbserver PROPERTIES VERSION ${LLDB_VERSION})
--
- install(TARGETS lldb-gdbserver
- RUNTIME DESTINATION bin)
-diff --git a/tools/lldb-mi/CMakeLists.txt b/tools/lldb-mi/CMakeLists.txt
-index cc4347f..9bdca83 100644
---- a/tools/lldb-mi/CMakeLists.txt
-+++ b/tools/lldb-mi/CMakeLists.txt
-@@ -164,7 +164,7 @@ add_lldb_executable(lldb-mi
- )
- endif ()
-
--target_link_libraries(lldb-mi liblldb)
-+target_link_libraries(lldb-mi liblldb pthread)
- # TODO: why isn't this done by add_lldb_executable?
- #target_link_libraries(lldb-mi ${LLDB_USED_LIBS})
- #llvm_config(lldb-mi ${LLVM_LINK_COMPONENTS})
diff --git a/devel/valgrind/HISTORY b/devel/valgrind/HISTORY
index d7df2be..87a432f 100644
--- a/devel/valgrind/HISTORY
+++ b/devel/valgrind/HISTORY
@@ -1,3 +1,7 @@
+2015-08-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, valgrind-3.10.1-linuxfromscratch.patch:
+ patch from LFS to fix build with recent kernels and boost
+
2015-03-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.10.1
* PRE_BUILD: apply patch
diff --git a/devel/valgrind/PRE_BUILD b/devel/valgrind/PRE_BUILD
index 0d326db..4b6ef0f 100755
--- a/devel/valgrind/PRE_BUILD
+++ b/devel/valgrind/PRE_BUILD
@@ -1,7 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p1 < "$SPELL_DIRECTORY/glibc.patch" &&
+patch -p1 < "$SCRIPT_DIRECTORY/glibc.patch" &&
+patch -p0 < "$SCRIPT_DIRECTORY/valgrind-3.10.1-linuxfromscratch.patch" &&
if [[ $VALGRIND_BRANCH == "scm" ]]; then
NOCONFIGURE=Y ./autogen.sh
diff --git a/devel/valgrind/valgrind-3.10.1-linuxfromscratch.patch
b/devel/valgrind/valgrind-3.10.1-linuxfromscratch.patch
new file mode 100644
index 0000000..f35b1b2
--- /dev/null
+++ b/devel/valgrind/valgrind-3.10.1-linuxfromscratch.patch
@@ -0,0 +1,29 @@
+--- configure.ac.orig 2015-08-17 08:08:32.864173998 +0200
++++ configure.ac 2015-08-17 08:11:43.449189351 +0200
+@@ -303,7 +303,7 @@
+ kernel=`uname -r`
+
+ case "${kernel}" in
+- 2.6.*|3.*)
++ 2.6.*|3.*|4.*)
+ AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
+ AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using
Linux 2.6.x or Linux 3.x])
+ ;;
+@@ -2706,7 +2706,7 @@
+ safe_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="$mflag_primary"
+ safe_LIBS="$LIBS"
+-LIBS="-lboost_thread-mt -lboost_system-mt $LIBS"
++LIBS="-lboost_thread -lboost_system $LIBS"
+
+ AC_LINK_IFELSE([AC_LANG_SOURCE([
+ #include <boost/thread.hpp>
+@@ -2721,7 +2721,7 @@
+ [
+ ac_have_boost_1_35=yes
+ AC_SUBST([BOOST_CFLAGS], [])
+-AC_SUBST([BOOST_LIBS], ["-lboost_thread-mt -lboost_system-mt"])
++AC_SUBST([BOOST_LIBS], ["-lboost_thread -lboost_system"])
+ AC_MSG_RESULT([yes])
+ ], [
+ ac_have_boost_1_35=no
diff --git a/graphics/xsane/DETAILS b/graphics/xsane/DETAILS
index 997bce4..6e6a253 100755
--- a/graphics/xsane/DETAILS
+++ b/graphics/xsane/DETAILS
@@ -1,6 +1,6 @@
SPELL=xsane
- VERSION=0.998
-
SOURCE_HASH=sha512:8cf6f01e706175cb4df88effe13c0547624bd62b08f485118279a9bcde77b9a555f3148b24f3d6348157868f50bfa450f413a20a514b4f0218579b75f642fc04
+ VERSION=0.999
+
SOURCE_HASH=sha512:73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.xsane.org/download/$SOURCE
diff --git a/graphics/xsane/HISTORY b/graphics/xsane/HISTORY
index 955b6d0..6821db8 100644
--- a/graphics/xsane/HISTORY
+++ b/graphics/xsane/HISTORY
@@ -1,3 +1,8 @@
+2015-08-18 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 0.999
+ * xsane-0.998-libpng.patch, PRE_BUILD: png 1.5 (1.6)
+ build fix still needed for 0.999, pulled from Slackware
+
2010-11-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.998
diff --git a/graphics/xsane/PRE_BUILD b/graphics/xsane/PRE_BUILD
new file mode 100755
index 0000000..6849650
--- /dev/null
+++ b/graphics/xsane/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -Np1 < "$SCRIPT_DIRECTORY/xsane-0.998-libpng.patch"
diff --git a/graphics/xsane/xsane-0.998-libpng.patch
b/graphics/xsane/xsane-0.998-libpng.patch
new file mode 100644
index 0000000..c792c5a
--- /dev/null
+++ b/graphics/xsane/xsane-0.998-libpng.patch
@@ -0,0 +1,41 @@
+From bd29bb933cf80f397dd28286635da2aec58e6e6c Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils AT redhat.com>
+Date: Thu, 16 Aug 2012 11:26:54 +0200
+Subject: [PATCH] patch: libpng
+
+Squashed commit of the following:
+
+commit 9df6d60274c95b5081faf5b398aa27cde969c649
+Author: Nils Philippsen <nils AT redhat.com>
+Date: Mon Nov 21 13:50:38 2011 +0100
+
+ support libpng-1.5
+---
+ src/xsane-save.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/xsane-save.c b/src/xsane-save.c
+index 87ef685..5461bf1 100644
+--- a/src/xsane-save.c
++++ b/src/xsane-save.c
+@@ -4912,7 +4912,7 @@ int xsane_save_png(FILE *outfile, int compression,
FILE *imagefile, Image_info *
+ return -1; /* error */
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+ xsane_back_gtk_error(buf, TRUE);
+@@ -5102,7 +5102,7 @@ int xsane_save_png_16(FILE *outfile, int compression,
FILE *imagefile, Image_inf
+ return -1; /* error */
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+ xsane_back_gtk_error(buf, TRUE);
+--
+1.7.11.4
+
diff --git a/libs/libva/HISTORY b/libs/libva/HISTORY
index 83abaad..2ce4753 100644
--- a/libs/libva/HISTORY
+++ b/libs/libva/HISTORY
@@ -1,3 +1,9 @@
+2015-08-18 Thomas Orgis <sobukus AT sourcemage.org>
+ * libva-1.6.0-no-wayland.patch, PRE_BUILD: Here it is again!
+ A patch to save the day when you don't have Wayland. I cannot
+ believe that https://bugs.freedesktop.org/show_bug.cgi?id=79478
+ rots away without proper fix for over a year.
+
2015-08-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.0
diff --git a/libs/libva/PRE_BUILD b/libs/libva/PRE_BUILD
new file mode 100755
index 0000000..9ef2d0e
--- /dev/null
+++ b/libs/libva/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -Np1 < "$SCRIPT_DIRECTORY/libva-1.6.0-no-wayland.patch" &&
+autoreconf -iv
diff --git a/libs/libva/libva-1.6.0-no-wayland.patch
b/libs/libva/libva-1.6.0-no-wayland.patch
new file mode 100644
index 0000000..0d36c77
--- /dev/null
+++ b/libs/libva/libva-1.6.0-no-wayland.patch
@@ -0,0 +1,22 @@
+--- libva-1.6.0/configure.ac 2015-07-01 09:52:44.000000000 +0200
++++ libva-1.6.0.fixed/configure.ac 2015-08-18 11:17:17.481068815 +0200
+@@ -275,14 +275,15 @@
+ if test "$USE_WAYLAND" = "yes"; then
+ AC_DEFINE([HAVE_VA_WAYLAND], [1],
+ [Defined to 1 if VA/Wayland API is built])
++ m4_ifdef([WAYLAND_SCANNER_RULES],
++
[WAYLAND_SCANNER_RULES(['$(top_builddir)/va/wayland/protocol'])],
++ [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
++ else
++ AC_MSG_ERROR([Wayland selected but not found in system.])
+ fi
+ fi
+ AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
+
+-m4_ifdef([WAYLAND_SCANNER_RULES],
+- [WAYLAND_SCANNER_RULES(['$(top_builddir)/va/wayland/protocol'])],
+- [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
+-
+ pkgconfigdir=${libdir}/pkgconfig
+ AC_SUBST(pkgconfigdir)
+
diff --git a/video-libs/libtheora/HISTORY b/video-libs/libtheora/HISTORY
index 5b0b086..e0c9c81 100644
--- a/video-libs/libtheora/HISTORY
+++ b/video-libs/libtheora/HISTORY
@@ -1,3 +1,9 @@
+2015-08-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * libtheora-1.1.1-libpng16.patch, PRE_BUILD: Another
+ libpng-1.6 fix. I am sick the necessity for these
+ annoying tiny build fixes.
+ Keep your damn library interfaces stable, *****!
+
2010-10-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: updated unstable to 1.2.0alpha1, using tar.gz
now instead of tar.bz2
diff --git a/video-libs/libtheora/PRE_BUILD b/video-libs/libtheora/PRE_BUILD
new file mode 100755
index 0000000..9530139
--- /dev/null
+++ b/video-libs/libtheora/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -Np0 < "$SCRIPT_DIRECTORY/libtheora-1.1.1-libpng16.patch"
diff --git a/video-libs/libtheora/libtheora-1.1.1-libpng16.patch
b/video-libs/libtheora/libtheora-1.1.1-libpng16.patch
new file mode 100644
index 0000000..883cb91
--- /dev/null
+++ b/video-libs/libtheora/libtheora-1.1.1-libpng16.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/465450
+
+--- examples/png2theora.c
++++ examples/png2theora.c
+@@ -462,9 +462,9 @@
+ png_set_strip_alpha(png_ptr);
+
+ row_data = (png_bytep)png_malloc(png_ptr,
+- 3*height*width*png_sizeof(*row_data));
++ 3*height*width*sizeof(*row_data));
+ row_pointers = (png_bytep *)png_malloc(png_ptr,
+- height*png_sizeof(*row_pointers));
++ height*sizeof(*row_pointers));
+ for(y = 0; y < height; y++) {
+ row_pointers[y] = row_data + y*(3*width);
+ }
diff --git a/xorg-driver/xf86-video-nouveau/HISTORY
b/xorg-driver/xf86-video-nouveau/HISTORY
index f20a587..90c9240 100644
--- a/xorg-driver/xf86-video-nouveau/HISTORY
+++ b/xorg-driver/xf86-video-nouveau/HISTORY
@@ -1,3 +1,7 @@
+2015-08-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, no-glamor.patch: disable glamor, which does not build
+ and does not get love from upstream anyway
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD: prevent shell syntax destruction by removal
of conditional body, providing eternal truth instead
diff --git a/xorg-driver/xf86-video-nouveau/PRE_BUILD
b/xorg-driver/xf86-video-nouveau/PRE_BUILD
index 6aa4746..97418cb 100755
--- a/xorg-driver/xf86-video-nouveau/PRE_BUILD
+++ b/xorg-driver/xf86-video-nouveau/PRE_BUILD
@@ -3,4 +3,7 @@ cd $SOURCE_DIRECTORY &&
# Do not provoke shell syntax errors by removing
# whole if-then bodies.
sedit "s:.*configure.*:true:" autogen.sh
+# Nouveau finds xorg's glamor and fails to build with it.
+# I'm told upstream is removing it anyway.
+patch -p0 < "$SCRIPT_DIRECTORY/no-glamor.patch" &&
./autogen.sh
diff --git a/xorg-driver/xf86-video-nouveau/no-glamor.patch
b/xorg-driver/xf86-video-nouveau/no-glamor.patch
new file mode 100644
index 0000000..9aa4a94
--- /dev/null
+++ b/xorg-driver/xf86-video-nouveau/no-glamor.patch
@@ -0,0 +1,18 @@
+--- configure.ac.orig 2015-08-17 09:40:48.119201650 +0200
++++ configure.ac 2015-08-17 09:42:59.912212267 +0200
+@@ -140,6 +140,7 @@
+ #include "list.h"])
+ fi
+
++if false; then
+
AC_CHECK_HEADERS([glamor.h],[found_glamor_header=yes],[found_glamor_header=no],
+ [#include "xorg-server.h"])
+ AC_MSG_CHECKING([whether to include GLAMOR support])
+@@ -150,6 +151,7 @@
+ else
+ AC_MSG_RESULT([no])
+ fi
++fi
+
+ AC_CONFIG_FILES([
+ Makefile
- [SM-Commit] GIT changes to master grimoire by Thomas Orgis (2bf6dd3cae0a36bd01984a7d3308fa8bcbb32903), Thomas Orgis, 08/19/2015
Archive powered by MHonArc 2.6.24.