CWS-TOOLING: integrate CWS avmedia102
This commit is contained in:
obo
commit
44fa62ac78
7 changed files with 10522 additions and 9537 deletions
37
configure.in
37
configure.in
|
|
@ -198,6 +198,10 @@ AC_ARG_ENABLE(gtk,
|
|||
[ --disable-gtk Determines whether to use Gtk+ vclplug on platforms
|
||||
where Gtk+ is available.
|
||||
],,enable_gtk=yes)
|
||||
AC_ARG_ENABLE(gstreamer,
|
||||
[ --disable-gstreamer Determines whether to use the GStreamer media
|
||||
backend on platforms where GStreamer is available.
|
||||
],,enable_gstreamer=yes)
|
||||
AC_ARG_ENABLE(systray,
|
||||
[ --disable-systray Determines whether to build the systray quickstarter.
|
||||
],,enable_systray=yes)
|
||||
|
|
@ -926,6 +930,7 @@ case "$build_os" in
|
|||
test_cups=yes
|
||||
test_randr=yes
|
||||
test_freetype=yes
|
||||
test_gstreamer=yes
|
||||
_os=SunOS
|
||||
AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
|
||||
if test -z "$GNUTAR"; then
|
||||
|
|
@ -960,7 +965,8 @@ case "$build_os" in
|
|||
test_cups=yes
|
||||
test_randr=yes
|
||||
test_freetype=yes
|
||||
_os=Linux
|
||||
test_gstreamer=yes
|
||||
_os=Linux
|
||||
;;
|
||||
gnu)
|
||||
test_cups=no
|
||||
|
|
@ -970,6 +976,7 @@ case "$build_os" in
|
|||
test_cups=no
|
||||
test_cairo=yes
|
||||
test_freetype=no
|
||||
test_gstreamer=no
|
||||
_os=WINNT
|
||||
;;
|
||||
darwin*) # Mac OS X
|
||||
|
|
@ -978,6 +985,7 @@ case "$build_os" in
|
|||
test_cairo=yes
|
||||
test_randr=no
|
||||
test_freetype=no
|
||||
test_gstreamer=no
|
||||
_os=Darwin
|
||||
if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
|
||||
AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
|
||||
|
|
@ -991,6 +999,7 @@ case "$build_os" in
|
|||
test_randr=no
|
||||
test_gtk=no
|
||||
test_freetype=no
|
||||
test_gstreamer=no
|
||||
_os=OS2
|
||||
;;
|
||||
freebsd*)
|
||||
|
|
@ -1001,6 +1010,7 @@ case "$build_os" in
|
|||
test_cups=yes
|
||||
test_randr=yes
|
||||
test_freetype=yes
|
||||
test_gstreamer=yes
|
||||
AC_MSG_CHECKING([the FreeBSD operating system release])
|
||||
if test -n "$with_os_version"; then
|
||||
OSVERSION="$with_os_version"
|
||||
|
|
@ -1035,6 +1045,7 @@ case "$build_os" in
|
|||
test_cups=no
|
||||
test_randr=yes
|
||||
test_freetype=yes
|
||||
test_gstreamer=yes
|
||||
PTHREAD_CFLAGS="-pthread"
|
||||
PTHREAD_LIBS="-pthread -lpthread"
|
||||
_os=NetBSD
|
||||
|
|
@ -1043,6 +1054,7 @@ case "$build_os" in
|
|||
test_cups=no
|
||||
test_randr=no
|
||||
test_freetype=yes
|
||||
test_gstreamer=yes
|
||||
PTHREAD_LIBS=-pthread
|
||||
echo "AIX is an alpha port --- Use at own risk" >> warn
|
||||
_os=AIX
|
||||
|
|
@ -5749,6 +5761,29 @@ AC_SUBST(ENABLE_SYSTRAY_GTK)
|
|||
AC_SUBST(GTK_CFLAGS)
|
||||
AC_SUBST(GTK_LIBS)
|
||||
|
||||
dnl ===================================================================
|
||||
dnl Check whether the GStreamer libraries are available.
|
||||
dnl ===================================================================
|
||||
|
||||
GSTREAMER_CFLAGS=""
|
||||
GSTREAMER_LIBS=""
|
||||
ENABLE_GSTREAMER=""
|
||||
|
||||
if test "$test_gstreamer" = "yes"; then
|
||||
AC_MSG_CHECKING([whether to build the GStreamer media backend])
|
||||
if test "x$enable_gstreamer" != "xno" ; then
|
||||
PKG_CHECK_MODULES( GSTREAMER, gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ,,AC_MSG_ERROR([requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages]))
|
||||
ENABLE_GSTREAMER="TRUE"
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(ENABLE_GSTREAMER)
|
||||
AC_SUBST(GSTREAMER_CFLAGS)
|
||||
AC_SUBST(GSTREAMER_LIBS)
|
||||
|
||||
|
||||
dnl ===================================================================
|
||||
dnl Check whether the Cairo libraries are available.
|
||||
dnl ===================================================================
|
||||
|
|
|
|||
|
|
@ -1583,7 +1583,10 @@ STD_UNO_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
|
|||
// AVMedia
|
||||
STD_UNO_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
|
||||
|
||||
#if defined UNX
|
||||
#if defined UNX
|
||||
#if defined ENABLE_GSTREAMER
|
||||
SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaGst, avmediagst )
|
||||
#endif
|
||||
#ifdef SOLAR_JAVA
|
||||
UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -72,6 +72,10 @@ SCPDEFS+=-DGTK_TWO_FOUR
|
|||
SCPDEFS+=-DENABLE_SYSTRAY_GTK
|
||||
.ENDIF
|
||||
|
||||
.IF "$(ENABLE_GSTREAMER)" != ""
|
||||
SCPDEFS+=-DENABLE_GSTREAMER
|
||||
.ENDIF
|
||||
|
||||
.IF "$(ENABLE_KDE)" != ""
|
||||
SCPDEFS+=-DENABLE_KDE
|
||||
.ENDIF
|
||||
|
|
|
|||
|
|
@ -214,6 +214,7 @@ Module gid_Module_Root_Files_4
|
|||
gid_File_Lib_Svx,
|
||||
gid_File_Lib_AVMedia,
|
||||
gid_File_Lib_AVMediaWin,
|
||||
gid_File_Lib_AVMediaGst,
|
||||
gid_File_Lib_BaseGfx,
|
||||
gid_File_Lib_Sysdtrans,
|
||||
gid_File_Lib_Sw,
|
||||
|
|
|
|||
|
|
@ -1619,6 +1619,7 @@ ToFile( "GTK_CFLAGS", "@GTK_CFLAGS@", "e" );
|
|||
ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" );
|
||||
ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
|
||||
ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
|
||||
ToFile( "ENABLE_GSTREAMER", "@ENABLE_GSTREAMER@", "e" );
|
||||
ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" );
|
||||
ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" );
|
||||
ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
|
||||
|
|
@ -1850,6 +1851,8 @@ ToFile( "FREETYPE_LIBS", "@FREETYPE_LIBS@", "e" );
|
|||
ToFile( "SYSTEM_POPPLER", "@SYSTEM_POPPLER@", "e" );
|
||||
ToFile( "POPPLER_CFLAGS", "@POPPLER_CFLAGS@", "e" );
|
||||
ToFile( "POPPLER_LIBS", "@POPPLER_LIBS@", "e" );
|
||||
ToFile( "GSTREAMER_CFLAGS", "@GSTREAMER_CFLAGS@", "e" );
|
||||
ToFile( "GSTREAMER_LIBS", "@GSTREAMER_LIBS@", "e" );
|
||||
ToFile( "SYSTEM_CAIRO", "@SYSTEM_CAIRO@", "e" );
|
||||
ToFile( "BUILD_PIXMAN", "@BUILD_PIXMAN@", "e" );
|
||||
ToFile( "CAIRO_CFLAGS", "@CAIRO_CFLAGS@", "e" );
|
||||
|
|
|
|||
|
|
@ -601,7 +601,7 @@ unxlngi6
|
|||
LIBRARY_PATH %SYSBASE%/usr/lib
|
||||
MKOUT %PERL% %SOLARENV%/bin/mkout.pl
|
||||
PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
|
||||
SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
|
||||
SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
|
||||
SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib -L%SOLAR_STLLIBPATH%
|
||||
SOLAR_JAVA TRUE
|
||||
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
|
||||
|
|
@ -631,10 +631,12 @@ unxlngi6
|
|||
SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
|
||||
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
|
||||
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
|
||||
PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
|
||||
}
|
||||
common2
|
||||
{
|
||||
ENABLE_GRAPHITE TRUE
|
||||
ENABLE_GSTREAMER TRUE
|
||||
BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin
|
||||
COM GCC
|
||||
COMMON_BUILD_TOOLS %SOLARROOT%$/btools
|
||||
|
|
@ -877,7 +879,7 @@ unxlngx6
|
|||
LIBRARY_PATH %SYSBASE%/usr/lib64
|
||||
MKOUT %PERL% %SOLARENV%/bin/mkout.pl
|
||||
PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
|
||||
SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
|
||||
SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
|
||||
SOLAREXTRALIB -L../lib64 -L%SYSBASE%/usr/lib64 -L%SOLAR_STLLIBPATH%
|
||||
SOLAR_JAVA TRUE
|
||||
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
|
||||
|
|
@ -907,11 +909,13 @@ unxlngx6
|
|||
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
|
||||
USE_SYSTEM_STL YES
|
||||
XAU_LIBS -lXau
|
||||
PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
|
||||
}
|
||||
common2
|
||||
{
|
||||
PKG_CONFIG_PATH %COMPATH%/glibc2.5/usr/lib64/pkgconfig
|
||||
ENABLE_GRAPHITE TRUE
|
||||
ENABLE_GSTREAMER TRUE
|
||||
BUILD_TOOLS %SOLARROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin
|
||||
COM GCC
|
||||
COMMON_BUILD_TOOLS %SOLARROOT%$/btools
|
||||
|
|
|
|||
Loading…
Reference in a new issue