diff options
| author | Stefano Karapetsas <[email protected]> | 2012-12-11 05:30:20 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-12-11 05:30:20 -0800 |
| commit | 8b041cf52c62250df59c47bd5dc86364da19e6a1 (patch) | |
| tree | c13de2017853b5278f7e676b961c7c3220783e95 | |
| parent | c4694f10a62bd1e85a0639c542c508a774aeba2b (diff) | |
| parent | 0a704bf5cfc017bdbc0565615b28bbae9d4884d4 (diff) | |
| download | mate-media-8b041cf52c62250df59c47bd5dc86364da19e6a1.tar.bz2 mate-media-8b041cf52c62250df59c47bd5dc86364da19e6a1.tar.xz | |
Merge pull request #15 from dmashal/master
fix compilation errors for gstreamer support the right way.
| -rw-r--r-- | COPYING.gst-mixer | 18 | ||||
| -rw-r--r-- | gst-mixer/src/Makefile.am | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/COPYING.gst-mixer b/COPYING.gst-mixer index eb685a5..8c8377d 100644 --- a/COPYING.gst-mixer +++ b/COPYING.gst-mixer @@ -51,7 +51,7 @@ library. If the library is modified by someone else and passed on, we want its recipients to know that what they have is not the original version, 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 companies distributing free software will individually obtain patent licenses, thus in effect @@ -98,7 +98,7 @@ works together with the library. Note that it is possible for a library to be covered by the ordinary General Public License rather than by this special one. - + GNU LIBRARY GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -145,7 +145,7 @@ 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 @@ -203,7 +203,7 @@ 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. @@ -254,7 +254,7 @@ Library will still fall under Section 6.) 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 compile or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -308,7 +308,7 @@ 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 @@ -349,7 +349,7 @@ 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. - + 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 @@ -401,7 +401,7 @@ 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 @@ -435,7 +435,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + Appendix: How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest diff --git a/gst-mixer/src/Makefile.am b/gst-mixer/src/Makefile.am index e702eb7..86042a3 100644 --- a/gst-mixer/src/Makefile.am +++ b/gst-mixer/src/Makefile.am @@ -37,7 +37,8 @@ noinst_HEADERS = \ mate_volume_control_LDFLAGS = \ $(GVC_ST_LIBS) \ - $(GSTMIXER_LIBS) + $(GSTMIXER_LIBS) \ + -lm -include $(top_srcdir)/git.mk |