livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

port of 'SNOW-592 FIXED gstreamer 0.10.28 standalone build failure'

Tofu Linden 2010-09-25 11:02:02 +01:00
parent c7a57bdf87
commit 5e0d27b1c3
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/contributions.txt
View File

@ -650,6 +650,7 @@ Teardrops Fall
VWR-5366 VWR-5366
Techwolf Lupindo Techwolf Lupindo
SNOW-92 SNOW-92
SNOW-592
SNOW-649 SNOW-649
SNOW-650 SNOW-650
SNOW-687 SNOW-687
@ -666,8 +667,9 @@ Thickbrick Sleaford
SNOW-390 SNOW-390
SNOW-421 SNOW-421
SNOW-462 SNOW-462
SNOW-635
SNOW-586 SNOW-586
SNOW-592
SNOW-635
SNOW-743 SNOW-743
VWR-7109 VWR-7109
VWR-9287 VWR-9287

7
indra/media_plugins/gstreamer010/CMakeLists.txt
View File

@ -42,13 +42,6 @@ set(media_plugin_gstreamer010_HEADER_FILES
llmediaimplgstreamertriviallogging.h llmediaimplgstreamertriviallogging.h
) )
if (${CXX_VERSION_NUMBER} MATCHES "4[23456789].")
# Work around a bad interaction between broken gstreamer headers and
# g++ >= 4.2's increased strictness.
set_source_files_properties(llmediaimplgstreamervidplug.cpp PROPERTIES
COMPILE_FLAGS -Wno-write-strings)
endif (${CXX_VERSION_NUMBER} MATCHES "4[23456789].")
add_library(media_plugin_gstreamer010 add_library(media_plugin_gstreamer010
SHARED SHARED
${media_plugin_gstreamer010_SOURCE_FILES} ${media_plugin_gstreamer010_SOURCE_FILES}

22
indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
View File

@ -48,7 +48,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_slvideo_debug);
#define SLV_ALLCAPS GST_VIDEO_CAPS_RGBx SLV_SIZECAPS #define SLV_ALLCAPS GST_VIDEO_CAPS_RGBx SLV_SIZECAPS
static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ( static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE (
"sink", (gchar*)"sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS (SLV_ALLCAPS) GST_STATIC_CAPS (SLV_ALLCAPS)
@ -508,18 +508,18 @@ plugin_init (GstPlugin * plugin)
some g++ versions buggily avoid __attribute__((constructor)) functions - some g++ versions buggily avoid __attribute__((constructor)) functions -
so we provide an explicit plugin init function. so we provide an explicit plugin init function.
*/ */
#define PACKAGE (gchar*)"packagehack"
// this macro quietly refers to PACKAGE internally
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
(gchar*)"private-slvideoplugin",
(gchar*)"SL Video sink plugin",
plugin_init, (gchar*)"1.0", (gchar*)"LGPL",
(gchar*)"Second Life",
(gchar*)"http://www.secondlife.com/");
#undef PACKAGE
void gst_slvideo_init_class (void) void gst_slvideo_init_class (void)
{ {
#define PACKAGE "packagehack"
// this macro quietly refers to PACKAGE internally
static GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"private-slvideoplugin",
"SL Video sink plugin",
plugin_init, "1.0", "LGPL",
"Second Life",
"http://www.secondlife.com/");
#undef PACKAGE
ll_gst_plugin_register_static (&gst_plugin_desc); ll_gst_plugin_register_static (&gst_plugin_desc);
DEBUGMSG("CLASS INIT"); DEBUGMSG("CLASS INIT");
} }