From 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Thu, 9 Dec 2004 09:47:41 +0000
Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into
 hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
---
 ffmpeg/ffmpeg-0.4.9-pre1/configure.patch | 113 -------------------------------
 ffmpeg/ffmpeg_0.4.9-pre1.bb              |   0
 2 files changed, 113 deletions(-)
 delete mode 100644 ffmpeg/ffmpeg-0.4.9-pre1/configure.patch
 delete mode 100644 ffmpeg/ffmpeg_0.4.9-pre1.bb

(limited to 'ffmpeg')

diff --git a/ffmpeg/ffmpeg-0.4.9-pre1/configure.patch b/ffmpeg/ffmpeg-0.4.9-pre1/configure.patch
deleted file mode 100644
index 10fa0ce6b2..0000000000
--- a/ffmpeg/ffmpeg-0.4.9-pre1/configure.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- ./configure~configure.patch	2004-07-06 03:36:16.000000000 +0930
-+++ ./configure	2004-09-27 00:07:23.000000000 +0930
-@@ -88,7 +88,7 @@
- mandir=""
- bindir=""
- cross_prefix=""
--cc="gcc"
-+cc="$CC"
- ar="ar"
- ranlib="ranlib"
- make="make"
-@@ -104,7 +104,7 @@
-     cpu="x86"
-   ;;
-   # armv4l is a subset of armv5tel
--  armv4l|armv5tel)
-+  armv4l|armv5tel|arm|xscale)
-     cpu="armv4l"
-   ;;
-   alpha)
-@@ -434,6 +434,37 @@
-   esac
- done
- 
-+case "$cpu" in
-+  i386|i486|i586|i686|i86pc|BePC)
-+    cpu="x86"
-+  ;;
-+  # armv4l is a subset of armv5tel
-+  armv4l|armv5tel|arm|xscale)
-+    cpu="armv4l"
-+  ;;
-+  alpha)
-+    cpu="alpha"
-+  ;;
-+  "Power Macintosh"|ppc)
-+    cpu="powerpc"
-+  ;;
-+  mips)
-+    cpu="mips"
-+  ;;
-+  sun4u|sparc64)
-+    cpu="sparc64"
-+  ;;
-+  sparc)
-+    cpu="sparc"
-+  ;;
-+  sh4)
-+    cpu="sh4"
-+  ;;
-+  *)
-+    cpu="unknown"
-+  ;;
-+esac
-+
- if test "$gpl" != "yes"; then
-     if test "$pp" != "no" -o "$shared_pp" != "no"; then
-         echo "The Postprocessing code is under GPL and --enable-gpl is not specified"
-@@ -662,7 +693,6 @@
-     bindir="$prefix"
- fi
- 
--cc="${cross_prefix}${cc}"
- ar="${cross_prefix}${ar}"
- ranlib="${cross_prefix}${ranlib}"
- strip="${cross_prefix}${strip}"
-@@ -753,21 +783,6 @@
- fi
- 
- if test "$zlib" = "yes"; then
--# check for zlib - mmu_man
--cat > $TMPC << EOF
--#include <zlib.h>
--int main ( void ) {
--if (zlibVersion() != ZLIB_VERSION)
--   puts("zlib version differs !!!");
--   return 1;
--return 0;
--}
--EOF
--$cc $CFLAGS -o $TMPE $TMPC -lz 2> /dev/null || zlib="no"
--# $TMPE 2> /dev/null > /dev/null || zlib="no"
--# XXX: more tests needed - runtime test
--fi
--if test "$zlib" = "yes"; then
- extralibs="$extralibs -lz"
- fi
- 
-@@ -881,24 +896,8 @@
- ##########################################
- # SDL probe
- 
--cat > $TMPC << EOF
--#include <SDL.h>
--#undef main /* We don't want SDL to override our main() */
--int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
--EOF
--
- sdl_too_old=no
--sdl=no
--if sdl-config --version >/dev/null 2>&1 ; then
--if $cc -o $TMPE `sdl-config --cflags` $TMPC `sdl-config --libs`  > /dev/null 2>&1  ; then
--_sdlversion=`sdl-config --version | sed 's/[^0-9]//g'`
--if test "$_sdlversion" -lt 121 ; then
--sdl_too_old=yes
--else
- sdl=yes
--fi
--fi
--fi
- 
- ##########################################
- # texi2html probe
diff --git a/ffmpeg/ffmpeg_0.4.9-pre1.bb b/ffmpeg/ffmpeg_0.4.9-pre1.bb
deleted file mode 100644
index e69de29bb2..0000000000
-- 
cgit v1.2.3