as promised, the header changes and some of wingo's virtual fixes as well by accident

Original commit message from CVS:
as promised, the header changes
and some of wingo's virtual fixes as well by accident

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 08a2a921fe8dd88d2e1b4fb502728f2ec94c31f1..8a485d9e647b8628b9e79dcafdec786c4cabb83e 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -1,4 +1,3 @@
-
 lib_LTLIBRARIES = libgstreamer.la
 noinst_LTLIBRARIES = libcothreads.la
 
@@ -123,7 +122,7 @@ dist-hook:
 distclean-local:
        rm -f $(top_builddir)/gst/gstmarshal.c $(top_builddir)/gst/gstmarshal.h
 
-libgstreamerincludedir = $(includedir)/gst
+libgstreamerincludedir = $(includedir)/gstreamer-@VERSION@/gst
 libgstreamerinclude_HEADERS =          \
        gst.h                   \
        gstconfig.h             \

diff --git a/gst/schedulers/cothreads_compat.h b/gst/schedulers/cothreads_compat.h
index 0ec30b1a54eca6a13c9a5e16dafcdc29e60bebec..0322749419fdac92eeee41093917a31f80ade01d 100644 (file)
--- a/gst/schedulers/cothreads_compat.h
+++ b/gst/schedulers/cothreads_compat.h
@@ -90,7 +90,7 @@ typedef cothread cothread_context;
  */
 #define do_cothreads_init(x) G_STMT_START{     \
     if (!cothreads_initialized())      \
-      cothreads_init(0x0200000, 32);   \
+      cothreads_init(0x0200000, 16);   \
   }G_STMT_END
 
 #define do_cothreads_stackquery(stack,size)    \

diff --git a/gstreamer.pc.in b/gstreamer.pc.in
index 5f013622b07f06b0a8e0209cac8c48f2b73973c4..91c67711365016069efc24b393a55f5835b371f0 100644 (file)
--- a/gstreamer.pc.in
+++ b/gstreamer.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/gstreamer-@VERSION@
 toolsdir=${exec_prefix}/bin
 
 Name: GStreamer

diff --git a/gstreamer.spec.in b/gstreamer.spec.in
index d9b7168eaa996a3805781ba7317fecebeb5e0cfd..c65011f1e454fe0124198c6a640a526dcfdf694b 100644 (file)
--- a/gstreamer.spec.in
+++ b/gstreamer.spec.in
@@ -145,7 +145,7 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/gst
+%{_includedir}/%{name}-%{version}/gst
 %{_libdir}/libgstreamer.a
 %{_libdir}/libgstreamer.so
 %{_libdir}/pkgconfig/gstreamer*.pc
@@ -206,6 +206,9 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
 
 
 %changelog
+* Sat Jun 22 2002 Thomas Vander Stichele <thomas@apestaart.org>
+- moved header location
+
 * Mon Jun 17 2002 Thomas Vander Stichele <thomas@apestaart.org>
 - added popt
 - removed .la

diff --git a/libs/gst/bytestream/Makefile.am b/libs/gst/bytestream/Makefile.am
index 5f70e7d58f7e97e99c0a2beadffa64985e458356..ee255bd63f6bedd443dade45be41ec1f54837ee7 100644 (file)
--- a/libs/gst/bytestream/Makefile.am
+++ b/libs/gst/bytestream/Makefile.am
@@ -3,7 +3,7 @@ librarydir = $(libdir)/gst
 library_LTLIBRARIES = libgstbytestream.la
 noinst_LTLIBRARIES = libgstbstest.la
 
-libgstbytestreamincludedir = $(includedir)/gst/bytestream
+libgstbytestreamincludedir = $(includedir)/gstreamer-@VERSION@/gst/bytestream
 libgstbytestreaminclude_HEADERS = bytestream.h
 
 libgstbytestream_la_SOURCES = bytestream.c 

diff --git a/libs/gst/control/Makefile.am b/libs/gst/control/Makefile.am
index 6a7533f23b200e185c4c4dc67d5910fb50dff66b..a5da982b40632cce6e1d140a1069cb5aa0451db3 100644 (file)
--- a/libs/gst/control/Makefile.am
+++ b/libs/gst/control/Makefile.am
@@ -2,7 +2,7 @@ librarydir = $(libdir)/gst
 
 library_LTLIBRARIES = libgstcontrol.la
 
-libgstcontrolincludedir = $(includedir)/gst/control
+libgstcontrolincludedir = $(includedir)/gstreamer-@VERSION@/gst/control
 libgstcontrolinclude_HEADERS = \
     control.h \
     dparammanager.h \

diff --git a/libs/gst/getbits/Makefile.am b/libs/gst/getbits/Makefile.am
index 38a66ff19ca053690f8af12a7f317e28b764f67f..62d39efa3f47de30ff317717a93a95873488435d 100644 (file)
--- a/libs/gst/getbits/Makefile.am
+++ b/libs/gst/getbits/Makefile.am
@@ -8,7 +8,7 @@ else
 GSTARCH_SRCS = 
 endif
 
-libgstgetbitsincludedir = $(includedir)/gst/getbits
+libgstgetbitsincludedir = $(includedir)/gstreamer-@VERSION@/gst/getbits
 libgstgetbitsinclude_HEADERS = getbits.h
 
 libgstgetbits_la_SOURCES = getbits.c gstgetbits_inl.h gstgetbits_generic.c $(GSTARCH_SRCS)

diff --git a/libs/gst/putbits/Makefile.am b/libs/gst/putbits/Makefile.am
index 31e2d8085f2a219cc9ff950485f7d43331526e15..9dcbf7d3a613754c04996d1ef8b9bc948d022f68 100644 (file)
--- a/libs/gst/putbits/Makefile.am
+++ b/libs/gst/putbits/Makefile.am
@@ -2,7 +2,7 @@ librarydir = $(libdir)/gst
 
 library_LTLIBRARIES = libgstputbits.la
 
-libgstputbitsincludedir = $(includedir)/gst/putbits
+libgstputbitsincludedir = $(includedir)/gstreamer-@VERSION@/gst/putbits
 libgstputbitsinclude_HEADERS = putbits.h
 
 libgstputbits_la_SOURCES = putbits.c