[xiph-commits] r9628 - branches/ogg2-arc

j at svn.xiph.org j at svn.xiph.org
Tue Jul 26 10:11:52 PDT 2005


Author: j
Date: 2005-07-26 10:11:45 -0700 (Tue, 26 Jul 2005)
New Revision: 9628

Added:
   branches/ogg2-arc/libogg2.spec.in
   branches/ogg2-arc/ogg2-uninstalled.pc.in
   branches/ogg2-arc/ogg2.m4
   branches/ogg2-arc/ogg2.pc.in
Removed:
   branches/ogg2-arc/libogg.spec.in
   branches/ogg2-arc/ogg-uninstalled.pc.in
   branches/ogg2-arc/ogg.m4
   branches/ogg2-arc/ogg.pc.in
Modified:
   branches/ogg2-arc/Makefile.am
   branches/ogg2-arc/configure.in
Log:
- rename ogg -> ogg2 in 
     pkg-config files,m4 file and spec file



Modified: branches/ogg2-arc/Makefile.am
===================================================================
--- branches/ogg2-arc/Makefile.am	2005-07-26 17:00:39 UTC (rev 9627)
+++ branches/ogg2-arc/Makefile.am	2005-07-26 17:11:45 UTC (rev 9628)
@@ -5,13 +5,13 @@
 SUBDIRS = src include doc win32 debian
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = ogg.m4
+m4data_DATA = ogg2.m4
 
-EXTRA_DIST = README AUTHORS CHANGES COPYING libogg.spec ogg.m4 \
+EXTRA_DIST = README AUTHORS CHANGES COPYING libogg2.spec ogg2.m4 \
 	macos macosx
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ogg.pc
+pkgconfig_DATA = ogg2.pc
 
 dist-hook:
 	rm -rf `find $(distdir)/macos -name CVS`

Modified: branches/ogg2-arc/configure.in
===================================================================
--- branches/ogg2-arc/configure.in	2005-07-26 17:00:39 UTC (rev 9627)
+++ branches/ogg2-arc/configure.in	2005-07-26 17:11:45 UTC (rev 9628)
@@ -302,7 +302,7 @@
 include/ogg/config_types.h
 win32/Makefile
 debian/Makefile
-libogg.spec
-ogg.pc
-ogg-uninstalled.pc
+libogg2.spec
+ogg2.pc
+ogg2-uninstalled.pc
 ])

Deleted: branches/ogg2-arc/libogg.spec.in
===================================================================
--- branches/ogg2-arc/libogg.spec.in	2005-07-26 17:00:39 UTC (rev 9627)
+++ branches/ogg2-arc/libogg.spec.in	2005-07-26 17:11:45 UTC (rev 9628)
@@ -1,106 +0,0 @@
-Name:		libogg
-Version:	@VERSION@
-Release:	0.xiph.1
-Summary:	Ogg Bitstream Library.
-
-Group:		System Environment/Libraries
-License:	BSD
-URL:		http://www.xiph.org/
-Vendor:		Xiph.org Foundation <team at xiph.org>
-Source:		http://www.vorbis.com/files/1.0.1/unix/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-# We're forced to use an epoch since both Red Hat and Ximian use it in their
-# rc packages
-Epoch:		2
-# Dirty trick to tell rpm that this package actually provides what the
-# last rc and beta was offering
-Provides:	%{name} = %{epoch}:1.0rc3-%{release}
-Provides:	%{name} = %{epoch}:1.0beta4-%{release}
-
-%description
-Libogg is a library for manipulating ogg bitstreams.  It handles
-both making ogg bitstreams and getting packets from ogg bitstreams.
-
-%package devel
-Summary: 	Ogg Bitstream Library Development
-Group: 		Development/Libraries
-Requires: 	libogg = %{version}
-# Dirty trick to tell rpm that this package actually provides what the
-# last rc and beta was offering
-Provides:	%{name}-devel = %{epoch}:1.0rc3-%{release}
-Provides:	%{name}-devel = %{epoch}:1.0beta4-%{release}
-
-%description devel
-The libogg-devel package contains the header files, static libraries
-and documentation needed to develop applications with libogg.
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --enable-static
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root)
-%doc AUTHORS CHANGES COPYING README
-%{_libdir}/libogg.so.*
-
-%files devel
-%defattr(-,root,root)
-%doc doc/index.html
-%doc doc/framing.html
-%doc doc/oggstream.html
-%doc doc/white-ogg.png
-%doc doc/white-xifish.png
-%doc doc/stream.png
-%doc doc/ogg/*.html
-%doc doc/ogg/style.css
-%dir %{_includedir}/ogg
-%{_includedir}/ogg/ogg.h
-%{_includedir}/ogg/os_types.h
-%{_includedir}/ogg/config_types.h
-%{_libdir}/libogg.a
-%{_libdir}/libogg.la
-%{_libdir}/libogg.so
-%{_libdir}/pkgconfig/ogg.pc
-%{_datadir}/aclocal/ogg.m4
-
-%changelog
-* Thu Jun 10 2004 Thomas Vander Stichele <thomas at apestaart dot org>
-- autogenerate from configure
-- fix download location
-- remove Prefix
-- own include dir
-- move ldconfig runs to -p scripts
-- change Release tag to include xiph
-
-* Tue Oct 07 2003 Warren Dukes <shank at xiph.org>
-- update for 1.1 release
-
-* Sun Jul 14 2002 Thomas Vander Stichele <thomas at apestaart.org>
-- update for 1.0 release
-- conform Group to Red Hat's idea of it
-- take out case where configure doesn't exist; a tarball should have it
-
-* Tue Dec 18 2001 Jack Moffitt <jack at xiph.org>
-- Update for RC3 release
-
-* Sun Oct 07 2001 Jack Moffitt <jack at xiph.org>
-- add support for configurable prefixes
-
-* Sat Sep 02 2000 Jack Moffitt <jack at icecast.org>
-- initial spec file created

Copied: branches/ogg2-arc/libogg2.spec.in (from rev 9627, branches/ogg2-arc/libogg.spec.in)
===================================================================
--- branches/ogg2-arc/libogg.spec.in	2005-07-26 17:00:39 UTC (rev 9627)
+++ branches/ogg2-arc/libogg2.spec.in	2005-07-26 17:11:45 UTC (rev 9628)
@@ -0,0 +1,106 @@
+Name:		libogg2
+Version:	@VERSION@
+Release:	0.xiph.1
+Summary:	Ogg Bitstream Library.
+
+Group:		System Environment/Libraries
+License:	BSD
+URL:		http://www.xiph.org/
+Vendor:		Xiph.org Foundation <team at xiph.org>
+Source:		http://www.vorbis.com/files/1.0.1/unix/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+
+# We're forced to use an epoch since both Red Hat and Ximian use it in their
+# rc packages
+Epoch:		2
+# Dirty trick to tell rpm that this package actually provides what the
+# last rc and beta was offering
+Provides:	%{name} = %{epoch}:1.0rc3-%{release}
+Provides:	%{name} = %{epoch}:1.0beta4-%{release}
+
+%description
+Libogg is a library for manipulating ogg bitstreams.  It handles
+both making ogg bitstreams and getting packets from ogg bitstreams.
+
+%package devel
+Summary: 	Ogg Bitstream Library Development
+Group: 		Development/Libraries
+Requires: 	libogg = %{version}
+# Dirty trick to tell rpm that this package actually provides what the
+# last rc and beta was offering
+Provides:	%{name}-devel = %{epoch}:1.0rc3-%{release}
+Provides:	%{name}-devel = %{epoch}:1.0beta4-%{release}
+
+%description devel
+The libogg-devel package contains the header files, static libraries
+and documentation needed to develop applications with libogg.
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --enable-static
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make DESTDIR=$RPM_BUILD_ROOT install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS CHANGES COPYING README
+%{_libdir}/libogg.so.*
+
+%files devel
+%defattr(-,root,root)
+%doc doc/index.html
+%doc doc/framing.html
+%doc doc/oggstream.html
+%doc doc/white-ogg.png
+%doc doc/white-xifish.png
+%doc doc/stream.png
+%doc doc/ogg/*.html
+%doc doc/ogg/style.css
+%dir %{_includedir}/ogg
+%{_includedir}/ogg/ogg2.h
+%{_includedir}/ogg/os_types.h
+%{_includedir}/ogg/config_types.h
+%{_libdir}/libogg2.a
+%{_libdir}/libogg2.la
+%{_libdir}/libogg2.so
+%{_libdir}/pkgconfig/ogg2.pc
+%{_datadir}/aclocal/ogg2.m4
+
+%changelog
+* Thu Jun 10 2004 Thomas Vander Stichele <thomas at apestaart dot org>
+- autogenerate from configure
+- fix download location
+- remove Prefix
+- own include dir
+- move ldconfig runs to -p scripts
+- change Release tag to include xiph
+
+* Tue Oct 07 2003 Warren Dukes <shank at xiph.org>
+- update for 1.1 release
+
+* Sun Jul 14 2002 Thomas Vander Stichele <thomas at apestaart.org>
+- update for 1.0 release
+- conform Group to Red Hat's idea of it
+- take out case where configure doesn't exist; a tarball should have it
+
+* Tue Dec 18 2001 Jack Moffitt <jack at xiph.org>
+- Update for RC3 release
+
+* Sun Oct 07 2001 Jack Moffitt <jack at xiph.org>
+- add support for configurable prefixes
+
+* Sat Sep 02 2000 Jack Moffitt <jack at icecast.org>
+- initial spec file created

Deleted: branches/ogg2-arc/ogg-uninstalled.pc.in
===================================================================
--- branches/ogg2-arc/ogg-uninstalled.pc.in	2005-07-26 17:00:39 UTC (rev 9627)
+++ branches/ogg2-arc/ogg-uninstalled.pc.in	2005-07-26 17:11:45 UTC (rev 9628)
@@ -1,14 +0,0 @@
-# ogg uninstalled pkg-config file
-
-prefix=
-exec_prefix=
-libdir=${pcfiledir}/src
-includedir=${pcfiledir}/include
-
-Name: ogg
-Description: ogg is a library for manipulating ogg bitstreams (not installed)
-Version: @VERSION@
-Requires:
-Conflicts:
-Libs: ${libdir}/libogg.la
-Cflags: -I${includedir}

Deleted: branches/ogg2-arc/ogg.m4
===================================================================
--- branches/ogg2-arc/ogg.m4	2005-07-26 17:00:39 UTC (rev 9627)
+++ branches/ogg2-arc/ogg.m4	2005-07-26 17:11:45 UTC (rev 9628)
@@ -1,102 +0,0 @@
-# Configure paths for libogg
-# Jack Moffitt <jack at icecast.org> 10-21-2000
-# Shamelessly stolen from Owen Taylor and Manish Singh
-
-dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
-dnl
-AC_DEFUN(XIPH_PATH_OGG,
-[dnl 
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(ogg,[  --with-ogg=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
-AC_ARG_WITH(ogg-libraries,[  --with-ogg-libraries=DIR   Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
-AC_ARG_WITH(ogg-includes,[  --with-ogg-includes=DIR   Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="")
-AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
-
-  if test "x$ogg_libraries" != "x" ; then
-    OGG_LIBS="-L$ogg_libraries"
-  elif test "x$ogg_prefix" != "x" ; then
-    OGG_LIBS="-L$ogg_prefix/lib"
-  elif test "x$prefix" != "xNONE" ; then
-    OGG_LIBS="-L$prefix/lib"
-  fi
-
-  OGG_LIBS="$OGG_LIBS -logg2"
-
-  if test "x$ogg_includes" != "x" ; then
-    OGG_CFLAGS="-I$ogg_includes"
-  elif test "x$ogg_prefix" != "x" ; then
-    OGG_CFLAGS="-I$ogg_prefix/include"
-  elif test "$prefix" != "xNONE"; then
-    OGG_CFLAGS="-I$prefix/include"
-  fi
-
-  AC_MSG_CHECKING(for Ogg)
-  no_ogg=""
-
-
-  if test "x$enable_oggtest" = "xyes" ; then
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $OGG_CFLAGS"
-    LIBS="$LIBS $OGG_LIBS"
-dnl
-dnl Now check if the installed Ogg is sufficiently new.
-dnl
-      rm -f conf.oggtest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ogg2/ogg.h>
-
-int main ()
-{
-  system("touch conf.oggtest");
-  return 0;
-}
-
-],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-  fi
-
-  if test "x$no_ogg" = "x" ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$1], , :, [$1])     
-  else
-     AC_MSG_RESULT(no)
-     if test -f conf.oggtest ; then
-       :
-     else
-       echo "*** Could not run Ogg test program, checking why..."
-       CFLAGS="$CFLAGS $OGG_CFLAGS"
-       LIBS="$LIBS $OGG_LIBS"
-       AC_TRY_LINK([
-#include <stdio.h>
-#include <ogg2/ogg.h>
-],     [ return 0; ],
-       [ echo "*** The test program compiled, but did not run. This usually means"
-       echo "*** that the run-time linker is not finding Ogg or finding the wrong"
-       echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
-       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-       echo "*** is required on your system"
-       echo "***"
-       echo "*** If you have an old version installed, it is best to remove it, although"
-       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-       [ echo "*** The test program failed to compile or link. See the file config.log for the"
-       echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
-       echo "*** or that you have moved Ogg since it was installed." ])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-     OGG_CFLAGS=""
-     OGG_LIBS=""
-     ifelse([$2], , :, [$2])
-  fi
-  AC_SUBST(OGG_CFLAGS)
-  AC_SUBST(OGG_LIBS)
-  rm -f conf.oggtest
-])

Deleted: branches/ogg2-arc/ogg.pc.in
===================================================================
--- branches/ogg2-arc/ogg.pc.in	2005-07-26 17:00:39 UTC (rev 9627)
+++ branches/ogg2-arc/ogg.pc.in	2005-07-26 17:11:45 UTC (rev 9628)
@@ -1,14 +0,0 @@
-# ogg pkg-config file
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: ogg
-Description: ogg is a library for manipulating ogg bitstreams
-Version: @VERSION@
-Requires:
-Conflicts:
-Libs: -L${libdir} -logg2
-Cflags: -I${includedir}

Copied: branches/ogg2-arc/ogg2-uninstalled.pc.in (from rev 9627, branches/ogg2-arc/ogg-uninstalled.pc.in)
===================================================================
--- branches/ogg2-arc/ogg-uninstalled.pc.in	2005-07-26 17:00:39 UTC (rev 9627)
+++ branches/ogg2-arc/ogg2-uninstalled.pc.in	2005-07-26 17:11:45 UTC (rev 9628)
@@ -0,0 +1,14 @@
+# ogg uninstalled pkg-config file
+
+prefix=
+exec_prefix=
+libdir=${pcfiledir}/src
+includedir=${pcfiledir}/include
+
+Name: ogg2
+Description: ogg2 is a library for manipulating ogg bitstreams (not installed)
+Version: @VERSION@
+Requires:
+Conflicts:
+Libs: ${libdir}/libogg2.la
+Cflags: -I${includedir}

Copied: branches/ogg2-arc/ogg2.m4 (from rev 9627, branches/ogg2-arc/ogg.m4)
===================================================================
--- branches/ogg2-arc/ogg.m4	2005-07-26 17:00:39 UTC (rev 9627)
+++ branches/ogg2-arc/ogg2.m4	2005-07-26 17:11:45 UTC (rev 9628)
@@ -0,0 +1,102 @@
+# Configure paths for libogg
+# Jack Moffitt <jack at icecast.org> 10-21-2000
+# Shamelessly stolen from Owen Taylor and Manish Singh
+
+dnl XIPH_PATH_OGG2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for libogg, and define OGG2_CFLAGS and OGG2_LIBS
+dnl
+AC_DEFUN(XIPH_PATH_OGG2,
+[dnl 
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(ogg2,[  --with-ogg2=PFX   Prefix where libogg2 is installed (optional)], ogg2_prefix="$withval", ogg2_prefix="")
+AC_ARG_WITH(ogg2-libraries,[  --with-ogg2-libraries=DIR   Directory where libogg2 library is installed (optional)], ogg2_libraries="$withval", ogg2_libraries="")
+AC_ARG_WITH(ogg2-includes,[  --with-ogg2-includes=DIR   Directory where libogg2 header files are installed (optional)], ogg2_includes="$withval", ogg2_includes="")
+AC_ARG_ENABLE(ogg2test, [  --disable-ogg2test       Do not try to compile and run a test Ogg program],, enable_ogg2test=yes)
+
+  if test "x$ogg2_libraries" != "x" ; then
+    OGG2_LIBS="-L$ogg2_libraries"
+  elif test "x$ogg2_prefix" != "x" ; then
+    OGG2_LIBS="-L$ogg2_prefix/lib"
+  elif test "x$prefix" != "xNONE" ; then
+    OGG2_LIBS="-L$prefix/lib"
+  fi
+
+  OGG2_LIBS="$OGG2_LIBS -logg2"
+
+  if test "x$ogg2_includes" != "x" ; then
+    OGG_CFLAGS="-I$ogg2_includes"
+  elif test "x$ogg_prefix" != "x" ; then
+    OGG2_CFLAGS="-I$ogg2_prefix/include"
+  elif test "$prefix" != "xNONE"; then
+    OGG2_CFLAGS="-I$prefix/include"
+  fi
+
+  AC_MSG_CHECKING(for Ogg2)
+  no_ogg2=""
+
+
+  if test "x$enable_ogg2test" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $OGG2_CFLAGS"
+    LIBS="$LIBS $OGG2_LIBS"
+dnl
+dnl Now check if the installed Ogg2 is sufficiently new.
+dnl
+      rm -f conf.ogg2test
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ogg/ogg2.h>
+
+int main ()
+{
+  system("touch conf.ogg2test");
+  return 0;
+}
+
+],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_ogg2" = "x" ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])     
+  else
+     AC_MSG_RESULT(no)
+     if test -f conf.ogg2test ; then
+       :
+     else
+       echo "*** Could not run Ogg2 test program, checking why..."
+       CFLAGS="$CFLAGS $OGG2_CFLAGS"
+       LIBS="$LIBS $OGG2_LIBS"
+       AC_TRY_LINK([
+#include <stdio.h>
+#include <ogg/ogg2.h>
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding Ogg2 or finding the wrong"
+       echo "*** version of Ogg2. If it is not finding Ogg2, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occured. This usually means Ogg2 was incorrectly installed"
+       echo "*** or that you have moved Ogg2 since it was installed." ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+     OGG2_CFLAGS=""
+     OGG2_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(OGG2_CFLAGS)
+  AC_SUBST(OGG2_LIBS)
+  rm -f conf.ogg2test
+])

Copied: branches/ogg2-arc/ogg2.pc.in (from rev 9627, branches/ogg2-arc/ogg.pc.in)
===================================================================
--- branches/ogg2-arc/ogg.pc.in	2005-07-26 17:00:39 UTC (rev 9627)
+++ branches/ogg2-arc/ogg2.pc.in	2005-07-26 17:11:45 UTC (rev 9628)
@@ -0,0 +1,14 @@
+# ogg pkg-config file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ogg2
+Description: ogg2 is a library for manipulating ogg bitstreams
+Version: @VERSION@
+Requires:
+Conflicts:
+Libs: -L${libdir} -logg2
+Cflags: -I${includedir}



More information about the commits mailing list