1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gmyth-upnp/ChangeLog Wed Jan 10 20:32:11 2007 +0000
1.3 @@ -0,0 +1,24 @@
1.4 +2006-08-17 Rosfran Borges <rosfran.borges@indt.org.br>
1.5 + * Added the correct gstreamer-base package (GSTBASE) at the configure.ac;
1.6 + GSTBASE_CFLAGS and GSTBASE_LIBS variables had the same values from
1.7 + the GST_CFLAGS/GST_LIBS.
1.8 +
1.9 +2006-08-16 Rosfran Borges <rosfran.borges@indt.org.br>
1.10 + * Fixed some installation issues, regarding lib-installing to the
1.11 + correct directory, and copying the header files to the destination
1.12 + dir (make install).
1.13 + * Put 'pkg-config' resource to the Maemo Myth library. The name of the
1.14 + PKG-CONFIG resource is 'maemo-myth', plus the minor and major version.
1.15 + Actually, the version is '0.1', so the library config file is:
1.16 + 'maemo-myth-0.1.pc'. You can type: 'pkg-config --cflags --libs
1.17 + maemo-myth-0.1'.
1.18 + * Many adjustments in the automake/autoconf configuration files
1.19 + (configure.ac, Makefile.am) - some autotools misusage fixed.
1.20 + * Added the MythURI structure, and the URI parsing utility functions
1.21 + (missing in the GLib).
1.22 + * Some functions were exported (myth_socket, gmyth_context), that's
1.23 + why many ther modules need to use them.
1.24 + * Fixed some library dependencies.
1.25 + * Prepared to be used inside the GStreamer (linking with the MythTV
1.26 + plug-in).
1.27 +
2.1 --- a/gmyth-upnp/Makefile.am Wed Jan 10 17:19:50 2007 +0000
2.2 +++ b/gmyth-upnp/Makefile.am Wed Jan 10 20:32:11 2007 +0000
2.3 @@ -1,12 +1,12 @@
2.4 SUBDIRS= src
2.5
2.6 ### all of the standard pc files we need to generate
2.7 -pcfiles = gmyth-@GMYTH_MAJORMINOR@.pc
2.8 +pcfiles = gmyth-upnp.pc
2.9
2.10 all-local: $(pcfiles)
2.11
2.12 ### how to generate pc files
2.13 -%-@GMYTH_MAJORMINOR@.pc: %.pc
2.14 +%.pc: %.pc
2.15 cp $< $@
2.16
2.17 pkgconfigdir = $(libdir)/pkgconfig
3.1 --- a/gmyth-upnp/autogen.sh Wed Jan 10 17:19:50 2007 +0000
3.2 +++ b/gmyth-upnp/autogen.sh Wed Jan 10 20:32:11 2007 +0000
3.3 @@ -2,7 +2,7 @@
3.4 # Run this to generate all the initial makefiles, etc.
3.5
3.6 DIE=0
3.7 -package=gmyth
3.8 +package=gmyth-upnp
3.9 srcfile=configure.ac
3.10
3.11 # a quick cvs co if necessary to alleviate the pain - may remove this
4.1 --- a/gmyth-upnp/configure.ac Wed Jan 10 17:19:50 2007 +0000
4.2 +++ b/gmyth-upnp/configure.ac Wed Jan 10 20:32:11 2007 +0000
4.3 @@ -34,33 +34,17 @@
4.4 DX_XML_FEATURE(OFF)
4.5 DX_PDF_FEATURE(OFF)
4.6 DX_PS_FEATURE(OFF)
4.7 -DX_INIT_DOXYGEN(gmyth, doxygen.cfg, docs)
4.8 +DX_INIT_DOXYGEN(gmyth-upnp, doxygen.cfg, docs)
4.9
4.10 # Checks for libraries.
4.11
4.12 -## Check for gmyth-0.1
4.13 -PKG_CHECK_MODULES(LIBGMYTH, gmyth-0.1, HAVE_LIBGMYTH=yes,HAVE_LIBGMYTH=no)
4.14 -
4.15 -# Give error and exit if we don't have gmyth-0.1
4.16 -if test "x$HAVE_LIBGMYTH" = "xno"; then
4.17 - AC_MSG_ERROR(you need gmyth-0.1 installed)
4.18 +# Check for pkgconfig
4.19 +AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
4.20 +# Give error and exit if we don't have pkgconfig
4.21 +if test "x$HAVE_PKGCONFIG" = "xno"; then
4.22 + AC_MSG_ERROR(you need to have pkgconfig installed !)
4.23 fi
4.24
4.25 -# make LIBXML_CFLAGS and LIBXML_LIBS available
4.26 -AC_SUBST(LIBGMYTH_CFLAGS)
4.27 -AC_SUBST(LIBGMYTH_LIBS)
4.28 -
4.29 -dnl ========== Check for Cyberlink UPnP Libraries
4.30 -PKG_CHECK_MODULES(CYBERLINK, clinkc,
4.31 - HAVE_CYBERLINK=yes, HAVE_CYBERLINK=no)
4.32 -
4.33 -if test "x$HAVE_CYBERLINK" = "xno"; then
4.34 - AC_MSG_ERROR(you need clinkc installed)
4.35 -
4.36 -dnl make CYBERLINK_CFLAGS and CYBERLINK_LIBS available
4.37 -AC_SUBST(CYBERLINK_CFLAGS)
4.38 -AC_SUBST(CYBERLINK_LIBS)
4.39 -
4.40 # Checks for header files.
4.41 AC_HEADER_STDC
4.42 AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h])
4.43 @@ -83,6 +67,16 @@
4.44 AC_FUNC_VPRINTF
4.45 AC_CHECK_FUNCS([memset socket stime strstr strtoul gethostname inet_ntoa localtime_r select strrchr localtime strptime])
4.46
4.47 +##############################
4.48 +# Checks for Network functions
4.49 +##############################
4.50 +
4.51 +AC_CHECK_FUNCS([socket])
4.52 +AC_CHECK_FUNCS([inet_ntoa])
4.53 +AC_CHECK_HEADERS([ifaddrs.h])
4.54 +AC_CHECK_FUNCS([getifaddrs])
4.55 +AC_CHECK_FUNCS([time])
4.56 +
4.57 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
4.58
4.59 CFLAGS="$CFLAGS -I/usr/include"
4.60 @@ -97,14 +91,7 @@
4.61 CFLAGS="$CFLAGS -g -DGMYTH_USE_DEBUG"
4.62 else
4.63 CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS"
4.64 -fi
4.65 -
4.66 -# Check for pkgconfig
4.67 -AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
4.68 -# Give error and exit if we don't have pkgconfig
4.69 -if test "x$HAVE_PKGCONFIG" = "xno"; then
4.70 - AC_MSG_ERROR(you need to have pkgconfig installed !)
4.71 -fi
4.72 +fi
4.73
4.74 # Check for Glib2.0
4.75 PKG_CHECK_MODULES(GLIB, glib-2.0, HAVE_GLIB=yes,HAVE_GLIB=no)
4.76 @@ -132,30 +119,39 @@
4.77 AC_SUBST(GOBJECT_CFLAGS)
4.78 AC_SUBST(GOBJECT_LIBS)
4.79
4.80 -##############################
4.81 -# Checks for Network functions
4.82 -##############################
4.83 +## Check for gmyth-0.1
4.84 +PKG_CHECK_MODULES(LIBGMYTH, gmyth-0.1, HAVE_LIBGMYTH=yes,HAVE_LIBGMYTH=no)
4.85
4.86 -AC_CHECK_FUNCS([socket])
4.87 -AC_CHECK_FUNCS([inet_ntoa])
4.88 -AC_CHECK_HEADERS([ifaddrs.h])
4.89 -AC_CHECK_FUNCS([getifaddrs])
4.90 -AC_CHECK_FUNCS([time])
4.91 +# Give error and exit if we don't have gmyth-0.1
4.92 +if test "x$HAVE_LIBGMYTH" = "xno"; then
4.93 + AC_MSG_ERROR([you need gmyth-0.1 installed])
4.94 +fi
4.95 +
4.96 +# make LIBXML_CFLAGS and LIBXML_LIBS available
4.97 +AC_SUBST(LIBGMYTH_CFLAGS)
4.98 +AC_SUBST(LIBGMYTH_LIBS)
4.99 +
4.100 +dnl ========== Check for Cyberlink UPnP Libraries
4.101 +PKG_CHECK_MODULES(CYBERLINK, clinkc,
4.102 + HAVE_CYBERLINK=yes, HAVE_CYBERLINK=no)
4.103 +
4.104 +if test "x$HAVE_CYBERLINK" = "xno"; then
4.105 + AC_MSG_ERROR([you need clinkc installed])
4.106 +fi
4.107 +
4.108 +dnl make CYBERLINK_CFLAGS and CYBERLINK_LIBS available
4.109 +AC_SUBST(CYBERLINK_CFLAGS)
4.110 +AC_SUBST(CYBERLINK_LIBS)
4.111
4.112 #dnl Enable gtk-doc
4.113 #GTK_DOC_CHECK(1.4)
4.114
4.115 -AC_SUBST(CFLAGS)
4.116 -AC_SUBST(LDFLAGS)
4.117 -AC_SUBST(LIBS)
4.118 -
4.119 AC_OUTPUT([
4.120 Makefile
4.121 src/Makefile
4.122 -tests/Makefile
4.123 -gmyth.pc])
4.124 +gmyth-upnp.pc])
4.125
4.126 -if test x"$enable_debug" != xno; then
4.127 +if test "x$enable_debug" != "xno"; then
4.128 AC_MSG_NOTICE([Debug: Enabled])
4.129 else
4.130 AC_MSG_NOTICE([Debug: Disabled])
5.1 --- a/gmyth-upnp/gmyth-upnp.pc.in Wed Jan 10 17:19:50 2007 +0000
5.2 +++ b/gmyth-upnp/gmyth-upnp.pc.in Wed Jan 10 20:32:11 2007 +0000
5.3 @@ -6,7 +6,7 @@
5.4 Name: gmyth-upnp
5.5 Description: Myth TV upnp library based upon GLib/GObject paradigm
5.6 Version: @VERSION@
5.7 -Requires: gobject-2.0 glib-2.0 clinkc
5.8 +Requires: gobject-2.0 glib-2.0 clinkc gmyth-0.1
5.9
5.10 -Libs: @CYBERLINK_LIBS@ @LIBGMYTH_LIBS@ -L${libdir} -lgmyth
5.11 -Cflags: @CYBERLINK_CFLAGS@ @LIBGMYTH_CFLAGS @-I${includedir}/gmyth-upnp
5.12 +Libs: @CYBERLINK_LIBS@ @LIBGMYTH_LIBS@ -L${libdir} -lgmythupnp
5.13 +Cflags: @CYBERLINK_CFLAGS@ @LIBGMYTH_CFLAGS@ -I${includedir}/gmyth-upnp
6.1 --- a/gmyth-upnp/src/Makefile.am Wed Jan 10 17:19:50 2007 +0000
6.2 +++ b/gmyth-upnp/src/Makefile.am Wed Jan 10 20:32:11 2007 +0000
6.3 @@ -1,81 +1,24 @@
6.4 SUBDIRS = .
6.5
6.6 -lib_LTLIBRARIES = libgmyth.la
6.7 +lib_LTLIBRARIES = libgmythupnp.la
6.8
6.9 -BUILT_SOURCES = \
6.10 - gmyth_marshal.c \
6.11 - gmyth_marshal.h
6.12 +libgmythupnp_la_SOURCES = \
6.13 + gmyth_upnp.c
6.14 +
6.15 +libgmythupnp_la_CFLAGS = \
6.16 + -DDATADIR=\"$(pkgdatadir)\" \
6.17 + $(LIBGMYTH_CFLAGS) \
6.18 + $(CYBERLINK_CFLAGS)
6.19
6.20 -libgmyth_la_SOURCES = \
6.21 - gmyth_common.c \
6.22 - gmyth_debug.c \
6.23 - gmyth_epg.c \
6.24 - gmyth_recorder.c \
6.25 - gmyth_remote_util.c \
6.26 - gmyth_tvchain.c \
6.27 - gmyth_scheduler.c \
6.28 - gmyth_util.c \
6.29 - gmyth_query.c \
6.30 - gmyth_socket.c \
6.31 - gmyth_stringlist.c \
6.32 - gmyth_monitor_handler.c \
6.33 - gmyth_file_transfer.c \
6.34 - gmyth_livetv.c \
6.35 - gmyth_backendinfo.c \
6.36 - gmyth_programinfo.c \
6.37 - gmyth_uri.c \
6.38 - $(BUILT_SOURCES)
6.39 +libgmythupnp_la_LDFLAGS = \
6.40 + -export-dynamic \
6.41 + $(LIBGMYTH_LIBS) \
6.42 + $(CYBERLINK_LIBS)
6.43
6.44 -
6.45 -EXTRA_libgmyth_la_SOURCES = gmyth_marshal.list
6.46 -
6.47 -gmyth_marshal.h: gmyth_marshal.list
6.48 - glib-genmarshal --header --prefix=gmyth_marshal gmyth_marshal.list > gmyth_marshal.h.tmp
6.49 - mv gmyth_marshal.h.tmp gmyth_marshal.h
6.50 -
6.51 -gmyth_marshal.c: gmyth_marshal.list gmyth_marshal.h
6.52 - echo "#include \"glib-object.h\"" > gmyth_marshal.c.tmp
6.53 - echo "#include \"gmyth_marshal.h\"" >> gmyth_marshal.c.tmp
6.54 - glib-genmarshal --body --prefix=gmyth_marshal $(srcdir)/gmyth_marshal.list >> gmyth_marshal.c.tmp
6.55 - mv gmyth_marshal.c.tmp gmyth_marshal.c
6.56 -
6.57 -libgmyth_la_CFLAGS = \
6.58 - -DDATADIR=\"$(pkgdatadir)\" \
6.59 - $(GLIB_CFLAGS) \
6.60 - $(GOBJECT_CFLAGS) \
6.61 - $(GST_CFLAGS) \
6.62 - $(GSTBASE_CFLAGS) \
6.63 - $(GSTPLUGINSBASE_CFLAGS) \
6.64 - $(MYSQL_CFLAGS)
6.65 -
6.66 -libgmyth_la_LDFLAGS = \
6.67 - -export-dynamic \
6.68 - $(MYSQL_LIBS) \
6.69 - $(GST_LIBS) \
6.70 - $(GSTBASE_LIBS) \
6.71 - $(GSTPLUGINS_LIBS)
6.72 -
6.73 -libgmyth_includedir = \
6.74 +libgmythupnp_includedir = \
6.75 $(pkgincludedir)
6.76
6.77 -libgmyth_include_HEADERS = \
6.78 - gmyth.h \
6.79 - gmyth_common.h \
6.80 - gmyth_debug.h \
6.81 - gmyth_epg.h \
6.82 - gmyth_recorder.h \
6.83 - gmyth_scheduler.h \
6.84 - gmyth_tvchain.h \
6.85 - gmyth_util.h \
6.86 - gmyth_query.h \
6.87 - gmyth_socket.h \
6.88 - gmyth_remote_util.h \
6.89 - gmyth_stringlist.h \
6.90 - gmyth_monitor_handler.h \
6.91 - gmyth_file_transfer.h \
6.92 - gmyth_livetv.h \
6.93 - gmyth_backendinfo.h \
6.94 - gmyth_programinfo.h \
6.95 - gmyth_uri.h
6.96 +libgmythupnp_include_HEADERS = \
6.97 + gmyth_upnp.h
6.98
6.99 CLEANFILES = $(BUILT_SOURCES)