# HG changeset patch
# User melunko
# Date 1161399247 -3600
# Node ID a6559a231dd2ce09f6151a09c26d4823b2cd2233
# Parent a615ba8f8804b8e8f63064b926b7daef83fa53f9
[svn r37] Added gstreamer-plugins-base-0.10 dependence to configure.ac (gst interfaces). Fixed debian package removing maemo dependencies and renamed package to gmyth instead of mmyth
diff -r a615ba8f8804 -r a6559a231dd2 gmyth/ChangeLog
--- a/gmyth/ChangeLog Fri Oct 20 22:48:04 2006 +0100
+++ b/gmyth/ChangeLog Sat Oct 21 03:54:07 2006 +0100
@@ -16,7 +16,7 @@
(configure.ac, Makefile.am) - some autotools misusage fixed.
* Added the MythURI structure, and the URI parsing utility functions
(missing in the GLib).
- * Some functions were exported (myth_socket, mmyth_context), that's
+ * Some functions were exported (myth_socket, gmyth_context), that's
why many ther modules need to use them.
* Fixed some library dependencies.
* Prepared to be used inside the GStreamer (linking with the MythTV
diff -r a615ba8f8804 -r a6559a231dd2 gmyth/configure.ac
--- a/gmyth/configure.ac Fri Oct 20 22:48:04 2006 +0100
+++ b/gmyth/configure.ac Sat Oct 21 03:54:07 2006 +0100
@@ -140,7 +140,7 @@
AC_SUBST(GST_CFLAGS)
AC_SUBST(GST_LIBS)
-# check for gstreamer-base plugins (xoverlay interface)
+# check for gstreamer-base
GSTBASE_REQUIRED=0.10
GSTBASE_MAJORMINOR=0.10
PKG_CHECK_MODULES(GSTBASE, \
@@ -156,9 +156,35 @@
AC_SUBST(GSTBASE_CFLAGS)
AC_SUBST(GSTBASE_LIBS)
+# check for gstreamer-base plugins (xoverlay interface)
+GSTPLUGINSBASE_REQUIRED=0.10
+GSTPLUGINSBASE_MAJORMINOR=0.10
+PKG_CHECK_MODULES(GSTPLUGINSBASE, \
+ gstreamer-plugins-base-$GSTPLUGINSBASE_MAJORMINOR >= $GSTPLUGINSBASE_REQUIRED,
+ HAVE_GSTPLUGINSBASE=yes, HAVE_GSTPLUGINSBASE=no)
+
+# Give error and exit if we don't have gstreamer base libraries
+if test "x$HAVE_GSTPLUGINSBASE" = "xno"; then
+ AC_MSG_ERROR(you need gstreamer plugins base development packages installed !)
+fi
+
+# make GSTPLUGINSBASE_CFLAGS and GSTPLUGINSBASE_LIBS available
+AC_SUBST(GSTPLUGINSBASE_CFLAGS)
+AC_SUBST(GSTPLUGINSBASE_LIBS)
+
# make GST_MAJORMINOR available in Makefile.am
AC_SUBST(GST_MAJORMINOR)
+GSTBASE_MAJORMINOR=0.10
+PKG_CHECK_MODULES(GSTBASE, \
+ gstreamer-base-$GSTBASE_MAJORMINOR >= $GSTBASE_REQUIRED,
+ HAVE_GSTBASE=yes, HAVE_GSTBASE=no)
+
+# Give error and exit if we don't have gstreamer base libraries
+if test "x$HAVE_GSTBASE" = "xno"; then
+ AC_MSG_ERROR(you need gstreamer base development packages installed !)
+fi
+
#
# mysql libraries
diff -r a615ba8f8804 -r a6559a231dd2 gmyth/debian/changelog
--- a/gmyth/debian/changelog Fri Oct 20 22:48:04 2006 +0100
+++ b/gmyth/debian/changelog Sat Oct 21 03:54:07 2006 +0100
@@ -1,4 +1,4 @@
-mmyth (0.1-indt1) unstable; urgency=low
+gmyth (0.1-indt1) unstable; urgency=low
* Initial Maemo Package.
diff -r a615ba8f8804 -r a6559a231dd2 gmyth/debian/control
--- a/gmyth/debian/control Fri Oct 20 22:48:04 2006 +0100
+++ b/gmyth/debian/control Sat Oct 21 03:54:07 2006 +0100
@@ -1,14 +1,13 @@
-Source: mmyth
+Source: gmyth
Section: user/accessories
Priority: optional
Maintainer: Hallyson Melo <hallyson.melo@indt.org.br>
Build-Depends: debhelper, libgtk2.0-dev (>= 2.4.0),
- libosso-dev, hildon-libs-dev, hildon-fm-dev
Standards-Version: 3.6.2
-Package: mmyth
+Package: gmyth
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, maemo-select-menu-location
+Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: MythTV
Description: MythTV frontend
NONONONONONONONONONONONONONONONONO
diff -r a615ba8f8804 -r a6559a231dd2 gmyth/debian/control.in
--- a/gmyth/debian/control.in Fri Oct 20 22:48:04 2006 +0100
+++ b/gmyth/debian/control.in Sat Oct 21 03:54:07 2006 +0100
@@ -1,14 +1,13 @@
-Source: mmyth
+Source: gmyth
Section: user/accessories
Priority: optional
Maintainer: Hallyson Melo <hallyson.melo@indt.org.br>
Build-Depends: debhelper, libgtk2.0-dev (>= 2.4.0),
- libosso-dev, hildon-libs-dev, hildon-fm-dev
Standards-Version: 3.6.2
-Package: mmyth
+Package: gmyth
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, maemo-select-menu-location
+Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: MythTV
Description: MythTV frontend
NONONONONONONONONONONONONONONONONO
diff -r a615ba8f8804 -r a6559a231dd2 gmyth/debian/mmyth.desktop
--- a/gmyth/debian/mmyth.desktop Fri Oct 20 22:48:04 2006 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.1
-Type=Application
-Name=Maemo Myth
-Exec=/usr/bin/mmyth
-Terminal=false
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-StartupWMClass=mmyth
diff -r a615ba8f8804 -r a6559a231dd2 gmyth/debian/mmyth.dirs
--- a/gmyth/debian/mmyth.dirs Fri Oct 20 22:48:04 2006 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-usr/share/pixmaps
-usr/share/applications/hildon
-usr/share/dbus-1/services
diff -r a615ba8f8804 -r a6559a231dd2 gmyth/debian/mmyth.postinst
--- a/gmyth/debian/mmyth.postinst Fri Oct 20 22:48:04 2006 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-maemo-select-menu-location mmyth.desktop tana_fi_extras
-
-exit 0
diff -r a615ba8f8804 -r a6559a231dd2 gmyth/debian/mmyth.service
--- a/gmyth/debian/mmyth.service Fri Oct 20 22:48:04 2006 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.nokia.xournal
-Exec=/usr/bin/xournal
diff -r a615ba8f8804 -r a6559a231dd2 gmyth/debian/rules
--- a/gmyth/debian/rules Fri Oct 20 22:48:04 2006 +0100
+++ b/gmyth/debian/rules Sat Oct 21 03:54:07 2006 +0100
@@ -8,8 +8,8 @@
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr
-binary-install/mmyth::
-# /usr/bin/install -p -m 644 debian/mmyth.png `pwd`/debian/mmyth/usr/share/pixmaps
- /usr/bin/install -p -m 644 debian/mmyth.desktop `pwd`/debian/mmyth/usr/share/applications/hildon
+#binary-install/gmyth::
+# /usr/bin/install -p -m 644 debian/gmyth.png `pwd`/debian/gmyth/usr/share/pixmaps
+# /usr/bin/install -p -m 644 debian/mmyth.desktop `pwd`/debian/mmyth/usr/share/applications/hildon
# /usr/bin/install -p -m 644 debian/mmyth.service `pwd`/debian/mmyth/usr/share/dbus-1/services
diff -r a615ba8f8804 -r a6559a231dd2 gmyth/src/Makefile.am
--- a/gmyth/src/Makefile.am Fri Oct 20 22:48:04 2006 +0100
+++ b/gmyth/src/Makefile.am Sat Oct 21 03:54:07 2006 +0100
@@ -22,6 +22,7 @@
$(GOBJECT_CFLAGS) \
$(GST_CFLAGS) \
$(GSTBASE_CFLAGS) \
+ $(GSTPLUGINSBASE_CFLAGS) \
$(MYSQL_CFLAGS) \
-g3 -O0
@@ -30,10 +31,10 @@
libgmyth_la_LDFLAGS = \
-export-dynamic \
- -lgstinterfaces-0.10 \
$(MYSQL_LIBS) \
$(GST_LIBS) \
- $(GSTBASE_LIBS)
+ $(GSTBASE_LIBS) \
+ $(GSTPLUGINS_LIBS)
libgmyth_includedir = \
$(pkgincludedir)
diff -r a615ba8f8804 -r a6559a231dd2 gmyth/src/gmyth_settings.c
--- a/gmyth/src/gmyth_settings.c Fri Oct 20 22:48:04 2006 +0100
+++ b/gmyth/src/gmyth_settings.c Sat Oct 21 03:54:07 2006 +0100
@@ -7,7 +7,7 @@
* user and program settings.
*
* The standard settings file is created in the user home folder, in the
- * file ~/.mmyth/settings.dat.
+ * file ~/.gmyth/settings.dat.
*
* Copyright (C) 2006 INdT - Instituto Nokia de Tecnologia.
* @author Alexsandro Jose Virginio dos Santos <alexsandro.santos@indt.org.br>
@@ -41,7 +41,7 @@
#include <glib/gstdio.h>
#define GMYTH_SETTINGS_FILE_NAME "settings.dat"
-#define GMYTH_SETTINGS_DIR ".mmyth"
+#define GMYTH_SETTINGS_DIR ".gmyth"
static void gmyth_settings_class_init (GMythSettingsClass *klass);
static void gmyth_settings_init (GMythSettings *object);
@@ -198,7 +198,7 @@
}
/** Loads the GMyth settings from the standard settings file
- * (~/.mmyth/settings.dat).
+ * (~/.gmyth/settings.dat).
*
* @param gmyth_settings the GMythSettings instance.
* @return TRUE if success, FALSE if error.
diff -r a615ba8f8804 -r a6559a231dd2 gmyth/src/gmyth_settings.h
--- a/gmyth/src/gmyth_settings.h Fri Oct 20 22:48:04 2006 +0100
+++ b/gmyth/src/gmyth_settings.h Sat Oct 21 03:54:07 2006 +0100
@@ -7,7 +7,7 @@
* user and program settings.
*
* The standard settings file is created in the user home folder, in the
- * file ~/.mmyth/settings.dat.
+ * file ~/.gmyth/settings.dat.
*
* Copyright (C) 2006 INdT - Instituto Nokia de Tecnologia.
* @author Alexsandro Jose Virginio dos Santos <alexsandro.santos@indt.org.br>