From d3e33a16ac00aaa060e8afa5860c7a830388b737 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 22 Jun 2002 23:17:44 +0000 Subject: [PATCH] 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 --- gst/Makefile.am | 3 +-- gst/schedulers/cothreads_compat.h | 2 +- gstreamer.pc.in | 2 +- gstreamer.spec.in | 5 ++++- libs/gst/bytestream/Makefile.am | 2 +- libs/gst/control/Makefile.am | 2 +- libs/gst/getbits/Makefile.am | 2 +- libs/gst/putbits/Makefile.am | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gst/Makefile.am b/gst/Makefile.am index 08a2a92..8a485d9 100644 --- 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 0ec30b1..0322749 100644 --- 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 5f01362..91c6771 100644 --- 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 d9b7168..c65011f 100644 --- 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 +- moved header location + * Mon Jun 17 2002 Thomas Vander Stichele - added popt - removed .la diff --git a/libs/gst/bytestream/Makefile.am b/libs/gst/bytestream/Makefile.am index 5f70e7d..ee255bd 100644 --- 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 6a7533f..a5da982 100644 --- 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 38a66ff..62d39ef 100644 --- 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 31e2d80..9dcbf7d 100644 --- 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 -- 2.7.4