Permalink
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...
1 parent 4a56d8b commit 8b973b4e783708f8ecbc0602e55c134508e8ed08 rsavoye committed Mar 6, 2007
View
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,22 +106,27 @@ Network::operator = (Network &net)
bool
Network::createServer(void)
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
return createServer(DEFAULTPORT);
}
bool
Network::createServer(short port)
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
struct protoent *ppe;
struct sockaddr_in sock_in;
int on, type;
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,15 +221,15 @@ Network::createServer(short port)
bool
Network::newConnection(void)
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
return newConnection(true);
}
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;
}
Oops, something went wrong.

0 comments on commit 8b973b4

Please sign in to comment.