From e6d37eb30a5b9d8142ca83202fd8af93739ad7fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Sat, 29 Sep 2012 11:59:31 +0100
Subject: [PATCH] Purge references to liboil

https://bugzilla.gnome.org/show_bug.cgi?id=673285
---
 gst/level/gstlevel.c             | 7 +++----
 tests/check/elements/videocrop.c | 8 --------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
index 5fc5be6fb3..b8b6d11058 100644
--- a/gst/level/gstlevel.c
+++ b/gst/level/gstlevel.c
@@ -361,6 +361,7 @@ DEFINE_INT_LEVEL_CALCULATOR (gint32, 31);
 DEFINE_INT_LEVEL_CALCULATOR (gint16, 15);
 DEFINE_INT_LEVEL_CALCULATOR (gint8, 7);
 
+/* FIXME: use orc to calculate squaresums? */
 #define DEFINE_FLOAT_LEVEL_CALCULATOR(TYPE)                                   \
 static void inline                                                            \
 gst_level_calculate_##TYPE (gpointer data, guint num, guint channels,         \
@@ -375,7 +376,7 @@ gst_level_calculate_##TYPE (gpointer data, guint num, guint channels,         \
   /* *NCS = 0.0; Normalized Cumulative Square */                              \
   /* *NPS = 0.0; Normalized Peask Square */                                   \
                                                                               \
-  /* oil_squaresum_f64(&squaresum,in,num); */                                 \
+  /* orc_level_squaresum_f64(&squaresum,in,num); */                           \
   for (j = 0; j < num; j += channels)                                         \
   {                                                                           \
     square = ((gdouble) in[j]) * in[j];                                       \
@@ -395,7 +396,7 @@ static void inline
 gst_level_calculate_gdouble (gpointer data, guint num, guint channels,
                             gdouble *NCS, gdouble *NPS)
 {
-  oil_squaresum_f64(NCS,(gdouble *)data,num);
+  orc_level_squaresum_f64(NCS,(gdouble *)data,num);
   *NPS = 0.0;
 }
 */
@@ -702,8 +703,6 @@ gst_level_transform_ip (GstBaseTransform * trans, GstBuffer * in)
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  /*oil_init (); */
-
   return gst_element_register (plugin, "level", GST_RANK_NONE, GST_TYPE_LEVEL);
 }
 
diff --git a/tests/check/elements/videocrop.c b/tests/check/elements/videocrop.c
index 4e6e4ab684..9baaafba2e 100644
--- a/tests/check/elements/videocrop.c
+++ b/tests/check/elements/videocrop.c
@@ -786,14 +786,6 @@ main (int argc, char **argv)
   Suite *s = videocrop_suite ();
   SRunner *sr = srunner_create (s);
 
-#ifdef HAVE_VALGRIND
-  if (RUNNING_ON_VALGRIND) {
-    /* otherwise valgrind errors out when liboil probes CPU extensions
-     * in oil_init() during which it causes SIGILLs etc. to be fired */
-    g_setenv ("OIL_CPU_FLAGS", "0", 0);
-  }
-#endif
-
   gst_check_init (&argc, &argv);
 
   srunner_run_all (sr, CK_NORMAL);