Revert "crystalhd: update to crystalhd-fdd2f19 (for testing)"

This reverts commit 4dfbbe0567ed8fef2520700d1465f088c1cae214.

packages/multimedia/crystalhd/build

@@ -22,7 +22,15 @@
 
 . config/options $1
 
-cd $PKG_BUILD/linux_lib/libcrystalhd
+cd $PKG_BUILD/driver/linux
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --with-kernel-path=$(kernel_path) \
+
+make V=1
+
+cd ../../linux_lib/libcrystalhd
 
 make BCGCC=$TARGET_CXX
 $MAKEINSTALL

packages/multimedia/crystalhd/install

@@ -22,6 +22,8 @@
 
 . config/options $1
 
+VER=`ls $BUILD/linux*/modules/lib/modules`
+
 mkdir -p $INSTALL/lib/firmware
   cp $PKG_BUILD/firmware/fwbin/*/*.bin $INSTALL/lib/firmware
 
@@ -30,3 +32,6 @@ mkdir -p $INSTALL/usr/lib
 
 mkdir -p $INSTALL/lib/udev/rules.d
   cp $PKG_BUILD/driver/linux/*.rules $INSTALL/lib/udev/rules.d
+
+mkdir -p $INSTALL/lib/modules/$VER/crystalhd
+  cp $PKG_BUILD/driver/linux/crystalhd.ko $INSTALL/lib/modules/$VER/crystalhd

packages/multimedia/crystalhd/meta

@@ -19,13 +19,12 @@
 ################################################################################
 
 PKG_NAME="crystalhd"
-PKG_VERSION="fdd2f19"
+PKG_VERSION="171"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/crystalhd-for-osx/"
-#PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="linux"
 PKG_BUILD_DEPENDS="toolchain linux"
 PKG_PRIORITY="optional"

packages/multimedia/crystalhd/patches/crystalhd-171-use_8_DMA_buffers-0.1.patch

@@ -0,0 +1,14 @@
+diff -Naur crystalhd-171/include/bc_dts_glob_lnx.h crystalhd-171.patch/include/bc_dts_glob_lnx.h
+--- crystalhd-171/include/bc_dts_glob_lnx.h	2010-10-18 01:56:14.000000000 +0200
++++ crystalhd-171.patch/include/bc_dts_glob_lnx.h	2010-10-24 02:53:16.739741578 +0200
+@@ -76,8 +76,8 @@
+ 	BC_LINK_MAX_OPENS	= 3,		/* Maximum simultaneous opens*/
+ 	BC_LINK_MAX_SGLS	= 1024,		/* Maximum SG elements 4M/4K */
+ 	BC_TX_LIST_CNT		= 2,		/* Max Tx DMA Rings */
+-	//BC_RX_LIST_CNT	= 8,		/* Max Rx DMA Rings*/
+-	BC_RX_LIST_CNT		= 16,		/* Max Rx DMA Rings*/
++	BC_RX_LIST_CNT		= 8,		/* Max Rx DMA Rings*/
++	//BC_RX_LIST_CNT	= 16,		/* Max Rx DMA Rings*/
+ 	BC_PROC_OUTPUT_TIMEOUT	= 2000,		/* Milliseconds */
+ 	BC_INFIFO_THRESHOLD	= 0x10000,
+ };

tools/mkpkg/mkpkg_libcrystalhd

@@ -1,43 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d crystalhd.git ]; then
-    git clone git://linuxtv.org/jarod/crystalhd.git crystalhd.git
-  fi
-
-  cd crystalhd.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf crystalhd-$GIT_REV
-  cp -R crystalhd.git crystalhd-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf crystalhd-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf crystalhd-$GIT_REV.tar.xz crystalhd-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf crystalhd-$GIT_REV