summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2007-09-20 21:52:23 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2007-09-20 21:52:23 +0000
commitc02a6d9f5fd4feaaeac817d6941776ba051853d0 (patch)
tree8ea7c27603c6e8bb5f53eb2e365fb0c83fdfe49a
parentfecac9bfb661741203f6c571fdeae3b6b8a2fa8f (diff)
Fix bad patch in MPlayer
-rw-r--r--package/mplayer/mplayer-1.0rc1-atmel.3.patch (renamed from package/mplayer/mplayer-1.0rc1-atmel.2.patch)1
-rw-r--r--package/mplayer/mplayer-1.0rc1-remove-configuration-x11-header-search-path.patch11
2 files changed, 0 insertions, 12 deletions
diff --git a/package/mplayer/mplayer-1.0rc1-atmel.2.patch b/package/mplayer/mplayer-1.0rc1-atmel.3.patch
index fc9f7b53c..800f43e8e 100644
--- a/package/mplayer/mplayer-1.0rc1-atmel.2.patch
+++ b/package/mplayer/mplayer-1.0rc1-atmel.3.patch
@@ -111,7 +111,6 @@ index 29002c8..56c6fe4 100755
echocheck "X11 headers presence"
-Note that this hunk is a dulicate between the other patch
- for I in `echo $_inc_extra | sed s/-I//g` /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/include /usr/openwin/include ; do
+ for I in `echo $_inc_extra | sed s/-I//g`; do
if test -f "$I/X11/Xlib.h" ; then
diff --git a/package/mplayer/mplayer-1.0rc1-remove-configuration-x11-header-search-path.patch b/package/mplayer/mplayer-1.0rc1-remove-configuration-x11-header-search-path.patch
deleted file mode 100644
index d2e00f260..000000000
--- a/package/mplayer/mplayer-1.0rc1-remove-configuration-x11-header-search-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- MPlayer-1.0rc1-orig/configure 2007-06-01 18:15:59.000000000 +0200
-+++ MPlayer-1.0rc1/configure 2007-06-01 18:17:38.000000000 +0200
-@@ -3803,7 +3803,7 @@ fi
-
-
- echocheck "X11 headers presence"
-- for I in `echo $_inc_extra | sed s/-I//g` /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/include /usr/openwin/include ; do
-+ for I in `echo $_inc_extra | sed s/-I//g` ; do
- if test -f "$I/X11/Xlib.h" ; then
- _inc_x11="-I$I"
- _x11_headers="yes"