# HG changeset patch
# User morphbr
# Date 1179435497 -3600
# Node ID b29ea6deb6f80a042fef12717d36f4444d7f49f4
# Parent e863d5b45e528d9aede186b76e590cb33523e90a
[svn r692] * Gmyth:
- Print size in gmyth_cat
* GMyth-Streamer:
- Bug fix to get size
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/COPYING
--- a/gmyth-stream/client/COPYING Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/INSTALL
--- a/gmyth-stream/client/INSTALL Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
-
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/Makefile.am
--- a/gmyth-stream/client/Makefile.am Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-SUBDIRS = src test
-
-pcfiles = gmyth-stream-client.pc
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pcfiles)
-
-EXTRA_DIST = \
- ChangeLog
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/autogen.sh
--- a/gmyth-stream/client/autogen.sh Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="myth-stream"
-
-(test -f $srcdir/configure.ac) || {
- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level $PKG_NAME directory"
- exit 1
-}
-
-which gnome-autogen.sh || {
- echo "You need to install gnome-common from the GNOME CVS"
- exit 1
-}
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
-REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/configure.ac
--- a/gmyth-stream/client/configure.ac Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.50)
-
-AC_INIT([gmyth-stream],[0.1])
-
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADER(config.h)
-
-AS_VERSION(gmyth-stream, GMYTH_STREAM, 0, 1, 0, 0, GMYTH_STREAM_SVN="no", GMYTH_STREAM_SVN="yes")
-GMYTH_STREAM_MAJORMINOR=$GMYTH_STREAM_MAJOR_VERSION.$GMYTH_STREAM_MINOR_VERSION
-AC_SUBST(GMYTH_STREAM_MAJORMINOR)
-
-dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
-AM_MAINTAINER_MODE
-dnl make aclocal work in maintainer mode
-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
-
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-
-# Checks for programs.
-# check for tools
-# Make sure CFLAGS is defined to stop AC_PROC_CC adding -g
-CFLAGS="$CFLAGS -Wall"
-AC_PROG_CC
-AC_PROG_LIBTOOL
-
-# Checks for libraries.
-
-# Checks for header files.
-AC_HEADER_STDC
-
-#Test if --disable-debug given
-AC_ARG_ENABLE(debug,
- AC_HELP_STRING([--disable-debug], [enable debugging mode]))
-if test x"$enable_debug" != xno; then
- CFLAGS="$CFLAGS -g -DGMYTH_STREAM_USE_DEBUG"
-else
- CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS"
-fi
-
-
-# Checks required packages ####################################################
-###############################################################################
-
-## Check for pkgconfig ########################################################
-###############################################################################
-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
-if test "x$HAVE_PKGCONFIG" = "xno"; then
- AC_MSG_ERROR(you need to have pkgconfig installed !)
-fi
-
-## Check for Glib2.0 ##########################################################
-###############################################################################
-PKG_CHECK_MODULES(GLIB, glib-2.0 gobject-2.0, HAVE_GLIB=yes,HAVE_GLIB=no)
-if test "x$HAVE_GLIB" = "xno"; then
- AC_MSG_ERROR(you need glib-2.0 installed)
-fi
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(LIBS)
-
-AC_OUTPUT([
-Makefile
-gmyth-stream-client.pc
-src/Makefile
-test/Makefile
-])
-
-if test "x$enable_debug" != "xno"; then
- AC_MSG_NOTICE([Debug: Enabled])
-else
- AC_MSG_NOTICE([Debug: Disabled])
-fi
-
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/debian/changelog
--- a/gmyth-stream/client/debian/changelog Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-gmythstream-client (0.1) unstable; urgency=low
-
- * Initial Package.
-
- -- Hallyson Melo <hallyson.melo@indt.org.br> Thu, 12 Apr 2007 17:26:16 -0300
-
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/debian/compat
--- a/gmyth-stream/client/debian/compat Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-4
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/debian/control
--- a/gmyth-stream/client/debian/control Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-Source: gmythstream-client
-Priority: optional
-Maintainer: Hallyson Melo <hallyson.melo@indt.org.br>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), libglib2.0-dev
-Standards-Version: 3.6.2
-Section: libs
-
-Package: gmythstream-client
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libglib2.0-0
-Description: This library can be used to access gmythstream server.
-
-Package: gmythstream-client-dev
-Section: libdevel
-Architecture: any
-Depends: gmythstream-client (= ${Source-Version}), libglib2.0-dev
-Description: The gmythstream-client library library development files.
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/debian/gmythstream-client-dev.install
--- a/gmyth-stream/client/debian/gmythstream-client-dev.install Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/pkgconfig/*
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/share/pkgconfig/*
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/debian/gmythstream-client.install
--- a/gmyth-stream/client/debian/gmythstream-client.install Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-debian/tmp/usr/lib/lib*.so.*
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/debian/rules
--- a/gmyth-stream/client/debian/rules Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
-# debian package version
-version=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
-
-maint: debian/control
-
-common_conf_flags = \
- --enable-debug
-
-# FIXME: should disable docs for arch only builds
-DEB_CONFIGURE_EXTRA_FLAGS := $(common_conf_flags)
-
-
-.PHONY: maint
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/gmyth-stream-client.pc.in
--- a/gmyth-stream/client/gmyth-stream-client.pc.in Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: gmyth-stream-client
-Description: Gmyth Stream Client side
-Version: @VERSION@
-Requires: gobject-2.0 glib-2.0
-
-Libs: -L${libdir} -lgmythstreamclient
-Cflags: -I${includedir}/gmyth-stream
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/m4/as-compiler-flag.m4
--- a/gmyth-stream/client/m4/as-compiler-flag.m4 Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-dnl as-compiler-flag.m4 0.1.0
-
-dnl autostars m4 macro for detection of compiler flags
-
-dnl David Schleef <ds@schleef.org>
-
-dnl $Id: as-compiler-flag.m4,v 1.1 2005/06/18 18:02:46 burgerman Exp $
-
-dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
-dnl Tries to compile with the given CFLAGS.
-dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags,
-dnl and ACTION-IF-NOT-ACCEPTED otherwise.
-
-AC_DEFUN([AS_COMPILER_FLAG],
-[
- AC_MSG_CHECKING([to see if compiler understands $1])
-
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $1"
-
- AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
- CFLAGS="$save_CFLAGS"
-
- if test "X$flag_ok" = Xyes ; then
- $2
- true
- else
- $3
- true
- fi
- AC_MSG_RESULT([$flag_ok])
-])
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/m4/as-expand.m4
--- a/gmyth-stream/client/m4/as-expand.m4 Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-dnl
-dnl example
-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
-
-AC_DEFUN([AS_AC_EXPAND],
-[
- EXP_VAR=[$1]
- FROM_VAR=[$2]
-
- dnl first expand prefix and exec_prefix if necessary
- prefix_save=$prefix
- exec_prefix_save=$exec_prefix
-
- dnl if no prefix given, then use /usr/local, the default prefix
- if test "x$prefix" = "xNONE"; then
- prefix=$ac_default_prefix
- fi
- dnl if no exec_prefix given, then use prefix
- if test "x$exec_prefix" = "xNONE"; then
- exec_prefix=$prefix
- fi
-
- full_var="$FROM_VAR"
- dnl loop until it doesn't change anymore
- while true; do
- new_full_var="`eval echo $full_var`"
- if test "x$new_full_var"="x$full_var"; then break; fi
- full_var=$new_full_var
- done
-
- dnl clean up
- full_var=$new_full_var
- AC_SUBST([$1], "$full_var")
-
- dnl restore prefix and exec_prefix
- prefix=$prefix_save
- exec_prefix=$exec_prefix_save
-])
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/m4/as-version.m4
--- a/gmyth-stream/client/m4/as-version.m4 Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-dnl as-version.m4 0.1.0
-
-dnl autostars m4 macro for versioning
-
-dnl Thomas Vander Stichele <thomas at apestaart dot org>
-
-dnl $Id: as-version.m4,v 1.1 2005/06/18 18:02:46 burgerman Exp $
-
-dnl AS_VERSION(PACKAGE, PREFIX, MAJOR, MINOR, MICRO, NANO,
-dnl ACTION-IF-NO-NANO, [ACTION-IF-NANO])
-
-dnl example
-dnl AS_VERSION(gstreamer, GST_VERSION, 0, 3, 2,)
-dnl for a 0.3.2 release version
-
-dnl this macro
-dnl - defines [$PREFIX]_MAJOR, MINOR and MICRO
-dnl - if NANO is empty, then we're in release mode, else in cvs/dev mode
-dnl - defines [$PREFIX], VERSION, and [$PREFIX]_RELEASE
-dnl - executes the relevant action
-dnl - AC_SUBST's PACKAGE, VERSION, [$PREFIX] and [$PREFIX]_RELEASE
-dnl as well as the little ones
-dnl - doesn't call AM_INIT_AUTOMAKE anymore because it prevents
-dnl maintainer mode from running ok
-dnl
-dnl don't forget to put #undef [$2] and [$2]_RELEASE in acconfig.h
-dnl if you use acconfig.h
-
-AC_DEFUN([AS_VERSION],
-[
- PACKAGE=[$1]
- [$2]_MAJOR=[$3]
- [$2]_MINOR=[$4]
- [$2]_MICRO=[$5]
- NANO=[$6]
- [$2]_NANO=$NANO
- if test "x$NANO" = "x" || test "x$NANO" = "x0";
- then
- AC_MSG_NOTICE(configuring [$1] for release)
- VERSION=[$3].[$4].[$5]
- [$2]_RELEASE=1
- dnl execute action
- ifelse([$7], , :, [$7])
- else
- AC_MSG_NOTICE(configuring [$1] for development with nano $NANO)
- VERSION=[$3].[$4].[$5].$NANO
- [$2]_RELEASE=0.`date +%Y%m%d.%H%M%S`
- dnl execute action
- ifelse([$8], , :, [$8])
- fi
-
- [$2]=$VERSION
- AC_DEFINE_UNQUOTED([$2], "$[$2]", [Define the version])
- AC_SUBST([$2])
- AC_DEFINE_UNQUOTED([$2]_RELEASE, "$[$2]_RELEASE", [Define the release version])
- AC_SUBST([$2]_RELEASE)
-
- AC_SUBST([$2]_MAJOR)
- AC_SUBST([$2]_MINOR)
- AC_SUBST([$2]_MICRO)
- AC_SUBST([$2]_NANO)
- AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Define the package name])
- AC_SUBST(PACKAGE)
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Define the version])
- AC_SUBST(VERSION)
-])
-
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/m4/gst-feature.m4
--- a/gmyth-stream/client/m4/gst-feature.m4 Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,211 +0,0 @@
-dnl Perform a check for a feature for GStreamer
-dnl Richard Boulton <richard-alsa@tartarus.org>
-dnl Thomas Vander Stichele <thomas@apestaart.org> added useful stuff
-dnl Last modification: 25/06/2001
-dnl GST_CHECK_FEATURE(FEATURE-NAME, FEATURE-DESCRIPTION,
-dnl DEPENDENT-PLUGINS, TEST-FOR-FEATURE,
-dnl DISABLE-BY-DEFAULT, ACTION-IF-USE, ACTION-IF-NOTUSE)
-dnl
-dnl This macro adds a command line argument to enable the user to enable
-dnl or disable a feature, and if the feature is enabled, performs a supplied
-dnl test to check if the feature is available.
-dnl
-dnl The test should define HAVE_<FEATURE-NAME> to "yes" or "no" depending
-dnl on whether the feature is available.
-dnl
-dnl The macro will set USE_<FEATURE-NAME> to "yes" or "no" depending on
-dnl whether the feature is to be used.
-dnl Thomas changed this, so that when USE_<FEATURE-NAME> was already set
-dnl to no, then it stays that way.
-dnl
-dnl The macro will call AM_CONDITIONAL(USE_<<FEATURE-NAME>, ...) to allow
-dnl the feature to control what is built in Makefile.ams. If you want
-dnl additional actions resulting from the test, you can add them with the
-dnl ACTION-IF-USE and ACTION-IF-NOTUSE parameters.
-dnl
-dnl FEATURE-NAME is the name of the feature, and should be in
-dnl purely upper case characters.
-dnl FEATURE-DESCRIPTION is used to describe the feature in help text for
-dnl the command line argument.
-dnl DEPENDENT-PLUGINS lists any plugins which depend on this feature.
-dnl TEST-FOR-FEATURE is a test which sets HAVE_<FEATURE-NAME> to "yes"
-dnl or "no" depending on whether the feature is
-dnl available.
-dnl DISABLE-BY-DEFAULT if "disabled", the feature is disabled by default,
-dnl if any other value, the feature is enabled by default.
-dnl ACTION-IF-USE any extra actions to perform if the feature is to be
-dnl used.
-dnl ACTION-IF-NOTUSE any extra actions to perform if the feature is not to
-dnl be used.
-dnl
-dnl
-dnl thomas :
-dnl we also added a history.
-dnl GST_PLUGINS_YES will contain all plugins to be built
-dnl that were checked through GST_CHECK_FEATURE
-dnl GST_PLUGINS_NO will contain those that won't be built
-
-AC_DEFUN([GST_CHECK_FEATURE],
-AC_MSG_NOTICE(***)
-AC_MSG_NOTICE(*** checking plugin: [$3] ***)
-AC_MSG_NOTICE(***)
-[dnl
-builtin(define, [gst_endisable], ifelse($5, [disabled], [enable], [disable]))dnl
-dnl if it is set to NO, then don't even consider it for building
-NOUSE=
-if test "x$USE_[$1]" = "xno"; then
- NOUSE="yes"
-fi
-AC_ARG_ENABLE(translit([$1], A-Z, a-z),
- [ ]builtin(format, --%-26s gst_endisable %s, gst_endisable-translit([$1], A-Z, a-z), [$2]ifelse([$3],,,: [$3])),
- [ case "${enableval}" in
- yes) USE_[$1]=yes;;
- no) USE_[$1]=no;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-translit([$1], A-Z, a-z)) ;;
- esac],
- [ USE_$1=]ifelse($5, [disabled], [no], [yes])) dnl DEFAULT
-
-dnl *** set it back to no if it was preset to no
-if test "x$NOUSE" = "xyes"; then
- USE_[$1]="no"
- AC_MSG_WARN(*** $3 pre-configured not to be built)
-fi
-NOUSE=
-
-dnl *** If it's enabled
-
-if test x$USE_[$1] = xyes; then
- dnl save compile variables before the test
-
- gst_check_save_LIBS=$LIBS
- gst_check_save_LDFLAGS=$LDFLAGS
- gst_check_save_CFLAGS=$CFLAGS
- gst_check_save_CPPFLAGS=$CPPFLAGS
- gst_check_save_CXXFLAGS=$CXXFLAGS
-
- HAVE_[$1]=no
- dnl TEST_FOR_FEATURE
- $4
-
- LIBS=$gst_check_save_LIBS
- LDFLAGS=$gst_check_save_LDFLAGS
- CFLAGS=$gst_check_save_CFLAGS
- CPPFLAGS=$gst_check_save_CPPFLAGS
- CXXFLAGS=$gst_check_save_CXXFLAGS
-
- dnl If it isn't found, unset USE_[$1]
- if test x$HAVE_[$1] = xno; then
- USE_[$1]=no
- fi
-fi
-dnl *** Warn if it's disabled or not found
-if test x$USE_[$1] = xyes; then
- ifelse([$6], , :, [$6])
- if test "x$3" != "x"; then
- GST_PLUGINS_YES="\t[$3]\n$GST_PLUGINS_YES"
- fi
- AC_DEFINE(HAVE_[$1], , [support for features: $3])
-else
- ifelse([$3], , :, [AC_MSG_NOTICE(*** These plugins will not be built: [$3])])
- if test "x$3" != "x"; then
- GST_PLUGINS_NO="\t[$3]\n$GST_PLUGINS_NO"
- fi
- ifelse([$7], , :, [$7])
-fi
-dnl *** Define the conditional as appropriate
-AM_CONDITIONAL(USE_[$1], test x$USE_[$1] = xyes)
-])
-
-dnl Use a -config program which accepts --cflags and --libs parameters
-dnl to set *_CFLAGS and *_LIBS and check existence of a feature.
-dnl Richard Boulton <richard-alsa@tartarus.org>
-dnl Last modification: 26/06/2001
-dnl GST_CHECK_CONFIGPROG(FEATURE-NAME, CONFIG-PROG-FILENAME, MODULES)
-dnl
-dnl This check was written for GStreamer: it should be renamed and checked
-dnl for portability if you decide to use it elsewhere.
-dnl
-AC_DEFUN([GST_CHECK_CONFIGPROG],
-[
- AC_PATH_PROG([$1]_CONFIG, [$2], no)
- if test x$[$1]_CONFIG = xno; then
- [$1]_LIBS=
- [$1]_CFLAGS=
- HAVE_[$1]=no
- else
- if [$2] --plugin-libs [$3] &> /dev/null; then
- [$1]_LIBS=`[$2] --plugin-libs [$3]`
- else
- [$1]_LIBS=`[$2] --libs [$3]`
- fi
- [$1]_CFLAGS=`[$2] --cflags [$3]`
- HAVE_[$1]=yes
- fi
- AC_SUBST([$1]_LIBS)
- AC_SUBST([$1]_CFLAGS)
-])
-
-dnl Use AC_CHECK_LIB and AC_CHECK_HEADER to do both tests at once
-dnl sets HAVE_module if we have it
-dnl Richard Boulton <richard-alsa@tartarus.org>
-dnl Last modification: 26/06/2001
-dnl GST_CHECK_LIBHEADER(FEATURE-NAME, LIB NAME, LIB FUNCTION, EXTRA LD FLAGS,
-dnl HEADER NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-dnl
-dnl This check was written for GStreamer: it should be renamed and checked
-dnl for portability if you decide to use it elsewhere.
-dnl
-AC_DEFUN([GST_CHECK_LIBHEADER],
-[
- AC_CHECK_LIB([$2], [$3], HAVE_[$1]=yes, HAVE_[$1]=no,[$4])
- if test "x$HAVE_[$1]" = "xyes"; then
- AC_CHECK_HEADER([$5], :, HAVE_[$1]=no)
- if test "x$HAVE_[$1]" = "xyes"; then
- dnl execute what needs to be
- ifelse([$6], , :, [$6])
- else
- ifelse([$7], , :, [$7])
- fi
- else
- ifelse([$7], , :, [$7])
- fi
- AC_SUBST(HAVE_[$1])
-]
-)
-
-dnl 2004-02-14 Thomas - changed to get set properly and use proper output
-dnl 2003-06-27 Benjamin Otte - changed to make this work with gstconfig.h
-dnl
-dnl Add a subsystem --disable flag and all the necessary symbols and substitions
-dnl
-dnl GST_CHECK_SUBSYSTEM_DISABLE(SYSNAME, [subsystem name])
-dnl
-AC_DEFUN([GST_CHECK_SUBSYSTEM_DISABLE],
-[
- dnl this define will replace each literal subsys_def occurrence with
- dnl the lowercase hyphen-separated subsystem
- dnl e.g. if $1 is GST_DEBUG then subsys_def will be a macro with gst-debug
- define([subsys_def],translit([$1], _A-Z, -a-z))
-
- AC_ARG_ENABLE(subsys_def,
- AC_HELP_STRING(--disable-subsys_def, [disable $2]),
- [
- case "${enableval}" in
- yes) GST_DISABLE_[$1]=no ;;
- no) GST_DISABLE_[$1]=yes ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-subsys_def]) ;;
- esac
- ],
- [GST_DISABLE_[$1]=no]) dnl Default value
-
- if test x$GST_DISABLE_[$1] = xyes; then
- AC_MSG_NOTICE([disabled subsystem [$2]])
- GST_DISABLE_[$1]_DEFINE="#define GST_DISABLE_$1 1"
- else
- GST_DISABLE_[$1]_DEFINE="/* #undef GST_DISABLE_$1 */"
- fi
- AC_SUBST(GST_DISABLE_[$1]_DEFINE)
- undefine([subsys_def])
-])
-
-
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/src/Makefile.am
--- a/gmyth-stream/client/src/Makefile.am Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-lib_LTLIBRARIES = libgmythstreamclient.la
-
-libgmythstreamclient_includedir = \
- $(pkgincludedir)
-
-libgmythstreamclient_include_HEADERS = \
- gmyth-stream-client.h
-
-libgmythstreamclient_la_SOURCES = \
- gmyth-stream-client.c
-
-libgmythstreamclient_la_CFLAGS = \
- $(GLIB_CFLAGS)
-
-libgmythstreamclient_la_LDFLAGS = \
- $(GLIB_LIBS)
-
-CLEANFILES =
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/src/gmyth-stream-client.c
--- a/gmyth-stream/client/src/gmyth-stream-client.c Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,252 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "gmyth-stream-client.h"
-
-#define BUFFER_SIZE 1024
-
-#define GMYTH_STREAM_CLIENT_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GMYTH_TYPE_STREAM_CLIENT,\
- GMythStreamClientPrivate))
-
-
-typedef struct _sock _socket;
-struct _sock
-{
- gint fd;
- struct sockaddr_in addr;
-};
-
-
-typedef struct _GMythStreamClientPrivate GMythStreamClientPrivate;
-struct _GMythStreamClientPrivate
-{
- const gchar *host;
- _socket* sock;
- _socket* sock_stream;
- gboolean connected;
-};
-
-
-static void gmyth_stream_client_class_init (GMythStreamClientClass *klass);
-static void gmyth_stream_client_init (GMythStreamClient *object);
-static void gmyth_stream_client_dispose (GObject *object);
-static void gmyth_stream_client_finalize (GObject *object);
-
-
-G_DEFINE_TYPE(GMythStreamClient, gmyth_stream_client, G_TYPE_OBJECT)
-
-
-static _socket*
-create_socket (const gchar* hostname, gint port)
-{
- _socket* sock = (_socket*)g_malloc(sizeof(_socket));
-
- sock->fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock->fd == -1) {
- g_debug ("Fail to create sock");
- g_free(sock);
- return NULL;
- }
-
- sock->addr.sin_family = AF_INET;
- sock->addr.sin_addr.s_addr = inet_addr(hostname);
- sock->addr.sin_port = htons(port);
-
- if (connect (sock->fd, (struct sockaddr *) &(sock->addr), \
- sizeof (sock->addr)) == -1) {
- g_debug ("Fail to connect with server");
- g_free(sock);
- return NULL;
- }
-
- return sock;
-}
-
-static gint
-read_message (int socket)
-{
- gint64 total_read = 0;
- gint result = -1;
- gchar buffer[BUFFER_SIZE];
- gchar** response;
-
- total_read = recv(socket, buffer, BUFFER_SIZE, 0);
-
- if (total_read > 0) {
- response = g_strsplit_set(buffer, " +\n", 8);
-
- if ( g_ascii_strcasecmp(response[0], "OK") == 0 ) {
-
- int payload = atoi(response[1]);
-
- if (payload == 0)
- result = 0;
-
- else if (payload == 1) {
- total_read = recv(socket, buffer, BUFFER_SIZE, 0);
-
- response = g_strsplit_set(buffer, "+\n", 8);
- result = atoi(response[1]);
- }
-
- }
-
- g_strfreev(response);
- }
-
- return result;
-}
-
-
-static void
-gmyth_stream_client_class_init (GMythStreamClientClass *klass)
-{
- GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
-
- g_type_class_add_private (klass, sizeof (GMythStreamClientPrivate));
- gobject_class->dispose = gmyth_stream_client_dispose;
- gobject_class->finalize = gmyth_stream_client_finalize;
-}
-
-static void
-gmyth_stream_client_init (GMythStreamClient *self)
-{
- GMythStreamClientPrivate *priv = GMYTH_STREAM_CLIENT_GET_PRIVATE (self);
- priv->sock = NULL;
- priv->sock_stream = NULL;
-}
-
-static void
-gmyth_stream_client_dispose (GObject *object)
-{
- gmyth_stream_client_disconnect (GMYTH_STREAM_CLIENT (object));
-}
-
-
-static void
-gmyth_stream_client_finalize (GObject *object)
-{
-}
-
-GMythStreamClient*
-gmyth_stream_client_new ()
-{
- return GMYTH_STREAM_CLIENT (g_object_new (GMYTH_TYPE_STREAM_CLIENT, NULL));
-}
-
-gboolean
-gmyth_stream_client_connect (GMythStreamClient *self, const gchar *server, guint port)
-{
- GMythStreamClientPrivate *priv = GMYTH_STREAM_CLIENT_GET_PRIVATE (self);
- g_return_val_if_fail (priv->connected == FALSE, TRUE);
-
- priv->host = server;
- priv->sock = create_socket (server, port);
- if (priv->sock == NULL) return FALSE;
-
- priv->connected = TRUE;
- return TRUE;
-}
-
-void
-gmyth_stream_client_disconnect (GMythStreamClient *self)
-{
- GMythStreamClientPrivate *priv = GMYTH_STREAM_CLIENT_GET_PRIVATE (self);
-
- g_return_if_fail (priv->connected == TRUE);
-
- close (priv->sock->fd);
- //shutdown (priv->sock->fd, SHUT_RDWR);
- g_free(priv->sock);
- priv->sock = NULL;
- priv->connected = FALSE;
-}
-
-gint
-gmyth_stream_client_open_stream (GMythStreamClient *self,
- const gchar* file_name,
- const gchar* mux,
- const gchar* vcodec,
- guint vbitrate,
- gdouble fps,
- const gchar* acodec,
- guint abitrate,
- guint width, guint height,
- const gchar* opt)
-{
- gchar *cmd;
- GMythStreamClientPrivate *priv = GMYTH_STREAM_CLIENT_GET_PRIVATE (self);
-
- g_return_val_if_fail (priv->connected == TRUE, FALSE);
- g_return_val_if_fail (file_name != NULL, FALSE);
-
- cmd = g_strdup_printf ("SETUP %s %s %s %d %f %s %d %d %d %s\n",
- file_name,
- (mux == NULL ? "X" : mux),
- (vcodec == NULL ? "X" : vcodec),
- vbitrate,
- fps,
- (acodec == NULL ? "X" : acodec),
- abitrate,
- width, height,
- (opt == NULL ? "X" : opt) );
-
- if (send (priv->sock->fd, cmd, strlen (cmd), MSG_CONFIRM) == -1) {
- g_free (cmd);
- return -1;
- }
- g_free (cmd);
-
- read_message(priv->sock->fd);
-
- return 0;
-}
-
-
-gint
-gmyth_stream_client_play_stream (GMythStreamClient *self)
-{
- GMythStreamClientPrivate *priv = GMYTH_STREAM_CLIENT_GET_PRIVATE (self);
-
- g_return_val_if_fail (priv->connected == TRUE, FALSE);
-
- if (send (priv->sock->fd, "PLAY\n", 5, 0) == -1) {
- return -1;
- }
-
- gint port = read_message(priv->sock->fd);
- priv->sock_stream = create_socket(priv->host, port);
-
- return priv->sock_stream->fd;
-}
-
-void
-gmyth_stream_client_close_stream (GMythStreamClient *self)
-{
- GMythStreamClientPrivate *priv = GMYTH_STREAM_CLIENT_GET_PRIVATE (self);
- g_return_if_fail (priv->connected == TRUE);
-
- if (send (priv->sock->fd, "STOP\n", 5, 0) == -1) {
- return;
- }
-
- read_message(priv->sock->fd);
-
- close(priv->sock_stream->fd);
- g_free(priv->sock_stream);
- priv->sock_stream = NULL;
-}
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/src/gmyth-stream-client.h
--- a/gmyth-stream/client/src/gmyth-stream-client.h Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-#ifndef __GMYTH_STREAM_CLIENT_H__
-#define __GMYTH_STREAM_CLIENT_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GMythStreamClient GMythStreamClient;
-typedef struct _GMythStreamClientClass GMythStreamClientClass;
-
-struct _GMythStreamClientClass {
- GObjectClass parent_class;
-};
-
-struct _GMythStreamClient {
- GObject parent;
-};
-
-/* TYPE MACROS */
-#define GMYTH_TYPE_STREAM_CLIENT \
- (gmyth_stream_client_get_type())
-#define GMYTH_STREAM_CLIENT(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), GMYTH_TYPE_STREAM_CLIENT, GMythStreamClient))
-#define GMYTH_STREAM_CLIENT_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), GMYTH_TYPE_STREAM_CLIENT, GMythStreamClientClass))
-#define GMYTH_IS_STREAM_CLIENT(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), GMYTH_TYPE_STREAM_CLIENT))
-#define GMYTH_IS_STREAM_CLIENT_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), GMYTH_TYPE_STREAM_CLIENT))
-#define GMYTH_STREAM_CLIENT_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_TYPE_STREAM_CLIENT, GMythStreamClientClass))
-
-
-GType gmyth_stream_client_get_type(void);
-
-GMythStreamClient* gmyth_stream_client_new(void);
-
-gboolean gmyth_stream_client_connect (GMythStreamClient *self,
- const gchar *server, guint port);
-
-void gmyth_stream_client_disconnect (GMythStreamClient *self);
-gint gmyth_stream_client_open_stream (GMythStreamClient *self,
- const gchar* file_name,
- const gchar* mux,
- const gchar* vcodec,
- guint vbitrate,
- gdouble fps,
- const gchar* acodec,
- guint abitrate,
- guint width, guint height,
- const gchar* opt);
-
-gint gmyth_stream_client_play_stream (GMythStreamClient *self);
-
-void gmyth_stream_client_close_stream (GMythStreamClient *self);
-
-
-G_END_DECLS
-
-#endif
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/test/Makefile.am
--- a/gmyth-stream/client/test/Makefile.am Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-bin_PROGRAMS = \
- test
-
-test_SOURCES = \
- main.c
-
-test_LDADD = \
- $(top_builddir)/src/libgmythstreamclient.la \
- $(GLIB_LIBS)
-
-AM_CPPFLAGS = \
- -I$(top_builddir)/src \
- $(GLIB_CFLAGS)
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/client/test/main.c
--- a/gmyth-stream/client/test/main.c Thu May 17 20:06:15 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#include <glib.h>
-#include "gmyth-stream-client.h"
-
-int main (int argc, char** argv)
-{
- GMythStreamClient *cli = NULL;
- gint ret = -1;
-
- g_type_init ();
-
- cli = gmyth_stream_client_new ();
- if (!gmyth_stream_client_connect (cli, "127.0.0.1", 50000)) {
- g_warning ("Fail to connect");
- return -1;
- }
-
- ret = gmyth_stream_client_open_stream (cli, "file:///tmp/dvb.mpg",
- "mpeg", "mpeg1video", 400, 25,
- "mp2", 192, 320, 240, "format=mpeg1");
-
- //myth:///tmp/mpg/bad_day.mpg mpeg mpeg1video 400 25 mp2 192 320 240 format=mpeg1
-
- if (ret < 0) {
- g_printerr ("Fail to open stream");
- return -1;
- }
-
- g_debug ("Stream created");
- g_debug ("Going to PLAY now...");
-
- gint fd = gmyth_stream_client_play_stream (cli);
-
- if (fd == -1) {
- g_printerr ("Fail to play stream");
- return -1;
- }
-
- g_debug ("started");
-
- gmyth_stream_client_close_stream(cli);
- gmyth_stream_client_disconnect(cli);
-
- g_debug ("finished");
-
- return 0;
-}
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth-stream/server/0.2/lib/server.py
--- a/gmyth-stream/server/0.2/lib/server.py Thu May 17 20:06:15 2007 +0100
+++ b/gmyth-stream/server/0.2/lib/server.py Thu May 17 21:58:17 2007 +0100
@@ -243,9 +243,6 @@
filename = "%s" % self.query.get("file")[0]
tfilename = "%s" % transcoder.params_first("uri")
- self.log.debug("FILENAME: %s" % filename)
- self.log.debug("TFILENAME: %s" % tfilename)
-
if tfilename.find(filename) >= 0 and \
request.client_address[0] == self.query.get("ip")[0]:
self.wfile.write("Status: %s %%" % transcoder.status)
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth/samples/gmyth_cat.c
--- a/gmyth/samples/gmyth_cat.c Thu May 17 20:06:15 2007 +0100
+++ b/gmyth/samples/gmyth_cat.c Thu May 17 21:58:17 2007 +0100
@@ -120,6 +120,8 @@
}
size = gmyth_file_transfer_get_filesize (transfer);
+ fprintf(stderr, "Size:%d\n", size);
+
array = g_array_new (FALSE, TRUE, sizeof(gchar));
while (total != size)
@@ -140,6 +142,7 @@
fflush (stdout);
total += array->len;
+ fprintf(stderr, "%d\n", total);
g_array_remove_range (array, 0, array->len);
//usleep(300000);
}
diff -r e863d5b45e52 -r b29ea6deb6f8 gmyth/samples/gmyth_ls.c
--- a/gmyth/samples/gmyth_ls.c Thu May 17 20:06:15 2007 +0100
+++ b/gmyth/samples/gmyth_ls.c Thu May 17 21:58:17 2007 +0100
@@ -114,7 +114,7 @@
scheduler = gmyth_scheduler_new ();
if(gmyth_scheduler_connect_with_timeout (scheduler,
- options->b_info, 1)
+ options->b_info, 10)
== FALSE) {
g_warning ("Could not connect to backend db");
g_object_unref (scheduler);