diff options
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | COPYING | 504 | ||||
| -rw-r--r-- | Makefile.am | 20 | ||||
| -rw-r--r-- | NEWS | 0 | ||||
| -rw-r--r-- | RELEASE | 0 | ||||
| -rwxr-xr-x | autogen.sh | 22 | ||||
| -rw-r--r-- | configure.ac | 191 | ||||
| -rw-r--r-- | ext/Makefile.am | 297 | ||||
| -rw-r--r-- | po/POTFILES.in | 8 |
9 files changed, 558 insertions, 490 deletions
@@ -8,11 +8,7 @@ config.guess config.sub config.rpath configure -gst-plugins.spec -gstreamer-libs-uninstalled*.pc -gstreamer-libs*.pc -gstreamer-play-uninstalled*.pc -gstreamer-play*.pc +gst-plugins-ugly.spec libtool stamp-h stamp-h.in diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..8add30ad --- /dev/null +++ b/COPYING @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin St, 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. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, 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 library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete 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 distribute a copy of this License along with the +Library. + + 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 Library or any portion +of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +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 Library, 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 Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you 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. + + If distribution of 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 satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be 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. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library 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. + + 9. 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 Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +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 with +this License. + + 11. 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 Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library 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 Library. + +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. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library 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. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +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 Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +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 + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. 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 LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. 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 library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/Makefile.am b/Makefile.am index ae2e7daa..b2947951 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,23 +1,9 @@ -# if USE_GCONFTOOL -# GCONF_DIR = gconf -# else -GCONF_DIR = -# endif - SUBDIRS = \ - gst sys ext gst-libs \ - $(GCONF_DIR) \ - m4 common po -# disabled -# $(SUBDIRS_DOCS) - -DIST_SUBDIRS = \ - gst sys ext gst-libs \ - m4 common po + gst ext m4 common EXTRA_DIST = \ - gst-plugins.spec depcomp \ - AUTHORS COPYING COPYING.LIB NEWS README RELEASE REQUIREMENTS \ + gst-plugins-ugly.spec depcomp \ + AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \ ChangeLog autogen.sh DISTCLEANFILES = _stdint.h diff --git a/RELEASE b/RELEASE new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/RELEASE @@ -2,8 +2,8 @@ # Run this to generate all the initial makefiles, etc. DIE=0 -package=gst-plugins -srcfile=gst/librfb/gstrfbsrc.c +package=gst-plugins-ugly +srcfile=ext/mad/gstmad.c # a quick cvs co if necessary to alleviate the pain - may remove this # when developers get a clue ;) @@ -35,8 +35,8 @@ version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autocon "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1 version_check "automake" "$AUTOMAKE automake automake-1.7 automake-1.6 automake-1.5" \ "ftp://ftp.gnu.org/pub/gnu/automake/" 1 6 || DIE=1 -version_check "autopoint" "autopoint" \ - "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 5 || DIE=1 +#version_check "autopoint" "autopoint" \ +# "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 5 || DIE=1 version_check "libtoolize" "$LIBTOOLIZE libtoolize" \ "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1 version_check "pkg-config" "" \ @@ -63,14 +63,14 @@ toplevel_check $srcfile # autopoint # older autopoint (< 0.12) has a tendency to complain about mkinstalldirs -if test -x mkinstalldirs; then rm mkinstalldirs; fi +# if test -x mkinstalldirs; then rm mkinstalldirs; fi # first remove patch if necessary, then run autopoint, then reapply -if test -f po/Makefile.in.in; -then - patch -p0 -R < common/gettext.patch -fi -tool_run "$autopoint --force" -patch -p0 < common/gettext.patch +# if test -f po/Makefile.in.in; +# then +# patch -p0 -R < common/gettext.patch +# fi +# tool_run "$autopoint --force" +# patch -p0 < common/gettext.patch tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS" tool_run "$libtoolize" "--copy --force" diff --git a/configure.ac b/configure.ac index c3acfc52..693852b9 100644 --- a/configure.ac +++ b/configure.ac @@ -12,12 +12,13 @@ AM_MAINTAINER_MODE dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 9, 0, 1, GST_CVS="no", GST_CVS="yes") +AS_VERSION(gst-plugins-ugly, GST_PLUGINS_UGLY_VERSION, 0, 9, 0, 1, + GST_CVS="no", GST_CVS="yes") AM_INIT_AUTOMAKE($PACKAGE,$VERSION) dnl our libraries and install dirs use major.minor as a version -GST_MAJORMINOR=$GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR +GST_MAJORMINOR=$GST_PLUGINS_UGLY_VERSION_MAJOR.$GST_PLUGINS_UGLY_VERSION_MINOR dnl we override it here if we need to for the release candidate of new series GST_MAJORMINOR=0.9 AC_SUBST(GST_MAJORMINOR) @@ -28,12 +29,11 @@ dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 dnl - interfaces added -> increment AGE dnl - interfaces removed -> AGE = 0 dnl for 0.8.3 release, gst_play_get_all_by_interface was added, so update -AS_LIBTOOL(GST_PLUGINS, 1, 0, 1) +AS_LIBTOOL(GST_PLUGINS_GOOD, 0, 0, 0) AS_LIBTOOL_TAGS([CXX]) AM_PROG_LIBTOOL -dnl FIXME take something else ? -AC_CONFIG_SRCDIR([gst/librfb/gstrfbsrc.c]) +AC_CONFIG_SRCDIR([ext/mad/gstmad.c]) AM_CONFIG_HEADER(config.h) dnl Add parameters for aclocal @@ -48,18 +48,18 @@ AS="${CC}" AS_PROG_OBJC dnl the gettext stuff needed -AM_GNU_GETTEXT_VERSION(0.11.5) -AM_GNU_GETTEXT([external]) +dnl AM_GNU_GETTEXT_VERSION(0.11.5) +dnl AM_GNU_GETTEXT([external]) -GETTEXT_PACKAGE=gst-plugins-$GST_MAJORMINOR -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", - [gettext package name]) +dnl GETTEXT_PACKAGE=gst-plugins-ugly-$GST_MAJORMINOR +dnl AC_SUBST(GETTEXT_PACKAGE) +dnl AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", +dnl [gettext package name]) dnl define LOCALEDIR in config.h -AS_AC_EXPAND(LOCALEDIR, $datadir/locale) -AC_DEFINE_UNQUOTED([LOCALEDIR], "$LOCALEDIR", - [gettext locale dir]) +dnl AS_AC_EXPAND(LOCALEDIR, $datadir/locale) +dnl AC_DEFINE_UNQUOTED([LOCALEDIR], "$LOCALEDIR", +dnl [gettext locale dir]) dnl decide on error flags AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no") @@ -101,31 +101,6 @@ fi dnl Check for FIONREAD ioctl declaration : GST_CHECK_FIONREAD() -DEFAULT_AUDIOSINK="autoaudiosink" -DEFAULT_VIDEOSINK="autovideosink" -DEFAULT_AUDIOSRC="alsasrc" -DEFAULT_VIDEOSRC="v4lsrc" -DEFAULT_VISUALIZER="goom" -case "$host" in - *-sun-* | *pc-solaris* ) - DEFAULT_AUDIOSRC="sunaudiosrc" - ;; - *-darwin* ) - DEFAULT_AUDIOSRC="osxaudiosrc" - ;; -esac - -AC_SUBST(DEFAULT_AUDIOSINK) -AC_DEFINE_UNQUOTED(DEFAULT_AUDIOSINK,"$DEFAULT_AUDIOSINK",[Default audio sink]) -AC_SUBST(DEFAULT_AUDIOSRC) -AC_DEFINE_UNQUOTED(DEFAULT_AUDIOSRC,"$DEFAULT_AUDIOSRC",[Default audio source]) -AC_SUBST(DEFAULT_VIDEOSINK) -AC_DEFINE_UNQUOTED(DEFAULT_VIDEOSINK,"$DEFAULT_VIDEOSINK",[Default video sink]) -AC_SUBST(DEFAULT_VIDEOSRC) -AC_DEFINE_UNQUOTED(DEFAULT_VIDEOSRC,"$DEFAULT_VIDEOSRC",[Default video source]) -AC_SUBST(DEFAULT_VISUALIZER) -AC_DEFINE_UNQUOTED(DEFAULT_VISUALIZER,"$DEFAULT_VISUALIZER",[Default visualizer]) - dnl ############################################ dnl # Super Duper options for plug-in building # dnl ############################################ @@ -143,27 +118,6 @@ GST_CHECK_FEATURE(EXTERNAL, [enable building of plug-ins with external deps],, # make BUILD_EXTERNAL available to Makefile.am AM_CONDITIONAL(BUILD_EXTERNAL, test "x$BUILD_EXTERNAL" = "xyes") -dnl experimental plug-ins; stuff that hasn't had the dust settle yet -dnl read 'builds, but might not work'UTO -GST_CHECK_FEATURE(EXPERIMENTAL, [enable building of experimental plug-ins],, -[HAVE_EXPERIMENTAL=yes],disabled, -[ - AC_MSG_WARN(building experimental plug-ins) - USE_TARKIN="yes" -],[ - AC_MSG_NOTICE(not building experimental plug-ins) - USE_TARKIN="no" -]) - -dnl broken plug-ins; stuff that doesn't seem to build at the moment -GST_CHECK_FEATURE(BROKEN, [enable building of broken plug-ins],, -HAVE_BROKEN=yes,disabled, -[ - AC_MSG_WARN([building broken plug-ins -- no bug reports on these, only patches :)]) -],[ - AC_MSG_NOTICE([not building broken plug-ins]) -]) - dnl ############################## dnl # Do automated configuration # dnl ############################## @@ -183,31 +137,6 @@ GST_DOC() dnl check architecture GST_ARCH() -dnl check for gconftool-2 - -dnl this macro defines an am conditional, so it needs to be run always -AM_GCONF_SOURCE_2 - -translit(dnm, m, l) AM_CONDITIONAL(USE_GCONFTOOL, true) -GST_CHECK_FEATURE(GCONFTOOL, [GConf schemas], , [ - AC_PATH_PROG(GCONFTOOL, gconftool-2, no) - if test x$GCONFTOOL = xno; then - AC_MSG_WARN(Not installing GConf schemas) - HAVE_GCONFTOOL="no" - else - HAVE_GCONFTOOL="yes" - fi - AC_SUBST(HAVE_GCONFTOOL) -]) - -dnl check for GConf libraries -translit(dnm, m, l) AM_CONDITIONAL(USE_GCONF, true) -GST_CHECK_FEATURE(GCONF, [GConf libraries], , [ - PKG_CHECK_MODULES(GCONF, gconf-2.0, HAVE_GCONF="yes", HAVE_GCONF="no") - AC_SUBST(GCONF_CFLAGS) - AC_SUBST(GCONF_LIBS) -]) - dnl check for gstreamer dnl uninstalled is selected preferentially -- see pkg-config(1) GST_REQ=0.9.0.1 @@ -269,7 +198,7 @@ PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.0, HAVE_LIBOIL=yes, HAVE_LIBOIL=no) AC_SUBST(LIBOIL_CFLAGS) AC_SUBST(LIBOIL_LIBS) if test "x${HAVE_LIBOIL}" = xyes ; then - #AC_DEFINE_UNQUOTED(HAVE_LIBOIL, 1, [Define if liboil is being used]) + AC_DEFINE_UNQUOTED(HAVE_LIBOIL, 1, [Define if liboil is being used]) true fi @@ -285,11 +214,9 @@ AC_SUBST(GST_PLUGIN_LDFLAGS) dnl these are all the gst plug-ins, compilable without additional libs GST_PLUGINS_ALL="\ + dvdlpcmdec \ mpegaudioparse \ - qtdemux \ realmedia \ - silence \ - mpegaudioparse \ " dnl see if we can build C++ plug-ins @@ -317,32 +244,6 @@ AC_ARG_WITH(plugins, AC_SUBST(GST_PLUGINS_SELECTED) -dnl ========================================================================== -dnl ============================= sys plug-ins ================================ -dnl ========================================================================== - -dnl *** OSS audio *** (Linux, *BSD) -translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true) -GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [ - HAVE_OSS="yes" -dnl Linux and newer BSD versions : - AC_CHECK_HEADER(sys/soundcard.h, [ - AC_DEFINE(HAVE_OSS_INCLUDE_IN_SYS,, [Define if OSS includes are in /sys/]) - ] , [ -dnl Some old BSD versions : - AC_CHECK_HEADER(soundcard.h, [ - AC_DEFINE(HAVE_OSS_INCLUDE_IN_ROOT,, [Define if OSS includes are in /]) - ], [ - dnl Some old BSD versions : - AC_CHECK_HEADER(machine/soundcard.h, [ - AC_DEFINE(HAVE_OSS_INCLUDE_IN_MACHINE,, [Define if OSS includes are in /machine/]) - ], [ - HAVE_OSS="no" - ]) - ]) - ]) -]) - dnl ########################### dnl # Configure external libs # dnl ########################### @@ -357,38 +258,6 @@ GST_CHECK_FEATURE(AMRNB, [AMR-NB], amrnbdec amrnbenc, [ AC_SUBST(AMRNB_LIBS)) ]) -dnl **** Free AAC Decoder (FAAD) **** -translit(dnm, m, l) AM_CONDITIONAL(USE_FAAD, true) -GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [ - HAVE_FAAD="yes" - GST_CHECK_LIBHEADER(FAAD, faad, faacDecOpen, -lm, faad.h, FAAD_LIBS="-lfaad -lm", HAVE_FAAD="no") - if test $HAVE_FAAD = "yes"; then - AC_MSG_CHECKING([Checking for FAAD >= 2]) - AC_TRY_RUN([ - -#include <faad.h> -#if !defined(FAAD2_VERSION) || !defined(FAAD_FMT_DOUBLE) -#error Not faad2 -#else -#include <string.h> - -int main() -{ -char version[9] = FAAD2_VERSION; -// a release candidate of 2.0 is not enought for us -if ( strstr( version, "2.0 RC" ) ) { return 1; } - -return 0; -} - -#endif - ], - [ HAVE_FAAD="yes" && AC_MSG_RESULT(yes)], - [ HAVE_FAAD="no" && AC_MSG_RESULT(no)]) - fi; - AS_SCRUB_INCLUDE(FAAD_CFLAGS) - AC_SUBST(FAAD_LIBS) -]) dnl *** lame *** translit(dnm, m, l) AM_CONDITIONAL(USE_LAME, true) @@ -444,20 +313,6 @@ GST_CHECK_FEATURE(MPEG2DEC, [mpeg2dec], mpeg2dec, [ AC_SUBST(MPEG2DEC_LIBS) ]) -dnl *** shout2 *** -translit(dnm, m, l) AM_CONDITIONAL(USE_SHOUT2, true) -GST_CHECK_FEATURE(SHOUT2, [shout2 plug-in], shout2send, [ - PKG_CHECK_MODULES(SHOUT2, shout >= 2.0, [ - HAVE_SHOUT2="yes" - AC_SUBST(SHOUT2_CFLAGS) - AC_SUBST(SHOUT2_LIBS) - ], [ - AM_PATH_SHOUT2(HAVE_SHOUT2="yes", HAVE_SHOUT2="no") - AC_SUBST(SHOUT2_CFLAGS) - AC_SUBST(SHOUT2_LIBS) - ]) -]) - dnl *** sidplay : works with libsidplay 1.36.x (not 2.x.x) *** translit(dnm, m, l) AM_CONDITIONAL(USE_SIDPLAY, true) GST_CHECK_FEATURE(SIDPLAY, [sidplay plug-in], sidplay, [ @@ -515,27 +370,21 @@ dnl ######################### dnl # Make the output files # dnl ######################### +dnl po/Makefile.in + AC_CONFIG_FILES( Makefile -gst-plugins.spec +gst-plugins-ugly.spec gst/Makefile -gst/mpegaudioparse/Makefile gst/dvdlpcmdec/Makefile -gst/qtdemux/Makefile +gst/mpegaudioparse/Makefile gst/realmedia/Makefile -gst/silence/Makefile -sys/Makefile -sys/oss/Makefile ext/Makefile ext/amrnb/Makefile -ext/faad/Makefile ext/lame/Makefile ext/mad/Makefile ext/mpeg2dec/Makefile ext/sidplay/Makefile -gst-libs/Makefile -gst-libs/gst/Makefile -po/Makefile.in common/Makefile common/m4/Makefile m4/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index 29d56a2f..926ba0b0 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -1,321 +1,62 @@ # if USE_A52DEC -# A52DEC_DIR=a52dec +# A52DEC_DIR = a52dec # else -A52DEC_DIR= +A52DEC_DIR = # endif if USE_AMRNB - AMRNB_DIR=amrnb + AMRNB_DIR = amrnb else - AMRNB_DIR= + AMRNB_DIR = endif -# if USE_ARTS -# ARTS_DIR=arts -# else -ARTS_DIR= -# endif - -# if USE_ARTSC -# ARTSC_DIR=artsd -# else -ARTSC_DIR= -# endif - -# if USE_AUDIOFILE -# AUDIOFILE_DIR=audiofile -# else -AUDIOFILE_DIR= -# endif - -# if USE_AUDIORESAMPLE -# AUDIORESAMPLE_DIR=audioresample -# else -AUDIORESAMPLE_DIR= -# endif - -# if USE_CDAUDIO -# CDAUDIO_DIR=cdaudio -# else -CDAUDIO_DIR= -# endif - -# if USE_CDPARANOIA -# CDPARANOIA_DIR=cdparanoia -# else -CDPARANOIA_DIR= -# endif - -# if USE_DIRAC -# DIRAC_DIR=dirac -# else -DIRAC_DIR= -# endif - -# if USE_DIRECTFB -# DIRECTFB_DIR=directfb -# else -DIRECTFB_DIR= -# endif - -# if USE_DIVX -# DIVX_DIR=divx -# else -DIVX_DIR= -# endif - -# if USE_DTS -# DTS_DIR=dts -# else -DTS_DIR= -# endif - # if USE_DVDREAD -# DVDREAD_DIR=dvdread +# DVDREAD_DIR = dvdread # else -DVDREAD_DIR= +DVDREAD_DIR = # endif # if USE_DVDNAV -# DVDNAV_DIR=dvdnav -# else -DVDNAV_DIR= -# endif - -# if USE_FAAC -# FAAC_DIR=faac -# else -FAAC_DIR= -# endif - -if USE_FAAD - FAAD_DIR=faad -else - FAAD_DIR= -endif - -## if USE_FESTIVAL -## FESTIVAL_DIR=festival -## else -## FESTIVAL_DIR= -## endif - -# if USE_GSM -# GSM_DIR=gsm +# DVDNAV_DIR = dvdnav # else -GSM_DIR= -# endif - -# if USE_HERMES -# HERMES_DIR=hermes -# else -HERMES_DIR= -# endif - -# if USE_JACK -# JACK_DIR=jack -# else -JACK_DIR= +DVDNAV_DIR = # endif if USE_LAME -LAME_DIR=lame +LAME_DIR = lame else -LAME_DIR= +LAME_DIR = endif -# if USE_LCS -# LCS_DIR=lcs -# else -LCS_DIR= -# endif - -# if USE_LIBFAME -# LIBFAME_DIR=libfame -# else -LIBFAME_DIR= -# endif - -# if USE_POLYP -# POLYP_DIR=polyp -# else -POLYP_DIR= -# endif - -# if USE_LIBVISUAL -# LIBVISUAL_DIR=libvisual -# else -LIBVISUAL_DIR= -# endif - -# if USE_LIBMMS -# LIBMMS_DIR=libmms -# else -LIBMMS_DIR= -# endif - if USE_MAD -MAD_DIR=mad +MAD_DIR = mad else -MAD_DIR= +MAD_DIR = endif if USE_MPEG2DEC - MPEG2DEC_DIR=mpeg2dec +MPEG2DEC_DIR = mpeg2dec else - MPEG2DEC_DIR= +MPEG2DEC_DIR = endif -# if USE_MPEG2ENC -# MPEG2ENC_DIR=mpeg2enc -# else -MPEG2ENC_DIR= -# endif - -# if USE_MPLEX -# MPLEX_DIR=mplex -# else -MPLEX_DIR= -# endif - -#if USE_MAS -#MAS_DIR=mas -#else -#MAS_DIR= -#endif - -# if USE_MUSEPACK -# MUSEPACK_DIR=musepack -# else -MUSEPACK_DIR= -# endif - -# if USE_MUSICBRAINZ -# MUSICBRAINZ_DIR=musicbrainz -# else -MUSICBRAINZ_DIR= -# endif - -# if USE_NAS -# NAS_DIR=nas -# else -NAS_DIR= -# endif - -# if USE_SDL -# SDL_DIR=sdl -# else -SDL_DIR= -# endif - -# if USE_SHOUT -# SHOUT_DIR=shout -# else -SHOUT_DIR= -# endif - if USE_SIDPLAY -SIDPLAY_DIR=sidplay +SIDPLAY_DIR = sidplay else -SIDDPLAY_DIR= +SIDPLAY_DIR = endif -# if USE_SMOOTHWAVE -# SMOOTHWAVE_DIR=smoothwave -# else -SMOOTHWAVE_DIR= -# endif - -# if USE_SNDFILE -# SNDFILE_DIR=sndfile -# else -SNDFILE_DIR= -# endif - -# if USE_SWFDEC -# SWFDEC_DIR=swfdec -# else -SWFDEC_DIR= -# endif - -# if USE_TARKIN -# TARKIN_DIR=tarkin -# else -TARKIN_DIR= -# endif - -# if USE_IVORBIS -# IVORBIS_DIR=ivorbis -# else -IVORBIS_DIR= -# endif - -# if USE_XVID -# XVID_DIR=xvid -# else -XVID_DIR= -# endif - -# if USE_LIBPNG -# SNAPSHOT_DIR=snapshot -# else -SNAPSHOT_DIR= -# endif - -# if USE_XINE -# XINE_DIR=xine -# else -XINE_DIR= -# endif - -SUBDIRS=\ +SUBDIRS = \ $(A52DEC_DIR) \ $(AMRNB_DIR) \ - $(ARTS_DIR) \ - $(ARTSC_DIR) \ - $(AUDIOFILE_DIR) \ - $(AUDIORESAMPLE_DIR) \ - $(CDAUDIO_DIR) \ - $(CDPARANOIA_DIR) \ - $(DIRAC_DIR) \ - $(DIRECTFB_DIR) \ - $(DIVX_DIR) \ - $(DTS_DIR) \ $(DVDNAV_DIR) \ - $(NAS_DIR) \ - $(FAAC_DIR) \ - $(FAAD_DIR) \ - $(GSM_DIR) \ - $(HERMES_DIR) \ - $(LIBMMS_DIR) \ - $(JACK_DIR) \ $(LAME_DIR) \ - $(LCS_DIR) \ - $(LIBDV_DIR) \ - $(LIBFAME_DIR) \ - $(LIBVISUAL_DIR) \ $(MAD_DIR) \ $(MPEG2DEC_DIR) \ - $(MPEG2ENC_DIR) \ - $(MPLEX_DIR) \ - $(MUSEPACK_DIR) \ - $(MUSICBRAINZ_DIR) \ - $(POLYP_DIR) \ - $(SDL_DIR) \ - $(SHOUT_DIR) \ - $(SIDPLAY_DIR) \ - $(SMOOTHWAVE_DIR) \ - $(SNAPSHOT_DIR) \ - $(SNDFILE_DIR) \ - $(SWFDEC_DIR) \ - $(TARKIN_DIR) \ - $(IVORBIS_DIR) \ - $(XINE_DIR) \ - $(XVID_DIR) + $(SIDPLAY_DIR) -DIST_SUBDIRS=\ +DIST_SUBDIRS = \ amrnb \ - faad \ lame \ mad \ mpeg2dec \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 9ea84a0c..e69de29b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,8 +0,0 @@ -ext/audiofile/gstafsink.c -ext/audiofile/gstafsrc.c -ext/sndfile/gstsf.c -gst/avi/gstavimux.c -sys/dxr3/dxr3audiosink.c -sys/dxr3/dxr3audiosink.c -sys/dxr3/dxr3videosink.c -sys/oss/gstossmixer.c |