Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Summary: "make distcheck" now works again.

	* missing: Update to newer version.
	* mkinstalldirs: Update to newer version.
	* Makefile.am: Add new "olpc" target to cross build RPM using a
	non standard config triplet to force rpmbuild to work correctly,
	since it doesn't support the vendor field. Add macros/incllist
	macros/libslist to EXTRA_DIST.
	* packaging/redhat/gnash.spec: Add support for cross building
	RPMs.
	* packaging/redhat/rpmrc: Config file for rpmbuild to convert non
	standard config for geode-olpc into a standard i386-olpc-linux
	build, but use the correct cross compiler.
	* plugin/plugin.cpp: Cast away the const for MIME_TYPES_DESCRIPTION.
	* plugin/klash/Makefile.am: Don't build klash.moc, it's built in
	gui now.
	* configure.ac: Remove --enable-fork option, it's unused. Get the
	root directory to look for headers and libraries for a cross build
	from GCC, as the path is different when building RPMs.
	* cygnal/Makefile.am: Fix spelling of noinst_HEADERS.
	* cygnal/README: Fix typo.
	* extensions/Makefile.am: Add support for other directories for
	building a distribution.
	* extensions/gtk2/Makefile.am: Include from gui directory
	too. Don't build test program by default for now.
	* gui/Makefile.am: Add XML to include paths.
	* gui/gnash.cpp: Disable network support for now.
	* gui/gtksup.h: Return the GtkWidget handle of a window.
	* libbase/Makefile.am: PTHREAD_LIBS should always be after
	BOOST_LIBS.
	* libbase/network.cpp: Tweak debug messages. Test for priviledged
	ports. Add support for a blocking select when waiting for a
	connection.
	* macros/boost.m4: Break when the right path is found.
	* macros/ffmpeg.m4: Handle multiple directories with -I when
	setting topdir. Print a warning if avcodec.h is found, but
	avformat.h is not.
	* macros/gnashpkgtool.m4: Don't create an enable option for
	everything, it's confusing.
	* macros/kde.m4: Look in incllist as well as libslist for QT
	headers.
	* testsuite/Makefile.am: Add generic-testrunner.sh to dist_noinst_SCRIPTS.
	* testsuite/misc-ming.all/Makefile.am: Add intervalTest.as to
	EXTRA_DIST.
  • Loading branch information...
commit 8b973b4e783708f8ecbc0602e55c134508e8ed08 1 parent 4a56d8b
rsavoye authored
View
13 Makefile.am
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.63 2007/02/12 23:49:10 strk Exp $
+# $Id: Makefile.am,v 1.64 2007/03/06 18:06:12 rsavoye Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -62,7 +62,7 @@ man_MANS = doc/gnash.1
DIST_SUBDIRS = $(STD_DIRS) doc plugin cygnal extensions
-EXTRA_DIST= $(man_MANS)
+EXTRA_DIST= $(man_MANS) macros/incllist macros/libslist
#EXTRA_DIST = macros
# if HTTP
# SUBDIRS += net $(STD_DIRS)
@@ -72,10 +72,17 @@ EXTRA_DIST= $(man_MANS)
noinst_HEADERS = compatibility_include.h
+# # Build an RPM package targeted to the OLPC http://www.laptop.org.
+# olpc: dist-gzip $(srcdir)/packaging/redhat/gnash.spec
+# cp -f $(srcdir)/packaging/redhat/gnash.spec /usr/src/redhat/SPECS/
+# cp -f gnash-$(VERSION).tar.gz /usr/src/redhat/SOURCES/
+# rpmbuild -rcfile=$(srcdir)/packaging/redhat/rpmrc:/usr/lib/rpm/rpmrc \
+# -ba --target=geode-olpc /usr/src/redhat/SPECS/gnash.spec
+
# Build an RPM package
rpm redhat: dist-gzip $(srcdir)/packaging/redhat/gnash.spec
cp -f $(srcdir)/packaging/redhat/gnash.spec /usr/src/redhat/SPECS/
- cp -f gnash-${VERSION}.tar.gz /usr/src/redhat/SOURCES/
+ cp -f gnash-$(VERSION).tar.gz /usr/src/redhat/SOURCES/
rpmbuild -ba /usr/src/redhat/SPECS/gnash.spec
# Build a Debian GNU/Linux package
View
21 configure.ac
@@ -15,7 +15,7 @@ dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.268 2007/03/03 15:48:37 martinwguy Exp $
+dnl $Id: configure.ac,v 1.269 2007/03/06 18:06:12 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -54,17 +54,6 @@ AC_PROG_MAKE_SET
AC_DISABLE_STATIC dnl Disable building static libs.
-AC_ARG_ENABLE(fork, AC_HELP_STRING([--disable-fork],[Use a thread instead forking the standalone player.]),
-[case "${enableval}" in
- yes) fork=yes ;;
- no) fork=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --disable-fork option]) ;;
-esac],fork=yes)
-
-if test x"$fork" = x"yes"; then
- AC_DEFINE([USE_FORK], [], [Fork player instead of thread])
-fi
-
AC_ARG_ENABLE(debugger, AC_HELP_STRING([--disable-debugger],[Disable the Flash debugger]),
[case "${enableval}" in
yes) debugger=yes ;;
@@ -252,6 +241,7 @@ if test x$pixelformat = xall; then
fi
fi
fi
+
dnl --------------------------------------------------------
dnl Select sound streamer
dnl --------------------------------------------------------
@@ -307,9 +297,10 @@ dnl To override thise, use the --with-*-incl= and --with-*-libs=
dnl options to configure.
if test x$cross_compiling = xyes; then
AC_MSG_NOTICE([Configuring Gnash for cross compilation])
- export incllist="${prefix}/${host_alias}/include ${prefix}/include"
- export libslist="${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib"
- export pathlist="${prefix}/${host_alias}/bin:${prefix}/bin"
+ export pkgroot=`$CXX -print-search-dirs | grep "install:" | sed -e 's/install: //' -e 's:/lib/gcc/.*::'`
+ export incllist="${pkgroot}/${host_alias}/include ${pkgroot}/include"
+ export libslist="${pkgroot}/${host_alias}/lib ${pkgroot}/lib64 ${pkgroot}/lib32 ${pkgroot}/lib"
+ export pathlist="${pkgroot}/${host_alias}/bin:${pkgroot}/bin"
LDFLAGS="${LDFLAGS} -Wl,--as-needed"
plugin=no
else
View
4 cygnal/Makefile.am
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.3 2007/01/09 00:43:42 rsavoye Exp $
+# $Id: Makefile.am,v 1.4 2007/03/06 18:06:13 rsavoye Exp $
## Process this file with automake to generate Makefile.in
@@ -59,7 +59,7 @@ cygnal_SOURCES = \
# transcode.cpp
# flash.cpp
-noinst_HEADRRS = \
+noinst_HEADERS = \
http.h \
netstats.h \
stream.h \
View
12 cygnal/README
@@ -4,8 +4,8 @@ Adobe Communication server's features, as these will determine a
rough feature set for Cygnal. Some of the limitations commented on in
these notes should be consider a place where Cygnal can do better.
-Flash Communication Server features:
------------------------------------
+General Communication Server features:
+-------------------------------------
The most common way of streaming Flash movies is using progressive
streaming. Progressive streams don't allow seeking within the data
@@ -31,8 +31,8 @@ when running. Some statistics modify the stream while it is playing,
and the other are for load balancing on larger installations, like a
cluster.
-The server can also transcode between codecs. The MacroMedia server
-can only real MPEG4.. Since the server is using Gstreamer, it can
+The server can also transcode between codecs. The Adobe server
+can only convert MPEG4. Since the Cygnal server is using Gstreamer, it can
convert between any supported codec. Along with this, by using the
statistics collected for each data transfer, the server can also
change the resolution of the movie to adjust to varying network
@@ -81,8 +81,8 @@ network connections.
* Audio and data have the highest priority, video packets are thrown
away to stay synchronized.
-Internals:
----------
+Cygnal Internals:
+----------------
Since all data streams need no knowledge of other streams, each
incoming connection will get a new thread to handle it. If the CPU
View
9 gui/Makefile.am
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.59 2007/01/26 19:41:41 rsavoye Exp $
+# $Id: Makefile.am,v 1.60 2007/03/06 18:06:13 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -30,6 +30,7 @@ AM_CPPFLAGS = -I.. \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/backend \
-I$(top_srcdir)/libgeometry \
+ $(LIBXML_CFLAGS) \
$(SDL_CFLAGS) \
$(DMALLOC_CFLAGS) \
$(BOOST_CFLAGS) \
@@ -79,10 +80,8 @@ if USE_GUI_SDL
endif # USE_GUI_SDL
if USE_GUI_KDE
KDE_OPENGL_SRCS = kde_glue_opengl.cpp kde_glue_opengl.h
- AM_LDFLAGS += \
- $(KDE_LDFLAGS) \
- $(LIB_KDECORE) \
- $(LIB_KDEUI)
+ AM_CPPFLAGS += $(KDE_CFLAGS) $(QT_CFLAGS)
+ AM_LDFLAGS += $(KDE_LIBS) $(QT_LIBS)
BUILT_SOURCES = klash.moc
endif # USE_GUI_KDE
else # ! USE_RENDERER_OPENGL
View
3  gui/gnash.cpp
@@ -216,9 +216,10 @@ parseCommandLine(int argc, char* argv[], gnash::Player& player)
break;
case 'g':
#ifdef USE_DEBUGGER
+ dbglogfile << "Setting debugger ON" << std::endl;
debugger.enabled(true);
+// debugger.startServer(&debugger);
debugger.console();
- dbglogfile << "Setting debugger ON" << std::endl;
#else
dbglogfile << "WARNING: The debugger has been disabled at configuration time" << std::endl;
#endif
View
5 gui/gtk.cpp
@@ -14,10 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-
-/* $Id: gtk.cpp,v 1.73 2007/03/03 15:10:40 bjacques Exp $ */
+/* $Id: gtk.cpp,v 1.74 2007/03/06 18:06:13 rsavoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
View
2  gui/gtksup.h
@@ -137,7 +137,7 @@ class DSOEXPORT GtkGui : public Gui
#endif
virtual void setCursor(gnash_cursor_type newcursor);
-
+ GtkWidget *getWindow() { return _window; };
private:
GtkWidget *_window;
GdkPixbuf *_window_icon_pixbuf;
View
3  libbase/Makefile.am
@@ -55,9 +55,9 @@ libgnashbase_la_LIBADD = \
$(Z_LIBS) \
$(CURL_LIBS) \
$(OPENGL_LIBS) \
- $(PTHREAD_LIBS) \
$(LIBLTDL) \
$(BOOST_LIBS) \
+ $(PTHREAD_LIBS) \
$(NULL)
if HAS_SDL
@@ -103,6 +103,7 @@ noinst_HEADERS = \
demo.h \
dlmalloc.h \
extension.h \
+ embedVideoDecoder.h \
GnashException.h \
grid_index.h \
image.h \
View
72 libbase/network.cpp
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -14,10 +14,6 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-//
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -110,7 +106,7 @@ Network::operator = (Network &net)
bool
Network::createServer(void)
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
return createServer(DEFAULTPORT);
}
@@ -118,7 +114,7 @@ Network::createServer(void)
bool
Network::createServer(short port)
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
struct protoent *ppe;
struct sockaddr_in sock_in;
@@ -126,6 +122,11 @@ Network::createServer(short port)
int retries = 0;
in_addr_t nodeaddr;
+ if (port < 1024) {
+ log_error("Can't connect to priviledged port #%d!\n", port);
+ return false;
+ }
+
const struct hostent *host = gethostbyname("localhost");
struct in_addr *thisaddr = reinterpret_cast<struct in_addr *>(host->h_addr_list[0]);
_ipaddr = thisaddr->s_addr;
@@ -191,9 +192,11 @@ Network::createServer(short port)
log_msg("Host Name is %s, IP is %s", host->h_name, ascip);
#endif
- log_msg("Server bound to service on port: %hd, %s using fd #%d\n",
- ntohs(sock_in.sin_port), inet_ntoa(sock_in.sin_addr),
- _listenfd);
+ if (_debug) {
+ log_msg("Server bound to service on port: %hd, %s using fd #%d\n",
+ ntohs(sock_in.sin_port), inet_ntoa(sock_in.sin_addr),
+ _listenfd);
+ }
if (type == SOCK_STREAM && listen(_listenfd, 5) < 0) {
log_msg("ERROR: unable to listen on port: %hd: %s ",
@@ -218,7 +221,7 @@ Network::createServer(short port)
bool
Network::newConnection(void)
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
return newConnection(true);
}
@@ -226,7 +229,7 @@ Network::newConnection(void)
bool
Network::newConnection(bool block)
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
struct sockaddr newfsin;
socklen_t alen;
@@ -299,8 +302,10 @@ Network::newConnection(bool block)
log_msg("unable to accept : %s\n", strerror(errno));
return false;
}
-
- log_msg("Accepting tcp/ip connection on fd #%d\n", _sockfd);
+
+ if (_debug) {
+ log_msg("Accepting tcp/ip connection on fd #%d\n", _sockfd);
+ }
return true;
}
@@ -456,7 +461,7 @@ Network::createClient(const char *hostname, short port)
bool
Network::closeNet()
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
if (_sockfd > 0) {
closeNet(_sockfd);
@@ -470,7 +475,7 @@ Network::closeNet()
bool
Network::closeNet(int sockfd)
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
int retries = 0;
@@ -577,15 +582,14 @@ Network::readNet(int fd, char *buffer, int nbytes, int timeout)
if (fd) {
FD_ZERO(&fdset);
FD_SET(fd, &fdset);
-
- // Reset the timeout value, since select modifies it on return
- // Reset the timeout value, since select modifies it on return
- if (timeout <= 0) {
- timeout = 5;
- }
- tval.tv_sec = timeout;
- tval.tv_usec = 0;
- ret = select(fd+1, &fdset, NULL, NULL, &tval);
+
+ if (timeout < 0) {
+ tval.tv_sec = 5;
+ tval.tv_usec = 0;
+ ret = select(fd+1, &fdset, NULL, NULL, &tval);
+ } else {
+ ret = select(fd+1, &fdset, NULL, NULL, NULL);
+ }
// If interupted by a system call, try again
if (ret == -1 && errno == EINTR) {
@@ -606,8 +610,10 @@ Network::readNet(int fd, char *buffer, int nbytes, int timeout)
}
ret = read(fd, buffer, nbytes);
- dbglogfile << "read " << ret << " bytes from fd #"
- << fd << endl;
+ if (_debug) {
+ dbglogfile << "read " << ret << " bytes from fd #"
+ << fd << endl;
+ }
}
return ret;
@@ -712,12 +718,16 @@ Network::writeNet(int fd, char const *buffer, int nbytes, int timeout)
if (ret > 0) {
bufptr += ret;
if (ret != nbytes) {
- dbglogfile << "wrote " << ret << " bytes to fd #" << fd
- << " expected " << nbytes << endl;
+ if (_debug) {
+ dbglogfile << "wrote " << ret << " bytes to fd #" << fd
+ << " expected " << nbytes << endl;
+ }
// retries++;
} else {
- dbglogfile << "wrote " << ret << " bytes to fd #"
- << fd << endl;
+ if (_debug) {
+ dbglogfile << "wrote " << ret << " bytes to fd #"
+ << fd << endl;
+ }
return ret;
}
View
12 macros/boost.m4
@@ -14,7 +14,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: boost.m4,v 1.31 2007/02/25 15:45:32 nihilus Exp $
+dnl $Id: boost.m4,v 1.32 2007/03/06 18:06:13 rsavoye Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -34,9 +34,8 @@ AC_DEFUN([GNASH_PATH_BOOST],
fi ])
dnl Attempt to find the top level directory, which unfortunately has a
- dnl version number attached. At least on Debain based systems, this
+ dnl version number attached. At least on Debian based systems, this
dnl doesn't seem to get a directory that is unversioned.
-
AC_MSG_CHECKING([for the Boost Version])
if test x$cross_compiling = xno; then
if test x"$PKG_CONFIG" != x; then
@@ -132,12 +131,17 @@ dnl break
for k in ${boostnames}; do
if test -f ${ac_cv_path_boost_lib}/lib${k}.a -o -f ${ac_cv_path_boost_lib}/lib${k}.so; then
if test x"${ac_cv_path_boost_lib}" != x"/usr/lib"; then
- ac_cv_path_boost_lib="-L${ac_cv_path_boost_lib} -l${k}"
+ ac_cv_path_boost_lib="-L${ac_cv_path_boost_lib} -l${k}"
+ break
else
ac_cv_path_boost_lib="-l${k}"
+ break
fi
fi
done
+ if test -f $k/libboost_date_time.a -o $k/libboost_date_time.so; then
+ ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -lboost_date_time"
+ fi
fi
if test x"${ac_cv_path_boost_lib}" = x; then
AC_SEARCH_LIBS(cleanup_slots, ${boostnames}, [ac_cv_path_boost_lib="${LIBS}"])
View
8 macros/curl.m4
@@ -14,7 +14,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: curl.m4,v 1.13 2007/01/21 22:41:02 rsavoye Exp $
+dnl $Id: curl.m4,v 1.14 2007/03/06 18:06:13 rsavoye Exp $
AC_DEFUN([GNASH_PATH_CURL],
[
@@ -31,7 +31,7 @@ AC_DEFUN([GNASH_PATH_CURL],
])
curlconfig=""
- AC_CHECK_PROG(curlconfig, [echo], [curl-config], , ${pathlist})
+ AC_PATH_PROG(curlconfig, curl-config, ,[${pathlist}])
if test x"${curlconfig}" != "x" ; then
AC_MSG_CHECKING([for RTMP support])
rtmp=`${curlconfig} --protocols|grep -c RTMP`
@@ -48,7 +48,7 @@ AC_DEFUN([GNASH_PATH_CURL],
if test x"${ac_cv_path_curl_incl}" = x; then
AC_MSG_CHECKING([for libcurl header])
- if test x"${curlconfig}" != "x" -a x$cross_compiling = xno; then
+ if test x"${curlconfig}" != "x"; then
ac_cv_path_curl_incl=`${curlconfig} --cflags`
else
for i in $incllist; do
@@ -88,7 +88,7 @@ AC_DEFUN([GNASH_PATH_CURL],
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_curl_lib}" = x; then # {
- if test x"${curlconfig}" != "x" -a x$cross_compiling = xno; then # {
+ if test x"${curlconfig}" != "x"; then # {
ac_cv_path_curl_lib=`${curlconfig} --libs`
else # }{
AC_MSG_CHECKING([for libcurl library])
View
8 macros/ffmpeg.m4
@@ -14,7 +14,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: ffmpeg.m4,v 1.32 2007/02/21 19:18:45 tgc Exp $
+dnl $Id: ffmpeg.m4,v 1.33 2007/03/06 18:06:13 rsavoye Exp $
AC_DEFUN([GNASH_PATH_FFMPEG],
[
@@ -34,7 +34,7 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
if test x${cross_compiling} = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_incl}" = x; then
$PKG_CONFIG --exists libavcodec && ac_cv_path_ffmpeg_incl=`$PKG_CONFIG --cflags libavcodec`
- topdir=`$PKG_CONFIG --cflags-only-I libavcodec | sed -e 's:-I::' | sed -e 's: *$::'`
+ topdir=`$PKG_CONFIG --cflags-only-I libavcodec | sed -e 's:-I::g' | sed -e 's:.* /:/:' -e 's: ::g'`
fi
fi
@@ -56,6 +56,10 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
fi
else
AC_MSG_RESULT(${ac_cv_path_ffmpeg_incl})
+ if test -f $i/ffmpeg/avformat.h; then
+ AC_MSG_WARN([avformat.h not found!])
+ ac_cv_path_ffmpeg_incl=""
+ fi
fi
dnl We need LIBAVCODEC VERSION of at least 51.29.0 to get avcodec_decode_audio2
View
15 macros/gnashpkgtool.m4
@@ -14,7 +14,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: gnashpkgtool.m4,v 1.38 2007/02/11 06:21:30 rsavoye Exp $
+dnl $Id: gnashpkgtool.m4,v 1.39 2007/03/06 18:06:13 rsavoye Exp $
dnl Generic macros for finding and setting include-paths and library-path
dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS().
@@ -34,13 +34,14 @@ AC_DEFUN([GNASH_PKG_INCLUDES],
pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl Lowercase
pushdef([UPHEADER], translit([$2], [a-z./], [A-Z__]))dnl Uppercase header
- AC_ARG_ENABLE($1, AC_HELP_STRING([--enable-$1], [Enable support for $3.]), [
- case "${enableval}" in
- yes) $1=yes ;;
- no) $1=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for enable-$1 option]) ;;
- esac], $1=yes)
+dnl AC_ARG_ENABLE($1, AC_HELP_STRING([--enable-$1], [Enable support for $3.]), [
+dnl case "${enableval}" in
+dnl yes) $1=yes ;;
+dnl no) $1=no ;;
+dnl *) AC_MSG_ERROR([bad value ${enableval} for enable-$1 option]) ;;
+dnl esac], $1=yes)
+ $1=yes
if test x$4 = x; then
name=$1
else
View
6 macros/kde.m4
@@ -1,5 +1,5 @@
dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: kde.m4,v 1.26 2007/02/02 01:57:57 rsavoye Exp $
+dnl $Id: kde.m4,v 1.27 2007/03/06 18:06:13 rsavoye Exp $
AC_DEFUN([GNASH_PATH_KDE],
[
@@ -167,7 +167,7 @@ AC_DEFUN([GNASH_PATH_QT],
gnash_qt_version=""
dnl QT stores it's headers in ../lib/qt-3.3/include for example, so use libslist
dnl instead of incllist
- for i in $libslist; do
+ for i in $QTDIR $libslist $incllist; do
for j in `ls -dr $i/qt-[[0-9]].[[0-9]] 2>/dev/null`; do
if test -f $j/include/qobject.h; then
gnash_qt_topdir=$j
View
4 macros/mysql.m4
@@ -14,7 +14,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: mysql.m4,v 1.2 2007/01/09 00:43:43 rsavoye Exp $
+dnl $Id: mysql.m4,v 1.3 2007/03/06 18:06:13 rsavoye Exp $
AC_DEFUN([GNASH_PATH_MYSQL],
[
@@ -39,7 +39,7 @@ AC_DEFUN([GNASH_PATH_MYSQL],
fi
if test x"${ac_cv_prog_mconfig}" != "x" ; then
- ac_cv_path_mysql_incl=`${mconfig} --cflags`
+ ac_cv_path_mysql_incl=`${mconfig} --include`
fi
AC_MSG_CHECKING([for MySQL headers])
View
5 macros/opengl.m4
@@ -14,10 +14,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl
-dnl
-
-dnl $Id: opengl.m4,v 1.28 2007/01/09 00:43:43 rsavoye Exp $
+dnl $Id: opengl.m4,v 1.29 2007/03/06 18:06:13 rsavoye Exp $
AC_DEFUN([GNASH_PATH_OPENGL],
[
View
26 missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2004-09-07.08
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
@@ -19,8 +19,8 @@ scriptversion=2004-09-07.08
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -87,12 +87,12 @@ Supported PROGRAM values:
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Send bug reports to <bug-automake@gnu.org>."
- exit 0
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
echo "missing $scriptversion (GNU Automake)"
- exit 0
+ exit $?
;;
-*)
@@ -288,14 +288,18 @@ WARNING: \`$1' is $msg. You should only need it if
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- # <anything>.ext => <anything>.info
- file=`echo "$file" | sed 's/\.[^\.]*/.info/'`
- #file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
- echo "touch $file (cwd $PWD)"
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
View
22 mkinstalldirs
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-scriptversion=2005-02-02.21
+scriptversion=2005-06-29.22
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
@@ -12,7 +12,7 @@ scriptversion=2005-02-02.21
# <automake-patches@gnu.org>.
errstatus=0
-dirmode=""
+dirmode=
usage="\
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
@@ -103,13 +103,21 @@ esac
for file
do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ case $file in
+ /*) pathcomp=/ ;;
+ *) pathcomp= ;;
+ esac
+ oIFS=$IFS
+ IFS=/
+ set fnord $file
shift
+ IFS=$oIFS
- pathcomp=
for d
do
- pathcomp="$pathcomp$d"
+ test "x$d" = x && continue
+
+ pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
@@ -124,7 +132,7 @@ do
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
- lasterr=""
+ lasterr=
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
@@ -134,7 +142,7 @@ do
fi
fi
- pathcomp="$pathcomp/"
+ pathcomp=$pathcomp/
done
done
View
174 packaging/redhat/gnash.spec
@@ -1,38 +1,44 @@
+%define version 20070306
Name: gnash
-Version: 0.7.2
+Version: %{version}
Release: 1%{?dist}
Summary: GNU flash movie player
Group: Applications/Multimedia
+Vendor: Gnash Project
+Packager: Rob Savoye <rob@welcomehome.org>
License: GPL
URL: http://www.gnu.org/software/gnash/
Source0: http://www.gnu.org/software/gnash/releases/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}
-BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel
-BuildRequires: boost-devel curl-devel
+#AutoReqProv: no
+
+BuildRequires: libxml2 libpng libjpeg libogg
+BuildRequires: gtk2 libX11 agg
+# BuildRequires: boost curl
# the opengl devel packages are required by gtkglext-devel
# monolithic Xorg
#BuildRequires: xorg-x11-devel
# modular Xorg
#BuildRequires: libGLU-devel libGL-devel
-BuildRequires: SDL-devel
-BuildRequires: kdelibs-devel
-BuildRequires: gtkglext-devel
+#BuildRequires: gtkglext-devel
+BuildRequires: mysql mysqlclient14
+BuildRequires: SDL
+BuildRequires: kdelibs
BuildRequires: docbook2X
-BuildRequires: gstreamer-devel >= 0.10
-BuildRequires: scrollkeeper
+BuildRequires: gstreamer >= 0.10
+# BuildRequires: scrollkeeper
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
+#Requires(post): scrollkeeper
+#Requires(postun): scrollkeeper
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
%description
-Gnash is a GNU Flash movie player based on GameSWF,
-and supports many SWF v7 features.
+Gnash is a GNU Flash movie player that supports many SWF v7 features.
%package plugin
Summary: Web-client flash movie player plugin
@@ -51,40 +57,115 @@ Group: Applications/Multimedia
%description klash
The gnash flash movie player plugin for Konqueror.
+%package cygnal
+Summary: Streaming media server
+Requires: %{name} = %{version}-%{release}
+Group: Applications/Multimedia
+
+%description cygnal
+Cygnal is a streaming media server that's Flash aware.
+
%prep
%setup -q
%build
+
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-%configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
- --enable-ghelp --enable-docbook --enable-sound=GST \
- --disable-dependency-tracking --disable-rpath \
- --with-qtdir=$QTDIR
-make %{?_smp_mflags}
+# handle cross building rpms. This gets messy when building for two
+# archtectures with the same CPU type, like x86-Linux -> OLPC. We have
+# to do this because an OLPC requires RPMs to install software, but
+# doesn't have the resources to do native builds. So this hack lets us
+# build RPM packages on one host for the OLPC, or other RPM based
+# embedded distributions.
+%if %{_target_cpu} != %{_build_arch}
+%define cross_compile 1
+%else
+%define cross_compile 0
+%endif
+%{?do_cross_compile:%define cross_compile 1}
+
+%define cross_compile 1
+%define olpc 1
+
+# Build rpms for an ARM based processor, in our case the Nokia 770/800
+# tablet.
+%ifarch arm
+RPM_TARGET=%{_target}
+%endif
+# Build rpms for an OLPC, which although it's geode based, our
+# toolchain treat this as a stock i386. Our toolchain has geode
+# specific optimizations added, which was properly handled by setting
+# the vendor field of the config triplet to olpc. Since rpm has no
+# concept of a vendor other than Redhat, we force it to use the proper
+# config triplet so configure uses the correct cross compiler.
+%if %{olpc}
+%define _target_platform %{_build_cpu}-%{_build_os}-linux
+RPM_TARGET=i386-olpc-linux
+%endif
+
+%if %{cross_compile}
+# cross building an RPM. This works as long as you have a good cross
+# compiler installed. We currently do want to cross compile the
+# Mozilla plugin, but not the Konqueror one till we make KDE work
+# better than it does now.
+ CROSS_OPTS="--build=%{_host} --host=$RPM_TARGET --target=$RPM_TARGET"
+ RENDERER="--enable-renderer=agg" # could be opengl
+ %ifarch arm
+ SOUND="--disable-sound --disable-plugin --disable-klash"
+ %else
+ SOUND="--enable-sound=gst" # could also be sdl
+ %endif
+# The OLPC is a weird case, it's basically an i386-linux toolchain
+# targeted towards Fedora Core 6. The machine itself is too limited to
+# build RPMs on, so we do it this way.
+ %if olpc
+ CROSS_OPTS="$CROSS_OPTS --disable-klash"
+ SOUND="--enable-sound=gst" # could be sdl
+ %endif
+%else
+# Native RPM build
+ CROSS_OPTS="--enable-ghelp --enable-docbook"
+ SOUND="--enable-sound=sdl --with-mp3-decoder=ffmpeg"
+ RENDERER=""
+%endif
+
+# The default options for the configure aren't suitable for
+# cross configuring, so we force them to be what we know is correct.
+# export CONFIG_SHELL="sh -x"
+# sh -x ./configure \
+./configure \
+ --with-qtdir=$QTDIR \
+ $CROSS_OPTS \
+ $SOUND \
+ $RENDERER \
+ --disable-static \
+ --disable-dependency-tracking \
+ --disable-rpath \
+ --enable-extensions \
+ --prefix=%{_prefix} \
+ --with-plugindir=%{_libdir}/mozilla/plugins
+
+make CXXFLAGS="-g" dumpconfig all
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so
-rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+%if !%{cross_compile}
+rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
-
%post
/sbin/ldconfig
+%if !%{cross_compile}
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
+%endif
%preun
if [ $1 = 0 ]; then
@@ -93,21 +174,32 @@ fi
%postun
/sbin/ldconfig
+%if !%{cross_compile}
scrollkeeper-update -q || :
+%endif
%files
%defattr(-,root,root,-)
+%dump
%doc README AUTHORS COPYING NEWS
-%doc doc/C/gnash.html
-%doc doc/C/images
%{_bindir}/gnash
%{_bindir}/gparser
%{_bindir}/gprocessor
-%{_libdir}/libgnash*-*.so
-%{_mandir}/man1/gnash*
-%{_infodir}/gnash*
-%{_datadir}/gnash/
-%{_datadir}/omf/gnash/
+%{_libdir}/libgnash*.so
+%{_libdir}/gnash/plugins/*.so
+%{_libdir}/gnash/plugins/*.la
+%{_libdir}/libltdl*
+%{_prefix}/include/ltdl.h
+%{_prefix}/share/gnash/GnashG.png
+%{_prefix}/share/gnash/gnash_128_96.ico
+%{_prefix}/man/man1/gnash.1*
+%if !%{cross_compile}
+%doc doc/C/gnash.html
+%doc %{_prefix}/share/gnash/doc/gnash/C/images
+%{_datadir}/omf/gnash/gnash-C.omf
+%{_infodir}/gnash.info*.gz
+%{_prefix}/share/gnash/doc/gnash/C/*.xml
+%endif
%files plugin
%defattr(-,root,root,-)
@@ -115,13 +207,21 @@ scrollkeeper-update -q || :
%files klash
%defattr(-,root,root,-)
-%{_bindir}/klash
+%{_bindir}/gnash
+%if !%{cross_compile}
%{_libdir}/kde3/libklashpart.*
%{_datadir}/apps/klash/
-%{_datadir}/config/klashrc
%{_datadir}/services/klash_part.desktop
+%endif
+
+%files cygnal
+%defattr(-,root,root,-)
+%{_bindir}/cygnal
%changelog
+* Sat Mar 4 2007 Rob Savoye <rob@welcomehome.org> - %{version}-%{release}
+- update for OLPC release.
+
* Sat Nov 6 2006 Rob Savoye <rob@welcomehome.org> - 0.7.2-1
- update for 0.7.2 release.
View
14 packaging/redhat/rpmrc
@@ -0,0 +1,14 @@
+arch_canon: geode: i386 1
+buildarchtranslate: geode: i386
+
+os_compat: olpc: Linux
+os_canon: olpc: cross_compile 1
+buildostranslate: olpc: Linux
+
+optflags: geode cross_compile 1
+
+buildarchtranslate: geode: i386
+buildostranslate: geode: Linux
+arch_compat: geode: i386 i485 i585 i686
+os_compat: olpc: Linux
+
View
19 plugin/klash/Makefile.am
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.27 2007/02/19 02:00:56 rsavoye Exp $
+# $Id: Makefile.am,v 1.28 2007/03/06 18:06:13 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -26,6 +26,7 @@ plugindir = $(libdir)/kde3
kde_servicesdir = $(prefix)/share/services
rcdir = $(prefix)/share/apps/klash
appsdatadir = $(prefix)/share/apps/klash
+configdir = $(prefix)/share/config
plugin_LTLIBRARIES= libklashpart.la
@@ -40,11 +41,12 @@ endif
dist_kde_services_DATA = klash_part.desktop
dist_rc_DATA = klashpartui.rc
dist_appsdata_DATA = pluginsinfo
+#dist_config_DATA = klashrc
# DIST_COMMON = $(dist_appsdata_DATA) $(dist_kde_services_DATA) $(dist_rc_DATA)
-BUILT_SOURCES = klash_part.moc klash.moc
-CLEANFILES = klash_part.moc klash.moc
+BUILT_SOURCES = klash_part.moc
+CLEANFILES = klash_part.moc
klash_part.moc: $(srcdir)/klash_part.h
@if test x"$(MOC)" != x; then \
@@ -55,15 +57,6 @@ klash_part.moc: $(srcdir)/klash_part.h
ln -s $(srcdir)/klash_part.moc.in klash_part.moc; \
fi
-klash.moc: $(srcdir)/klash.cpp
- @if test x"$(MOC)" != x; then \
- echo "Generating MOC file..."; \
- $(MOC) $(srcdir)/klash.cpp -o klash.moc; \
- else \
- echo "WARNING: Install QT's moc tool! Linking to default MOC file"; \
- ln -s $(srcdir)/klash.moc.in klash.moc; \
- fi
-
install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs) "$(DESTDIR)$(plugindir)"
# cp .libs/libklashpart.so $(DESTDIR)$(plugindir)/libklashpart.so
@@ -77,3 +70,5 @@ else
all:
$echo "Building klash is disabled"
endif
+
+force:
View
4 plugin/plugin.cpp
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: plugin.cpp,v 1.71 2007/01/26 19:41:41 rsavoye Exp $ */
+/* $Id: plugin.cpp,v 1.72 2007/03/06 18:06:12 rsavoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -84,7 +84,7 @@ PR_CALLBACK Destructor(void * /* data */)
char*
NPP_GetMIMEDescription(void)
{
- return MIME_TYPES_DESCRIPTION;
+ return const_cast<char *>(MIME_TYPES_DESCRIPTION);
}
//
View
2  testsuite/Makefile.am
@@ -15,7 +15,7 @@ SUBDIRS = \
EXTRA_DIST = check.h DummyMovieDefinition.h DummyCharacter.h media
-dist_noinst_SCRIPTS = anaylse-results.sh
+dist_noinst_SCRIPTS = anaylse-results.sh generic-testrunner.sh
# could not find a way to only build this on make check
check_LTLIBRARIES = libtestsuite.la
Please sign in to comment.
Something went wrong with that request. Please try again.