[Pkg-ocaml-maint-commits] [SCM] ocaml-theora packaging branch, upstream, updated. upstream/0.2.0.svn6618-1-gf892d72

[Romain Beauxis]

The following commit has been merged in the upstream branch:
commit f892d72bfb4c2f1dfb060cefbcc02f3a0efe986e
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Thu Aug 19 13:54:28 2010 -0500

    Imported Upstream version 0.2.0

diff --git a/CHANGES b/CHANGES
index 2d07a4e..3b07921 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-0.2.0 (24-03-2010)
+0.2.0 (19-06-2010)
 =====
 * Binded 1.1 theora API.
 
diff --git a/configure b/configure
index 7bc37af..ba09f76 100755
--- a/configure
+++ b/configure
@@ -572,6 +572,8 @@ OCAMLOGG_INC
 libtheora_LDFLAGS
 libtheora_LIBS
 libtheora_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
 OBJEXT
 EXEEXT
@@ -640,7 +642,9 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-PKG_CONFIG'
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR'
 
 
 # Initialize some variables set by options.
@@ -1271,6 +1275,10 @@ Some influential environment variables:
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -2935,6 +2943,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -3047,7 +3059,6 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
-
 fi
 
 # PKG_CHECK_MODULES loses when you need --libs-only-[lL]
diff --git a/examples/Makefile b/examples/Makefile
index e81adcc..f605226 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,4 +1,4 @@
-# OCaml-Lastfm examples.
+# OCaml-theora examples.
 #
 # Copyright 2007 by the Savonet team.
 #
diff --git a/src/theora_stubs.c b/src/theora_stubs.c
index ad70720..0c62753 100644
--- a/src/theora_stubs.c
+++ b/src/theora_stubs.c
@@ -273,7 +273,7 @@ static value val_of_yuv(th_ycbcr_buffer buffer)
   len = buffer[0].stride*buffer[0].height;
   data = malloc(len);
   if (data == NULL)
-    caml_failwith("malloc");
+    caml_raise_out_of_memory();
   y = caml_ba_alloc(CAML_BA_MANAGED | CAML_BA_C_LAYOUT | CAML_BA_UINT8, 1, data, &len);
   memcpy(data,buffer[0].data,len);
   Store_field (ret, i++, y);
@@ -285,7 +285,7 @@ static value val_of_yuv(th_ycbcr_buffer buffer)
   len = buffer[1].stride*buffer[1].height;
   data = malloc(len);
   if (data == NULL)
-    caml_failwith("malloc");
+    caml_raise_out_of_memory();
   u = caml_ba_alloc(CAML_BA_MANAGED | CAML_BA_C_LAYOUT | CAML_BA_UINT8, 1, data, &len);
   memcpy(data,buffer[1].data,len);
   Store_field (ret, i++, u);
@@ -297,7 +297,7 @@ static value val_of_yuv(th_ycbcr_buffer buffer)
   len = buffer[2].stride*buffer[2].height;
   data = malloc(len);
   if (data == NULL)
-    caml_failwith("malloc");
+    caml_raise_out_of_memory();
   v = caml_ba_alloc(CAML_BA_MANAGED | CAML_BA_C_LAYOUT | CAML_BA_UINT8, 1, data, &len);
   memcpy(data,buffer[2].data,len);
   Store_field (ret, i++, v);
@@ -551,7 +551,7 @@ CAMLprim value ocaml_theora_create_dec(value unit)
   CAMLlocal1(ret);
   dec_state_t *state = malloc(sizeof(dec_state_t));
   if (state == NULL) 
-    caml_failwith("malloc");
+    caml_raise_out_of_memory();
   th_comment_init(&state->tc);
   th_info_init(&state->ti);
   state->ts = NULL;
@@ -672,7 +672,7 @@ CAMLprim value ocaml_theora_skeleton_fisbone(value serial, value info, value sta
   memset (&op, 0, sizeof (op));
   op.packet = malloc(len);
   if (op.packet == NULL)
-    caml_failwith("malloc");
+    caml_raise_out_of_memory();
 
   memset (op.packet, 0, len);
   /* it will be the fisbone packet for the theora video */

-- 
ocaml-theora packaging