CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 08/01/16 00:42:56
Modified files:
plugin : Makefile.am
macros : nls.m4 lib-link.m4 boost.m4
packaging/debian: rules
packaging/redhat: gnash.spec
. : ChangeLog
Log message:
* plugin/Makefile.am: Add install-plugin target. Don't do
anything for just the install target.
* packaging/debian/rules: Add install-plugin.
* packaging/redhat/gnash.spec: Add install-plugin.
* macros/boost.m4: Change the sed pattern to always remove the
suffix correctly. Fixes #21977.
* macros/lib-link.m4, nls.m4: Remove usages of AC_CONFIG_AUX_DIR
macro, as we don't use an aux dir.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/nls.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/lib-link.m4?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/debian/rules?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/redhat/gnash.spec?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5404&r2=1.5405
Patches:
Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- plugin/Makefile.am 5 Jan 2008 01:27:01 -0000 1.65
+++ plugin/Makefile.am 16 Jan 2008 00:42:55 -0000 1.66
@@ -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.65 2008/01/05 01:27:01 strk Exp $
+# $Id: Makefile.am,v 1.66 2008/01/16 00:42:55 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -91,5 +91,21 @@
else
libgnashplugin_la_LDFLAGS = -module -avoid-version -L$(plugindir)
endif
-
endif
+
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ @echo "Nothing to install here now."
+ @echo "Use \"make install-plugin\" to install the Firefox plugin to
$(DESTDIR)$(plugindir)."
+
+install-plugin: $(plugin_LTLIBRARIES)
+ @test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs)
"$(DESTDIR)$(plugindir)"
+ @echo "Installing plugin to $(DESTDIR)$(plugindir)"
+ @if test -d .libs; then \
+ cp -f .libs/libgnashplugin.so
$(DESTDIR)$(plugindir)/libgnashplugin.so; \
+ else \
+ cp -f libgnashplugin.so $(DESTDIR)$(plugindir)/libgnashplugin.so; \
+ fi
+
+uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ $(RM) -f $(DESTDIR)$(plugindir)/libgnashplugin.so
+
Index: macros/nls.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/nls.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/nls.m4 6 Apr 2007 07:49:55 -0000 1.1
+++ macros/nls.m4 16 Jan 2008 00:42:55 -0000 1.2
@@ -33,17 +33,11 @@
AC_DEFUN([AM_MKINSTALLDIRS],
[
dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing.
- m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])])
+ AC_PATH_PROG(MKINSTALLDIRS, mkinstalldirs, ,[${pathlist}])
dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
dnl Try to locate it.
MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- case "$ac_aux_dir" in
- /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
- *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
- esac
- fi
if test -z "$MKINSTALLDIRS"; then
MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
fi
Index: macros/lib-link.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/lib-link.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/lib-link.m4 24 Nov 2007 16:47:10 -0000 1.3
+++ macros/lib-link.m4 16 Jan 2008 00:42:55 -0000 1.4
@@ -95,15 +95,14 @@
dnl hardcode_direct, hardcode_minus_L.
AC_DEFUN([AC_LIB_RPATH],
[
- dnl Tell automake >= 1.10 to complain if config.rpath is missing.
- m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+ AC_PATH_PROG(CONFIG_RPATH, config.rpath)
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
AC_REQUIRE([AC_PROG_LD]) dnl we use $LD, $with_gnu_ld
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
- AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+ ac_aux_dir=$srcdir
AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld"
\
- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ ${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$host" > conftest.sh
. ./conftest.sh
rm -f ./conftest.sh
acl_cv_rpath=done
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- macros/boost.m4 7 Jan 2008 21:30:38 -0000 1.73
+++ macros/boost.m4 16 Jan 2008 00:42:55 -0000 1.74
@@ -14,7 +14,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 $Id: boost.m4,v 1.73 2008/01/07 21:30:38 strk Exp $
+dnl $Id: boost.m4,v 1.74 2008/01/16 00:42:55 rsavoye Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -129,7 +129,7 @@
for j in ${boost_libs}; do
dirs="`ls -dr $i/libboost_${j}*.${shlibext} $i/libboost_${j}*.a
2>/dev/null`"
if test -n "${dirs}"; then
- libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e 's:\..*$::'`"
+ libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::"
-e "s:\.a::"`"
if test x$dirname = x; then
dirname="`echo ${dirs} | sed -e 's:/libboost.*$::'`"
if test x"${dirname}" != "x/usr/lib"; then
@@ -145,7 +145,7 @@
for j in ${extra_boost_libs}; do
dirs="`ls -dr ${dirname}/libboost_${j}*.${shlibext}
${dirname}/libboost_${j}*.a 2>/dev/null`"
if test -n "${dirs}"; then
- libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e 's:\..*$::'`"
+ libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::"
-e "s:\.a::"`"
ac_cv_path_boost_extra_lib="${ac_cv_path_boost_extra_lib} -l${libname}"
else
extra_missing_libs="${extra_missing_libs} $j"
Index: packaging/debian/rules
===================================================================
RCS file: /sources/gnash/gnash/packaging/debian/rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- packaging/debian/rules 21 Apr 2006 22:55:05 -0000 1.2
+++ packaging/debian/rules 16 Jan 2008 00:42:55 -0000 1.3
@@ -102,7 +102,7 @@
install -d $(CURDIR)/debian/tmp/usr/lib
install -d $(CURDIR)/debian/tmp/usr/lib/mozilla/plugins/
install -d $(CURDIR)/debian/tmp/usr/include/gnash
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) install install-plugin DESTDIR=$(CURDIR)/debian/tmp
# CREATE PACKAGES
Index: packaging/redhat/gnash.spec
===================================================================
RCS file: /sources/gnash/gnash/packaging/redhat/gnash.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- packaging/redhat/gnash.spec 7 Apr 2007 11:55:50 -0000 1.16
+++ packaging/redhat/gnash.spec 16 Jan 2008 00:42:55 -0000 1.17
@@ -1,4 +1,4 @@
-%define version 20070328
+%define version 20080104
Name: gnash
Version: cvs%{version}
Release: 1%{?dist}
@@ -96,16 +96,6 @@
%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
@@ -115,7 +105,7 @@
CROSS_OPTS="--build=%{_host} --host=$RPM_TARGET --target=$RPM_TARGET"
RENDERER="--enable-renderer=agg" # could be opengl
%ifarch arm
- SOUND="--disable-media --disable-plugin --disable-klash"
+ SOUND="--enable-media=none --disable-nsapi --disable-kparts"
%else
SOUND="--enable-media=gst" # could also be sdl
%endif
@@ -123,8 +113,9 @@
# 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 --disable-menus"
- SOUND="--enable-media=mad --disable-static"
+ CROSS_OPTS="$CROSS_OPTS --disable-kparts --disable-menus"
+ SOUND="--enable-media=ffmpeg"
+ GUI="--enable-gui=gtk"
RENDERER="$RENDERER --with-pixelformat=RGB565"
%endif
%else
@@ -139,33 +130,35 @@
# export CONFIG_SHELL="sh -x"
# sh -x ./configure \
%if %{cross_compile}
-%configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
+%configure --enable-static \
$CROSS_OPTS \
- $SOUND \
+ $SOUND $GUI \
$RENDERER \
--disable-dependency-tracking --disable-rpath \
--with-plugindir=%{_libdir}/mozilla/plugins
-make %{?_smp_mflags} CXXFLAGS="-g" dumpconfig all
+make %{?_smp_mflags} dumpconfig all
%else
./configure \
--with-qtdir=$QTDIR \
$CROSS_OPTS \
$SOUND \
$RENDERER \
- --disable-static \
+ --enable-static \
+ --enable-shared \
--disable-dependency-tracking \
--disable-rpath \
- --enable-extensions \
+ --disable-cygnal \
--prefix=%{_prefix} \
--with-plugindir=%{_libdir}/mozilla/plugins
-make CXXFLAGS="-g" dumpconfig all
+make dumpconfig all
%endif
%install
+strip gui/.libs/*-gnash utilities/.libs/dumpshm utilities/.libs/g*
utilities/.libs/soldumper
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install install-plugin DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/*.la
%if !%{cross_compile}
rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
@@ -200,6 +193,8 @@
%{_bindir}/gnash
%{_bindir}/gparser
%{_bindir}/gprocessor
+%{_bindir}/soldumper
+%{_bindir}/dumpshm
%{_libdir}/libgnash*.so
%{_libdir}/mozilla/plugins/*.so
%{_libdir}/libltdl*
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5404
retrieving revision 1.5405
diff -u -b -r1.5404 -r1.5405
--- ChangeLog 15 Jan 2008 14:58:14 -0000 1.5404
+++ ChangeLog 16 Jan 2008 00:42:55 -0000 1.5405
@@ -1,3 +1,14 @@
+2008-01-15 Rob Savoye <[EMAIL PROTECTED]>
+
+ * plugin/Makefile.am: Add install-plugin target. Don't do
+ anything for just the install target.
+ * packaging/debian/rules: Add install-plugin.
+ * packaging/redhat/gnash.spec: Add install-plugin.
+ * macros/boost.m4: Change the sed pattern to always remove the
+ suffix correctly. Fixes #21977.
+ * macros/lib-link.m4, nls.m4: Remove usages of AC_CONFIG_AUX_DIR
+ macro, as we don't use an aux dir.
+
2008-01-15 Sandro Santilli <[EMAIL PROTECTED]>
* libamf/: element.{cpp,h}, lcshm.{cpp,h}, sol.{cpp,h},
@@ -474,7 +485,12 @@
* server/asobj/LocalConnection.{cpp,h}: Use boost::uint8_t
instead of char *.
+<<<<<<< ChangeLog
+
+ * po/Makefile.am: Make the directories before trying to install in
+=======
* po/Makefile.am: Make the dircetories before trying to install in
+>>>>>>> 1.5396
them.
* testsuite/libamf.all/test_lc.cpp: New test for LocalConnection
base class.
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
