[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-309-gdc3a018 |
|
Date: |
Sun, 20 Mar 2011 16:30:46 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via dc3a018fc737407ea3adac44b38d99cc4a40d788 (commit)
via ce4b3c004f13306130e41315dc8393b2ffce49d5 (commit)
via e9b7d154ad8fea6449a94e9249fb3dfffaa966a5 (commit)
via 9dbe7b2764f604ec330ab8b98852e5841f9a43d3 (commit)
via 564ad447a835a767b2158cbb6044815a3075d1ff (commit)
from eab9124895eebb47e66229b6a4b3d6505ea765cc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=dc3a018fc737407ea3adac44b38d99cc4a40d788
commit dc3a018fc737407ea3adac44b38d99cc4a40d788
Author: Bastiaan Jacques <address@hidden>
Date: Sun Mar 20 17:21:04 2011 +0100
Remove stray endif.
diff --git a/Makefile.am b/Makefile.am
index 20941fe..ab75502 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -376,7 +376,6 @@ endif
if BUILD_GTK_GUI
@echo " Supported GUI: GTK"
endif
-endif
if BUILD_DUMP_GUI
@echo " Supported GUI: Dump"
endif
http://git.savannah.gnu.org/cgit//commit/?id=ce4b3c004f13306130e41315dc8393b2ffce49d5
commit ce4b3c004f13306130e41315dc8393b2ffce49d5
Author: Bastiaan Jacques <address@hidden>
Date: Sun Mar 20 17:06:08 2011 +0100
Don't pretent XV is still included.
diff --git a/Makefile.am b/Makefile.am
index 8997ab4..20941fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -374,9 +374,6 @@ if BUILD_SSH
@echo " SSH_LIBS is $(SSH_LIBS)"
endif
if BUILD_GTK_GUI
-if HAVE_XV
- @echo " Supported GUI: GTK (+XVideo)"
-else
@echo " Supported GUI: GTK"
endif
endif
http://git.savannah.gnu.org/cgit//commit/?id=e9b7d154ad8fea6449a94e9249fb3dfffaa966a5
commit e9b7d154ad8fea6449a94e9249fb3dfffaa966a5
Author: Bastiaan Jacques <address@hidden>
Date: Sun Mar 20 17:04:04 2011 +0100
Drop defunct ALP macro and tidy up in configure.ac.
diff --git a/configure.ac b/configure.ac
index 05fad51..15e0187 100644
--- a/configure.ac
+++ b/configure.ac
@@ -562,8 +562,6 @@ build_fb=no dnl Raw framebuffer
build_fltk=no
build_sdl=no
build_aqua=no dnl Native MacOSX
-build_hildon=no dnl Native LIMO
-build_alp=no dnl Acess Linux Platform using Hiker
build_dump=no
AC_ARG_ENABLE(gui,
AC_HELP_STRING([--enable-gui=], [Enable support for the specified GUI
toolkits (default=gtk,kde4)]),
@@ -1618,15 +1616,7 @@ dnl Verify dependencies for requested GUIs are met, and
dnl disable build of the GUIS for which deps are NOT met
dnl ------------------------------------------------------------
-dnl Look for scratchbox (used in GNASH_PATH_ALP)
-dnl FIXME: move it in macros/alp.m4 or at least after
-dnl the build_alp conditional ?
-sbox=no
-if test x"${SBOX_REDIRECT_FROM_DIRS}" != x; then
- sbox=yes
-fi
-
-if test x$build_gtk = xyes -o $build_alp = xyes; then
+if test x$build_gtk = xyes; then
GNASH_PATH_GTK2
GNASH_PATH_PANGO
GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init,
[1.0])
diff --git a/macros/alp.m4 b/macros/alp.m4
deleted file mode 100644
index 160c2fd..0000000
--- a/macros/alp.m4
+++ /dev/null
@@ -1,81 +0,0 @@
- dnl
-dnl Copyright (C) 2005, 2006, 2009, 2010 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
-dnl the Free Software Foundation; either version 3 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-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
-
-AC_DEFUN([GNASH_PATH_ALP],
-[
-
- dnl See if we're running under scratchbox, specifically ALP
- BARTENDER=
- ALP_CFLAGS=
- ALP_LIBS=
- have_alp=no
-
- if test x"$sbox" = xyes; then
- dnl Look for Alp
- for i in $incllist; do
- if test -f $i/alp/bundlemgr.h; then
- ac_cv_path_alp_incl="-I$i"
- alp=yes
- break
- fi
- done
-
- ac_cv_path_alp_lib=""
- newlist="/opt/alp/lib /opt/alp/lib/tmp ${incllist}"
- for i in $newlist; do
- if test -f $i/libalp_bundlemgr.a -o -f $i/libalp_bundlemgr.${shlibext};
then
- ac_cv_path_alp_lib="-L$i -lalp_bundlemgr ${ac_cv_path_alp_lib}"
- break
- fi
- done
- for i in $newlist; do
- if test -f $i/libalp_appmgr.a -o -f $i/libalp_appmgr.${shlibext}; then
- ac_cv_path_alp_lib="${ac_cv_path_alp_lib} -lalp_appmgr"
- break
- fi
- done
- for i in $newlist; do
- if test -f $i/alp_max.a -o -f $i/alp_max.${shlibext}; then
- ac_cv_path_alp_lib="${ac_cv_path_alp_lib} -lalp_max"
- break
- fi
- done
- fi
-
- if test -f ${_SBOX_DIR}/tools/bin/bartender; then
- BARTENDER=${_SBOX_DIR}/tools/bin/bartender
- fi
-
- if test x"${ac_cv_path_alp_incl}" != x; then
- ALP_CFLAGS="${ac_cv_path_alp_incl}"
- fi
-
- if test x"${ac_cv_path_alp_lib}" != x; then
- ALP_LIBS="${ac_cv_path_alp_lib}"
- AC_DEFINE(HAVE_ALP, [1], [has the ALP/Hiker mobile framework])
- have_alp=yes
- fi
-
- AC_SUBST(BARTENDER)
- AC_SUBST(ALP_CFLAGS)
- AC_SUBST(ALP_LIBS)
-])
-
-# Local Variables:
-# c-basic-offset: 2
-# tab-width: 2
-# indent-tabs-mode: nil
-# End:
http://git.savannah.gnu.org/cgit//commit/?id=9dbe7b2764f604ec330ab8b98852e5841f9a43d3
commit 9dbe7b2764f604ec330ab8b98852e5841f9a43d3
Author: Bastiaan Jacques <address@hidden>
Date: Sun Mar 20 17:01:43 2011 +0100
Revert "Drop defunct macros."
This reverts commit 564ad447a835a767b2158cbb6044815a3075d1ff.
diff --git a/macros/alp.m4 b/macros/alp.m4
new file mode 100644
index 0000000..160c2fd
--- /dev/null
+++ b/macros/alp.m4
@@ -0,0 +1,81 @@
+ dnl
+dnl Copyright (C) 2005, 2006, 2009, 2010 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
+dnl the Free Software Foundation; either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+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
+
+AC_DEFUN([GNASH_PATH_ALP],
+[
+
+ dnl See if we're running under scratchbox, specifically ALP
+ BARTENDER=
+ ALP_CFLAGS=
+ ALP_LIBS=
+ have_alp=no
+
+ if test x"$sbox" = xyes; then
+ dnl Look for Alp
+ for i in $incllist; do
+ if test -f $i/alp/bundlemgr.h; then
+ ac_cv_path_alp_incl="-I$i"
+ alp=yes
+ break
+ fi
+ done
+
+ ac_cv_path_alp_lib=""
+ newlist="/opt/alp/lib /opt/alp/lib/tmp ${incllist}"
+ for i in $newlist; do
+ if test -f $i/libalp_bundlemgr.a -o -f $i/libalp_bundlemgr.${shlibext};
then
+ ac_cv_path_alp_lib="-L$i -lalp_bundlemgr ${ac_cv_path_alp_lib}"
+ break
+ fi
+ done
+ for i in $newlist; do
+ if test -f $i/libalp_appmgr.a -o -f $i/libalp_appmgr.${shlibext}; then
+ ac_cv_path_alp_lib="${ac_cv_path_alp_lib} -lalp_appmgr"
+ break
+ fi
+ done
+ for i in $newlist; do
+ if test -f $i/alp_max.a -o -f $i/alp_max.${shlibext}; then
+ ac_cv_path_alp_lib="${ac_cv_path_alp_lib} -lalp_max"
+ break
+ fi
+ done
+ fi
+
+ if test -f ${_SBOX_DIR}/tools/bin/bartender; then
+ BARTENDER=${_SBOX_DIR}/tools/bin/bartender
+ fi
+
+ if test x"${ac_cv_path_alp_incl}" != x; then
+ ALP_CFLAGS="${ac_cv_path_alp_incl}"
+ fi
+
+ if test x"${ac_cv_path_alp_lib}" != x; then
+ ALP_LIBS="${ac_cv_path_alp_lib}"
+ AC_DEFINE(HAVE_ALP, [1], [has the ALP/Hiker mobile framework])
+ have_alp=yes
+ fi
+
+ AC_SUBST(BARTENDER)
+ AC_SUBST(ALP_CFLAGS)
+ AC_SUBST(ALP_LIBS)
+])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
http://git.savannah.gnu.org/cgit//commit/?id=564ad447a835a767b2158cbb6044815a3075d1ff
commit 564ad447a835a767b2158cbb6044815a3075d1ff
Author: Bastiaan Jacques <address@hidden>
Date: Sun Mar 20 17:00:57 2011 +0100
Drop defunct macros.
diff --git a/macros/alp.m4 b/macros/alp.m4
deleted file mode 100644
index 160c2fd..0000000
--- a/macros/alp.m4
+++ /dev/null
@@ -1,81 +0,0 @@
- dnl
-dnl Copyright (C) 2005, 2006, 2009, 2010 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
-dnl the Free Software Foundation; either version 3 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-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
-
-AC_DEFUN([GNASH_PATH_ALP],
-[
-
- dnl See if we're running under scratchbox, specifically ALP
- BARTENDER=
- ALP_CFLAGS=
- ALP_LIBS=
- have_alp=no
-
- if test x"$sbox" = xyes; then
- dnl Look for Alp
- for i in $incllist; do
- if test -f $i/alp/bundlemgr.h; then
- ac_cv_path_alp_incl="-I$i"
- alp=yes
- break
- fi
- done
-
- ac_cv_path_alp_lib=""
- newlist="/opt/alp/lib /opt/alp/lib/tmp ${incllist}"
- for i in $newlist; do
- if test -f $i/libalp_bundlemgr.a -o -f $i/libalp_bundlemgr.${shlibext};
then
- ac_cv_path_alp_lib="-L$i -lalp_bundlemgr ${ac_cv_path_alp_lib}"
- break
- fi
- done
- for i in $newlist; do
- if test -f $i/libalp_appmgr.a -o -f $i/libalp_appmgr.${shlibext}; then
- ac_cv_path_alp_lib="${ac_cv_path_alp_lib} -lalp_appmgr"
- break
- fi
- done
- for i in $newlist; do
- if test -f $i/alp_max.a -o -f $i/alp_max.${shlibext}; then
- ac_cv_path_alp_lib="${ac_cv_path_alp_lib} -lalp_max"
- break
- fi
- done
- fi
-
- if test -f ${_SBOX_DIR}/tools/bin/bartender; then
- BARTENDER=${_SBOX_DIR}/tools/bin/bartender
- fi
-
- if test x"${ac_cv_path_alp_incl}" != x; then
- ALP_CFLAGS="${ac_cv_path_alp_incl}"
- fi
-
- if test x"${ac_cv_path_alp_lib}" != x; then
- ALP_LIBS="${ac_cv_path_alp_lib}"
- AC_DEFINE(HAVE_ALP, [1], [has the ALP/Hiker mobile framework])
- have_alp=yes
- fi
-
- AC_SUBST(BARTENDER)
- AC_SUBST(ALP_CFLAGS)
- AC_SUBST(ALP_LIBS)
-])
-
-# Local Variables:
-# c-basic-offset: 2
-# tab-width: 2
-# indent-tabs-mode: nil
-# End:
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 4 ---
configure.ac | 12 +--------
macros/alp.m4 | 81 ---------------------------------------------------------
3 files changed, 1 insertions(+), 96 deletions(-)
delete mode 100644 macros/alp.m4
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-309-gdc3a018,
Bastiaan Jacques <=