[xiph-commits] r3464 - in firefox_plugin/trunk: . scripts src
johnf at svn.annodex.net
johnf at svn.annodex.net
Fri Feb 15 00:15:59 PST 2008
Author: johnf
Date: 2008-02-15 00:15:59 -0800 (Fri, 15 Feb 2008)
New Revision: 3464
Added:
firefox_plugin/trunk/src/
Removed:
firefox_plugin/trunk/config.h.in
firefox_plugin/trunk/plugin/
Modified:
firefox_plugin/trunk/configure.ac
firefox_plugin/trunk/scripts/copy-plugin-dynamic.sh
firefox_plugin/trunk/scripts/copy-plugin.sh
firefox_plugin/trunk/src/Makefile.am
Log:
Remove autogenerated config.h.in
Remove liboggplay bits from configure.ac
mv plugin to src
mv the scripts to the scripts directory
Deleted: firefox_plugin/trunk/config.h.in
===================================================================
--- firefox_plugin/trunk/config.h.in 2008-02-15 08:00:33 UTC (rev 3463)
+++ firefox_plugin/trunk/config.h.in 2008-02-15 08:15:59 UTC (rev 3464)
@@ -1,80 +0,0 @@
-/* config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define if have libfishsound */
-#undef HAVE_FISHSOUND
-
-/* Define if we have GLUT. */
-#undef HAVE_GLUT
-
-/* Define if Imlib2 is available */
-#undef HAVE_IMLIB2
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if have libsndfile */
-#undef HAVE_LIBSNDFILE1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if have liboggz */
-#undef HAVE_OGGZ
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* use MMX SSE2 compiler intrinsics */
-#undef __SSE2__
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
Modified: firefox_plugin/trunk/configure.ac
===================================================================
--- firefox_plugin/trunk/configure.ac 2008-02-15 08:00:33 UTC (rev 3463)
+++ firefox_plugin/trunk/configure.ac 2008-02-15 08:15:59 UTC (rev 3464)
@@ -1,12 +1,12 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT
-AC_CONFIG_SRCDIR([src/liboggplay/oggplay.c])
+AC_INIT(browser_plugin, 0.0.1.svn)
+AC_CONFIG_SRCDIR([src/plugin.cpp])
AC_PREREQ(2.53)
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(liboggplay, 0.0.1.svn)
+AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
SHARED_VERSION_INFO="1:0:0"
@@ -24,74 +24,30 @@
dnl Add parameters for aclocal
AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
-# Check for valgrind
-VALGRIND_ENVIRONMENT=""
-ac_enable_valgrind=no
-AC_ARG_ENABLE(valgrind-testing,
- [ --enable-valgrind-testing enable running of tests inside Valgrind ], [ ac_enable_valgrind=yes ], [ ac_enable_valgrind=no] )
-
-if test "x${ac_enable_valgrind}" = xyes ; then
- if test "x${enable_shared}" = xyes ; then
- VALGRIND_ENVIRONMENT="libtool --mode=execute "
- fi
-
- AC_CHECK_PROG(HAVE_VALGRIND, valgrind, yes, no)
- if test "x$HAVE_VALGRIND" = xyes ; then
- VALGRIND_ENVIRONMENT="$VALGRIND_ENVIRONMENT valgrind -q --leak-check=yes --show-reachable=yes --num-callers=100"
- AC_SUBST(VALGRIND_ENVIRONMENT)
- TESTS_INFO="Type 'make check' to run test suite. Tests will be run under:
- ${VALGRIND_ENVIRONMENT}"
- else
- TESTS_INFO="Type 'make check' to run test suite (Valgrind not found)"
- fi
-else TESTS_INFO="Type 'make check' to run test suite (Valgrind testing not enabled)"
-fi
-
dnl Overall configuration success flag
-oggplay_config_ok=yes
+browser_plugin_config_ok=yes
-oggplay_plugin=""
-oggplay_tools="oggplay-info"
-oggplay_examples="get-stream-info"
-oggplay_glut=""
-
dnl
dnl Configure for target platform
dnl
case "$target_os" in
- darwin* | rhapsody*)
- dnl Disable -Wall and -pedantic for Apple Darwin/Rhapsody.
- dnl System headers on these systems are broken.
- temp_CFLAGS=`echo $CFLAGS | sed "s/-Wall -pedantic//"`
- CFLAGS=$temp_CFLAGS
- dnl add extra mac-specific directories to include path
- CFLAGS="$CFLAGS -I/Developer/Headers/FlatCarbon/"
- HAVE_FRAMEWORKS="yes"
- AC_SUBST(PLATFORM,"mac")
- AC_SUBST(PLUGIN, "")
- ;;
linux* | solaris*)
SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
AC_SUBST(PLATFORM,"linux")
- AC_SUBST(PLUGIN, "plugin")
;;
*)
;;
esac
-dnl Define MACOSX for the benefit of altering link likes
-dnl in the build for that platform
-AM_CONDITIONAL(MACOS, test "x$HAVE_FRAMEWORKS" = "xyes")
-
dnl
dnl Detect oggz
dnl
dnl Minimum required version of liboggz
-oggplay_OGGZ="0.9.5"
+browser_plugin_OGGZ="0.9.5"
-PKG_CHECK_MODULES(OGGZ, oggz > "$oggplay_OGGZ", HAVE_OGGZ="yes", HAVE_OGGZ="no")
+PKG_CHECK_MODULES(OGGZ, oggz > "$browser_plugin_OGGZ", HAVE_OGGZ="yes", HAVE_OGGZ="no")
if test "$HAVE_OGGZ" = "yes" ; then
AC_DEFINE(HAVE_OGGZ, [], [Define if have liboggz])
@@ -103,11 +59,11 @@
if test "$HAVE_OGGZ" = "old" ; then
AC_MSG_ERROR([
*** The version of liboggz installed on your system is too old. You need
-*** liboggz version greater than $oggplay_OGGZ to build liboggplay.
+*** liboggz version greater than $browser_plugin_OGGZ to build the plugin.
])
else
AC_MSG_ERROR([
-*** liboggz-$oggplay_OGGZ or greater does not seem to exist on your system.
+*** liboggz-$browser_plugin_OGGZ or greater does not seem to exist on your system.
*** Please install it and run this ./configure again.
])
fi
@@ -118,9 +74,9 @@
dnl
dnl Minimum required version of libfishsound
-oggplay_FISHSOUND="0.7.0"
+browser_plugin_FISHSOUND="0.7.0"
-PKG_CHECK_MODULES(FISHSOUND, fishsound > "$oggplay_FISHSOUND", HAVE_FISHSOUND="yes", HAVE_FISHSOUND="no")
+PKG_CHECK_MODULES(FISHSOUND, fishsound > "$browser_plugin_FISHSOUND", HAVE_FISHSOUND="yes", HAVE_FISHSOUND="no")
if test "$HAVE_FISHSOUND" = "yes" ; then
AC_DEFINE(HAVE_FISHSOUND, [], [Define if have libfishsound])
@@ -132,11 +88,11 @@
if test "$HAVE_FISHSOUND" = "old" ; then
AC_MSG_ERROR([
*** The version of libfishsound installed on your system is too old. You need
-*** at least libfishsound version $oggplay_FISHSOUND to build liboggplay.
+*** at least libfishsound version $browser_plugin_FISHSOUND to build firefox plugin.
])
else
AC_MSG_ERROR([
-*** libfishsound-$oggplay_FISHSOUND or greater does not seem to exist on your system.
+*** libfishsound-$browser_plugin_FISHSOUND or greater does not seem to exist on your system.
*** Please install it and run this ./configure again.
])
fi
@@ -150,47 +106,21 @@
AC_SUBST(THEORA_LIBS)
dnl
-dnl Configuration option to disable building of plugin
+dnl Detect liboggplay
dnl
-ac_enable_plugin=yes
-AC_ARG_ENABLE(plugin,
- [ --disable-plugin disable building of plugin],
- [ ac_enable_plugin=no ], [ ac_enable_plugin=yes ])
+PKG_CHECK_MODULES(LIBOGGPLAY, oggplay)
+AC_SUBST(LIBOGGPLAY_CFLAGS)
+AC_SUBST(LIBOGGPLAY_LIBS)
+
dnl
dnl Detect Imlib2 (needed for the linux plugin)
dnl
-if test "x${ac_enable_plugin}" != xno ; then
- PKG_CHECK_MODULES(IMLIB2, imlib2, HAVE_IMLIB2="yes", HAVE_IMLIB2="no")
- if test "$HAVE_IMLIB2" = "yes" ; then
- oggplay_plugin=[" Will be built. See the README for installation instructions."]
- AC_DEFINE(HAVE_IMLIB2, [], [Define if Imlib2 is available])
- AC_SUBST(IMLIB2_LIBS)
- AC_SUBST(IMLIB2_CFLAGS)
- else
- oggplay_plugin=["*** Will NOT be built. Imlib2 does not seem to exist on your system."]
- fi
-else
- HAVE_IMLIB2="disabled"
- oggplay_plugin=" Plugin will NOT be built, disabled by './configure --disable-plugin'"
-fi
-AM_CONDITIONAL(HAVE_IMLIB2, [test "x$HAVE_IMLIB2" = "xyes"])
-dnl
-dnl Detect libsndfile1 (used by dump-all-streams example)
-dnl
+PKG_CHECK_MODULES(IMLIB2, imlib2)
+AC_SUBST(IMLIB2_LIBS)
+AC_SUBST(IMLIB2_CFLAGS)
-PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.0,
- HAVE_LIBSNDFILE1="yes", HAVE_LIBSNDFILE1="no")
-
-if test "x$HAVE_LIBSNDFILE1" = xyes ; then
- oggplay_examples="$oggplay_examples dump-all-streams"
- AC_DEFINE(HAVE_LIBSNDFILE1, [], [Define if have libsndfile])
- AC_SUBST(SNDFILE_CFLAGS)
- AC_SUBST(SNDFILE_LIBS)
-fi
-AM_CONDITIONAL(HAVE_LIBSNDFILE1, [test "x$HAVE_LIBSNDFILE1" = "xyes"])
-
dnl
dnl Detect pthreads libraries
dnl
@@ -239,15 +169,15 @@
fi
fi
if test "x$HAVE_GLUT" = xyes ; then
- oggplay_glut="glut-player"
+ browser_plugin_glut="glut-player"
AC_DEFINE([HAVE_GLUT], [], [Define if we have GLUT.])
else
- oggplay_glut="
+ browser_plugin_glut="
*** glut-player will NOT be built. GLUT could not be found."
fi
else
HAVE_GLUT="disabled"
- oggplay_glut="
+ browser_plugin_glut="
(glut-player will NOT be built, disabled by './configure --disable-glut')"
fi
AM_CONDITIONAL(HAVE_GLUT, [test "x$HAVE_GLUT" = "xyes"])
@@ -269,7 +199,7 @@
have_mmx_intrinsics=no
AC_MSG_CHECKING(For MMX/SSE intrinsics in the compiler)
-liboggplay_save_CFLAGS=$CFLAGS
+libbrowser_plugin_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $SSE2_CFLAGS"
AC_COMPILE_IFELSE([
#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4))
@@ -285,7 +215,7 @@
vt = _mm_or_si64 (ut, vt);
return _mm_cvtsi64_si32 (vt);
}], have_mmx_intrinsics=yes)
-CFLAGS=$liboggplay_save_CFLAGS
+CFLAGS=$libbrowser_plugin_save_CFLAGS
AC_MSG_RESULT($have_mmx_intrinsics)
if test $have_mmx_intrinsics = yes ; then
@@ -301,7 +231,7 @@
dnl Configuration tests complete -- provide summary of results.
dnl
-if test $oggplay_config_ok = no ; then
+if test $browser_plugin_config_ok = no ; then
AC_MSG_RESULT([
**************************************************************
@@ -354,15 +284,7 @@
AC_OUTPUT([
Makefile
-include/Makefile
-include/oggplay/Makefile
src/Makefile
-src/liboggplay/Makefile
-src/liboggplay/Version_script
-src/tools/Makefile
-src/tests/Makefile
-plugin/Makefile
-oggplay.pc
])
AS_AC_EXPAND(LIBDIR, ${libdir})
@@ -373,22 +295,13 @@
------------------------------------------------------------------------
$PACKAGE $VERSION: Automatic configuration OK.
- Browser plugin (./plugin):
+ Browser plugin:
$oggplay_plugin
- Tools (./src/tools):
-
- $oggplay_tools
-
- Examples (./src/tools):
-
- $oggplay_examples $oggplay_glut
-
Installation paths:
- liboggplay: .................. ${LIBDIR}
- C header files: .............. ${INCLUDEDIR}/oggplay
+ browser_plugin: .................. ${LIBDIR}
Building:
@@ -396,9 +309,6 @@
Type 'make install' to install $PACKAGE.
- ${TESTS_INFO}
-
- Example programs will be built but not installed.
------------------------------------------------------------------------
])
Modified: firefox_plugin/trunk/scripts/copy-plugin-dynamic.sh
===================================================================
--- firefox_plugin/trunk/scripts/copy-plugin-dynamic.sh 2008-02-15 08:00:33 UTC (rev 3463)
+++ firefox_plugin/trunk/scripts/copy-plugin-dynamic.sh 2008-02-15 08:15:59 UTC (rev 3464)
@@ -2,5 +2,5 @@
# Copy the plugin across into the Mozilla plugins directory
mkdir -p $HOME/.mozilla/plugins
-cp plugin/.libs/libnpoggplugin_dynamic.so $HOME/.mozilla/plugins
-cp plugin/nsILibOggPlugin.xpt $HOME/.mozilla/plugins
+cp src/.libs/libnpoggplugin_dynamic.so $HOME/.mozilla/plugins
+cp src/nsILibOggPlugin.xpt $HOME/.mozilla/plugins
Modified: firefox_plugin/trunk/scripts/copy-plugin.sh
===================================================================
--- firefox_plugin/trunk/scripts/copy-plugin.sh 2008-02-15 08:00:33 UTC (rev 3463)
+++ firefox_plugin/trunk/scripts/copy-plugin.sh 2008-02-15 08:15:59 UTC (rev 3464)
@@ -2,5 +2,5 @@
# Copy the plugin across into the Mozilla plugins directory
mkdir -p $HOME/.mozilla/plugins
-cp plugin/.libs/libnpoggplugin.so $HOME/.mozilla/plugins
-cp plugin/nsILibOggPlugin.xpt $HOME/.mozilla/plugins
+cp src/.libs/libnpoggplugin.so $HOME/.mozilla/plugins
+cp src/nsILibOggPlugin.xpt $HOME/.mozilla/plugins
Copied: firefox_plugin/trunk/src (from rev 3452, firefox_plugin/trunk/plugin)
Modified: firefox_plugin/trunk/src/Makefile.am
===================================================================
--- firefox_plugin/trunk/plugin/Makefile.am 2008-02-13 11:25:34 UTC (rev 3452)
+++ firefox_plugin/trunk/src/Makefile.am 2008-02-15 08:15:59 UTC (rev 3464)
@@ -10,73 +10,54 @@
win32/resource.h
AM_CXXFLAGS = -Wall -Wno-non-virtual-dtor -Werror -DXP_UX -DMOZ_X11 -DUSE_AUDIO -shared \
- -g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS)
+ -g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS) $(OGGPLAY_CFLAGS)
AM_CFLAGS = -Wall -Werror -DXP_UX -DMOZ_X11 -DUSE_AUDIO -shared \
-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS) \
- $(IMLIB2_CFLAGS) -Wdeclaration-after-statement
+ $(IMLIB2_CFLAGS) $(OGGPLAY_CFLAGS) -Wdeclaration-after-statement
include $(srcdir)/Make-rules-$(PLATFORM)
-OGGPLAYDIR = ../src/liboggplay
-OGGPLAY_DYNLIBS = $(OGGPLAYDIR)/liboggplay.la @OGGZ_LIBS@ @THEORA_LIBS@ @FISHSOUND_LIBS@
-OGGPLAY_LIBS = xpi/liboggplay.a xpi/liboggz.a xpi/libtheora.a xpi/libfishsound.a xpi/libvorbis.a xpi/libvorbisenc.a xpi/libspeex.a xpi/libogg.a xpi/libImlib2.a
+OGGPLAY_STATICLIBS = $(LIBDIR)/liboggplay.a $(LIBDIR)/liboggz.a $(LIBDIR)/libtheora.a $(LIBDIR)/libfishsound.a $(LIBDIR)/libvorbis.a $(LIBDIR)/libvorbisenc.a $(LIBDIR)/libspeex.a $(LIBDIR)/libogg.a $(LIBDIR)/libImlib2.a
-if HAVE_IMLIB2
plugin_libs=libnpoggplugin.la libnpoggplugin_dynamic.la
-endif
noinst_HEADERS = \
- nsILibOggPlugin.h \
- plugin_gui.h \
- plugin.h \
- plugin_oggplay.h \
- plugin_tools.h \
- std_semaphore.h \
- include/npplat.h \
+ nsILibOggPlugin.h \
+ plugin_gui.h \
+ plugin.h \
+ plugin_oggplay.h \
+ plugin_tools.h \
+ std_semaphore.h \
+ include/npplat.h \
include/pluginbase.h \
support/nsScriptablePeer.h \
- audio/sydney_audio.h \
- plugin_c.h \
- plugin_cmml.h
+ audio/sydney_audio.h \
+ plugin_c.h \
+ plugin_cmml.h
# Libraries to build
lib_LTLIBRARIES = $(plugin_libs)
libnpoggplugin_la_SOURCES = \
- plugin.cpp \
- support/nsScriptablePeer.cpp \
- plugin_oggplay.c \
- plugin_gui_linux.c \
- plugin_tools.c \
- support/npp_gate.cpp \
- support/np_entry.cpp \
- support/npn_gate.cpp \
- audio/sydney_audio_oss.c \
+ plugin.cpp \
+ support/nsScriptablePeer.cpp \
+ plugin_oggplay.c \
+ plugin_gui_linux.c \
+ plugin_tools.c \
+ support/npp_gate.cpp \
+ support/np_entry.cpp \
+ support/npn_gate.cpp \
+ audio/sydney_audio_oss.c \
plugin_cmml.c
- #support/npunix.c
-libnpoggplugin_dynamic_la_SOURCES = \
- plugin.cpp \
- support/nsScriptablePeer.cpp \
- plugin_oggplay.c \
- plugin_gui_linux.c \
- plugin_tools.c \
- support/npp_gate.cpp \
- support/np_entry.cpp \
- support/npn_gate.cpp \
- audio/sydney_audio_oss.c \
- plugin_cmml.c
+libnpoggplugin_la_LIBADD = -lX11 -lXt $(LIBOGGPLAY_STATICLIBS) $(PTHREAD_LIBS)
-libnpoggplugin_la_LIBADD = -lX11 -lXt $(OGGPLAY_LIBS) $(PTHREAD_LIBS)
+libnpoggplugin_dynamic_la_SOURCES = $(libnpoggplugin_la_SOURCES)
+libnpoggplugin_dynamic_la_LIBADD = -lX11 -lXt $(LIBOGGPLAY_LIBS) $(IMLIB2_LIBS) $(PTHREAD_LIBS)
-
-libnpoggplugin_dynamic_la_LIBADD = -lX11 -lXt $(OGGPLAY_DYNLIBS) $(IMLIB2_LIBS) $(PTHREAD_LIBS)
-
EXTRA_libnpoggplugin_la_SOURCES = nsILibOggPlugin.idl
nodist_libnpoggplugin_la_SOURCES = nsILibOggPlugin.h
-BUILT_SOURCES = nsILibOggPlugin.h xpi/liboggplay.a
+BUILT_SOURCES = nsILibOggPlugin.h
CLEANFILES = nsILibOggPlugin.h nsILibOggPlugin.xpt
-nsILibOggPlugin.h: nsILibOggPlugin.idl xpi/liboggplay.a
+nsILibOggPlugin.h: nsILibOggPlugin.idl
$(XPIDL) -m header $(XPIDL_INCLUDE) $(srcdir)/nsILibOggPlugin.idl
$(XPIDL) -m typelib $(XPIDL_INCLUDE) $(srcdir)/nsILibOggPlugin.idl
-xpi/liboggplay.a: ../src/liboggplay/.libs/liboggplay.a
- cp ../src/liboggplay/.libs/liboggplay.a xpi
More information about the commits
mailing list