From 8a10a72caa0740bf706620c16e503b69bb07a988 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@mobile.openelec.tv>
Date: Sat, 3 Oct 2009 22:56:59 +0200
Subject: [PATCH] new package: - add libplayer for upcoming enna

---
 packages/multimedia/libplayer/build           | 30 +++++++++++++++
 packages/multimedia/libplayer/install         | 16 ++++++++
 .../multimedia/libplayer/patches/atof.diff    | 38 +++++++++++++++++++
 .../libplayer-add_libX11_to_extralibs.diff    | 35 +++++++++++++++++
 packages/multimedia/libplayer/url             |  1 +
 5 files changed, 120 insertions(+)
 create mode 100644 packages/multimedia/libplayer/build
 create mode 100644 packages/multimedia/libplayer/install
 create mode 100644 packages/multimedia/libplayer/patches/atof.diff
 create mode 100644 packages/multimedia/libplayer/patches/libplayer-add_libX11_to_extralibs.diff
 create mode 100644 packages/multimedia/libplayer/url

diff --git a/packages/multimedia/libplayer/build b/packages/multimedia/libplayer/build
new file mode 100644
index 0000000000..a2f73d3218
--- /dev/null
+++ b/packages/multimedia/libplayer/build
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+$SCRIPTS/build libX11
+# $SCRIPTS/build xine-lib
+
+cd $PKG_BUILD
+
+./configure --prefix=/usr \
+            --disable-static \
+            --enable-shared \
+            --disable-debug \
+            --cross-compile \
+            --disable-doc \
+            --enable-logcolor \
+            --enable-mplayer \
+            --disable-xine \
+            --disable-vlc \
+            --disable-gstreamer \
+            --disable-binding-python \
+            --enable-x11
+
+make -C src
+make test
+
+$MAKEINSTALL -C src
+
+cp -f libplayer.pc $SYSROOT_PREFIX/usr/lib/pkgconfig/
diff --git a/packages/multimedia/libplayer/install b/packages/multimedia/libplayer/install
new file mode 100644
index 0000000000..508c3589f0
--- /dev/null
+++ b/packages/multimedia/libplayer/install
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/install libX11
+$SCRIPTS/install mplayer
+# $SCRIPTS/install xine-lib
+
+if [ "$DEVTOOLS" = yes ]; then
+  mkdir -p $INSTALL/usr/bin
+  cp $BUILD/$1*/test-player $INSTALL/usr/bin
+  cp $BUILD/$1*/test-vdr $INSTALL/usr/bin
+fi
+
+mkdir -p $INSTALL/usr/lib
+cp -PR $BUILD/$1*/src/libplayer.so* $INSTALL/usr/lib
diff --git a/packages/multimedia/libplayer/patches/atof.diff b/packages/multimedia/libplayer/patches/atof.diff
new file mode 100644
index 0000000000..b4c0f8aef6
--- /dev/null
+++ b/packages/multimedia/libplayer/patches/atof.diff
@@ -0,0 +1,38 @@
+diff -r 6d407d91244b src/parse_utils.c
+--- a/src/parse_utils.c	mar sep 15 20:31:33 2009 +0200
++++ b/src/parse_utils.c	mer sep 30 21:26:01 2009 +0200
+@@ -21,7 +21,7 @@
+ 
+ #define _GNU_SOURCE
+ #include <stdlib.h>
+-#include <locale.h>
++#include <stdio.h>
+ #include <string.h>
+ 
+ #include "parse_utils.h"
+@@ -76,12 +76,19 @@
+ double
+ pl_atof (const char *nptr)
+ {
+-  double res;
+-  locale_t new_locale;
++  double div = 1.0;
++  int i, res, integer;
++  unsigned int frac;
+ 
+-  new_locale = newlocale (LC_NUMERIC_MASK, "C", NULL);
+-  res = strtod_l (nptr, NULL, new_locale);
+-  freelocale (new_locale);
++  res = sscanf (nptr, "%i.%u", &integer, &frac);
++  if (res != 2)
++    return 0.0;
+ 
+-  return res;
++  if (!frac)
++    return (double) integer;
++
++  for (i = pl_count_nb_dec (frac); i; i--)
++    div *= 10.0;
++
++  return (double) integer + (double) frac / div;
+ }
diff --git a/packages/multimedia/libplayer/patches/libplayer-add_libX11_to_extralibs.diff b/packages/multimedia/libplayer/patches/libplayer-add_libX11_to_extralibs.diff
new file mode 100644
index 0000000000..80694cf27a
--- /dev/null
+++ b/packages/multimedia/libplayer/patches/libplayer-add_libX11_to_extralibs.diff
@@ -0,0 +1,35 @@
+diff -Naur libplayer-20090929/configure libplayer-20090929.patch/configure
+--- libplayer-20090929/configure	2009-09-30 03:22:00.000000000 +0200
++++ libplayer-20090929.patch/configure	2009-10-01 04:44:24.830578857 +0200
+@@ -805,19 +805,18 @@
+ #   check for libX11
+ #################################################
+ if test "$x11" = "auto" -o "$x11" = "yes"; then
+-  if test "$wrapper_xine" = "yes" -o "$wrapper_mplayer" = "yes"; then
+-    x11="no"
+-    echolog "Checking for libX11 ..."
+-    if [ -n "$libX11dir" ]; then
+-      check_cflags -I$libX11dir/include
+-      check_ldflags -L$libX11dir/lib
+-    fi
+-    check_lib X11/X.h XInitThreads -lX11
+-    if [ "$?" = 0 ]; then
+-      add_extracflags -DUSE_X11
+-      add_pkgconfig_requires x11
+-      x11="yes"
+-    fi
++  x11="no"
++  echolog "Checking for libX11 ..."
++  if [ -n "$libX11dir" ]; then
++    check_cflags -I$libX11dir/include
++    check_ldflags -L$libX11dir/lib
++  fi
++  check_lib X11/X.h XInitThreads -lX11
++  if [ "$?" = 0 ]; then
++    add_extracflags -DUSE_X11
++    add_pkgconfig_requires x11
++    add_extralibs -lX11 -lm
++    x11="yes"
+   fi
+ fi
+ 
diff --git a/packages/multimedia/libplayer/url b/packages/multimedia/libplayer/url
new file mode 100644
index 0000000000..a4db56b662
--- /dev/null
+++ b/packages/multimedia/libplayer/url
@@ -0,0 +1 @@
+http://sources.openelec.tv/svn/libplayer-20091003.tar.bz2