* [gentoo-commits] gentoo-x86 commit in www-plugins/lightspark/files: lightspark-0.4.6.1-cmakelists.patch lightspark-0.4.7.1-allow-disabling-pulseaudio.patch lightspark-0.4.8.1-allow-disabling-pulseaudio.patch lightspark-0.4.8.1-cmakelists.patch
@ 2011-06-15 13:16 Chi-Thanh Christopher Nguyen (chithanh)
0 siblings, 0 replies; only message in thread
From: Chi-Thanh Christopher Nguyen (chithanh) @ 2011-06-15 13:16 UTC (permalink / raw
To: gentoo-commits
chithanh 11/06/15 13:16:56
Added: lightspark-0.4.8.1-allow-disabling-pulseaudio.patch
lightspark-0.4.8.1-cmakelists.patch
Removed: lightspark-0.4.6.1-cmakelists.patch
lightspark-0.4.7.1-allow-disabling-pulseaudio.patch
Log:
Version bump, bug #371757.
Revision Changes Path
1.1 www-plugins/lightspark/files/lightspark-0.4.8.1-allow-disabling-pulseaudio.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/lightspark/files/lightspark-0.4.8.1-allow-disabling-pulseaudio.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/lightspark/files/lightspark-0.4.8.1-allow-disabling-pulseaudio.patch?rev=1.1&content-type=text/plain
Index: lightspark-0.4.8.1-allow-disabling-pulseaudio.patch
===================================================================
diff -ur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2011-05-27 14:02:19.000000000 +0200
+++ b/CMakeLists.txt 2011-06-15 15:08:21.079714248 +0200
@@ -122,6 +122,7 @@
SET(COMPILE_LIGHTSPARK TRUE CACHE BOOL "Compile Lightspark?")
SET(COMPILE_TIGHTSPARK TRUE CACHE BOOL "Compile Tightspark?")
SET(COMPILE_PLUGIN TRUE CACHE BOOL "Compile the browser plugin?")
+SET(AUDIO_BACKEND "pulse" CACHE STRING "Choose audio backend: none pulse alsa, default is pulse")
SET(ENABLE_CURL TRUE CACHE BOOL "Enable CURL? (Required for Downloader functionality)")
SET(ENABLE_LIBAVCODEC TRUE CACHE BOOL "Enable libavcodec and dependent functionality?")
SET(ENABLE_RTMP FALSE CACHE BOOL "Enable librtmp and dependent functionality?")
diff -ur a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt 2011-06-15 15:07:47.375546914 +0200
+++ b/src/CMakeLists.txt 2011-06-15 15:09:07.819945946 +0200
@@ -140,6 +140,8 @@
ADD_SUBDIRECTORY(plugin)
ENDIF(COMPILE_PLUGIN)
-ADD_SUBDIRECTORY(backends/interfaces/audio/pulse)
+IF(${AUDIO_BACKEND} MATCHES "pulse")
+ ADD_SUBDIRECTORY(backends/interfaces/audio/pulse)
+ENDIF(${AUDIO_BACKEND} MATCHES "pulse")
#ADD_SUBDIRECTORY(backends/interfaces/audio/alsa)
#ADD_SUBDIRECTORY(backends/interfaces/audio/openal)
1.1 www-plugins/lightspark/files/lightspark-0.4.8.1-cmakelists.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/lightspark/files/lightspark-0.4.8.1-cmakelists.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/lightspark/files/lightspark-0.4.8.1-cmakelists.patch?rev=1.1&content-type=text/plain
Index: lightspark-0.4.8.1-cmakelists.patch
===================================================================
diff -ur a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt 2011-05-27 14:02:19.000000000 +0200
+++ b/src/CMakeLists.txt 2011-06-15 15:05:03.274733225 +0200
@@ -101,7 +101,7 @@
${Boost_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY}
${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${FREETYPE_LIBRARIES} ${JPEG_LIBRARIES}
${OPENGL_LIBRARIES} ${FTGL_LIBRARIES} ${GLEW_LIBRARIES} ${PCRE_LIBRARIES}
- ${Threads_LIBRARIES} ${XMLPP_LIBRARIES} ${CMAKE_DL_LIBS})
+ ${Threads_LIBRARIES} ${XMLPP_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_MODULE_LINKER_FLAGS})
SET_TARGET_PROPERTIES(spark PROPERTIES VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
SET_TARGET_PROPERTIES(spark PROPERTIES SOVERSION "${MAJOR_VERSION}.${MINOR_VERSION}")
@@ -113,7 +113,7 @@
IF(COMPILE_LIGHTSPARK)
ADD_EXECUTABLE(lightspark main.cpp)
TARGET_LINK_LIBRARIES(lightspark spark)
- TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY} ${Boost_LIBRARIES})
+ TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY} ${Boost_LIBRARIES} ${CMAKE_MODULE_LINKER_FLAGS})
IF(UNIX)
INSTALL(FILES ${PROJECT_SOURCE_DIR}/src/lightspark.frag DESTINATION ${DATADIR}/lightspark)
@@ -128,7 +128,7 @@
IF(COMPILE_TIGHTSPARK)
ADD_EXECUTABLE(tightspark tightspark.cpp)
TARGET_LINK_LIBRARIES(tightspark spark)
- TARGET_LINK_LIBRARIES(tightspark ${Boost_LIBRARIES})
+ TARGET_LINK_LIBRARIES(tightspark ${Boost_LIBRARIES} ${CMAKE_MODULE_LINKER_FLAGS})
IF(UNIX)
INSTALL(TARGETS tightspark RUNTIME DESTINATION ${BINDIR})
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-06-15 13:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-15 13:16 [gentoo-commits] gentoo-x86 commit in www-plugins/lightspark/files: lightspark-0.4.6.1-cmakelists.patch lightspark-0.4.7.1-allow-disabling-pulseaudio.patch lightspark-0.4.8.1-allow-disabling-pulseaudio.patch lightspark-0.4.8.1-cmakelists.patch Chi-Thanh Christopher Nguyen (chithanh)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox