[xiph-commits] r3469 - liboggplay/trunk
johnf at svn.annodex.net
johnf at svn.annodex.net
Fri Feb 15 00:52:48 PST 2008
Author: johnf
Date: 2008-02-15 00:52:47 -0800 (Fri, 15 Feb 2008)
New Revision: 3469
Removed:
liboggplay/trunk/Installer/
liboggplay/trunk/config.h.in
liboggplay/trunk/copy-plugin-dynamic.sh
liboggplay/trunk/copy-plugin.sh
liboggplay/trunk/plugin/
liboggplay/trunk/uninstall-plugin.sh
Modified:
liboggplay/trunk/Makefile.am
liboggplay/trunk/configure.ac
Log:
moved plugin into its own package prowser_plugin
Modified: liboggplay/trunk/Makefile.am
===================================================================
--- liboggplay/trunk/Makefile.am 2008-02-15 08:48:05 UTC (rev 3468)
+++ liboggplay/trunk/Makefile.am 2008-02-15 08:52:47 UTC (rev 3469)
@@ -32,7 +32,7 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = include src $(PLUGIN)
+SUBDIRS = include src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = oggplay.pc
Deleted: liboggplay/trunk/config.h.in
===================================================================
--- liboggplay/trunk/config.h.in 2008-02-15 08:48:05 UTC (rev 3468)
+++ liboggplay/trunk/config.h.in 2008-02-15 08:52:47 UTC (rev 3469)
@@ -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: liboggplay/trunk/configure.ac
===================================================================
--- liboggplay/trunk/configure.ac 2008-02-15 08:48:05 UTC (rev 3468)
+++ liboggplay/trunk/configure.ac 2008-02-15 08:52:47 UTC (rev 3469)
@@ -50,7 +50,6 @@
dnl Overall configuration success flag
oggplay_config_ok=yes
-oggplay_plugin=""
oggplay_tools="oggplay-info"
oggplay_examples="get-stream-info"
oggplay_glut=""
@@ -69,12 +68,10 @@
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")
;;
*)
;;
@@ -150,31 +147,13 @@
AC_SUBST(THEORA_LIBS)
dnl
-dnl Configuration option to disable building of plugin
+dnl Detect Imlib2 (used by dump-all-streams example)
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(IMLIB2, imlib2)
+AC_SUBST(IMLIB2_LIBS)
+AC_SUBST(IMLIB2_CFLAGS)
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)
@@ -361,7 +340,6 @@
src/liboggplay/Version_script
src/tools/Makefile
src/tests/Makefile
-plugin/Makefile
oggplay.pc
])
@@ -373,10 +351,6 @@
------------------------------------------------------------------------
$PACKAGE $VERSION: Automatic configuration OK.
- Browser plugin (./plugin):
-
-$oggplay_plugin
-
Tools (./src/tools):
$oggplay_tools
Deleted: liboggplay/trunk/copy-plugin-dynamic.sh
===================================================================
--- liboggplay/trunk/copy-plugin-dynamic.sh 2008-02-15 08:48:05 UTC (rev 3468)
+++ liboggplay/trunk/copy-plugin-dynamic.sh 2008-02-15 08:52:47 UTC (rev 3469)
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# 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
Deleted: liboggplay/trunk/copy-plugin.sh
===================================================================
--- liboggplay/trunk/copy-plugin.sh 2008-02-15 08:48:05 UTC (rev 3468)
+++ liboggplay/trunk/copy-plugin.sh 2008-02-15 08:52:47 UTC (rev 3469)
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# 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
Deleted: liboggplay/trunk/uninstall-plugin.sh
===================================================================
--- liboggplay/trunk/uninstall-plugin.sh 2008-02-15 08:48:05 UTC (rev 3468)
+++ liboggplay/trunk/uninstall-plugin.sh 2008-02-15 08:52:47 UTC (rev 3469)
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# Remove the plugin from the Mozilla plugins directory
-rm $HOME/.mozilla/plugins/libnpoggplugin.so
-rm $HOME/.mozilla/plugins/npliboggplugin.xpt
More information about the commits
mailing list