* [Buildroot] svn commit: trunk/buildroot/package/mplayer
@ 2007-09-20 21:52 ulf at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: ulf at uclibc.org @ 2007-09-20 21:52 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-20 14:52:23 -0700 (Thu, 20 Sep 2007)
New Revision: 19923
Log:
Fix bad patch in MPlayer
Added:
trunk/buildroot/package/mplayer/mplayer-1.0rc1-atmel.3.patch
Removed:
trunk/buildroot/package/mplayer/mplayer-1.0rc1-atmel.2.patch
trunk/buildroot/package/mplayer/mplayer-1.0rc1-remove-configuration-x11-header-search-path.patch
Changeset:
Sorry, the patch is too large to include (12917 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=19923
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mplayer
@ 2007-09-25 12:01 ulf at uclibc.org
2007-09-25 12:16 ` Bernhard Fischer
0 siblings, 1 reply; 10+ messages in thread
From: ulf at uclibc.org @ 2007-09-25 12:01 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-25 05:01:27 -0700 (Tue, 25 Sep 2007)
New Revision: 20013
Log:
Add source and unpacked targets to mplayer
Modified:
trunk/buildroot/package/mplayer/mplayer.mk
Changeset:
Modified: trunk/buildroot/package/mplayer/mplayer.mk
===================================================================
--- trunk/buildroot/package/mplayer/mplayer.mk 2007-09-25 11:58:33 UTC (rev 20012)
+++ trunk/buildroot/package/mplayer/mplayer.mk 2007-09-25 12:01:27 UTC (rev 20013)
@@ -60,6 +60,10 @@
mplayer: uclibc libmad $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
+mplayer-source: $(DL_DIR)/$(MPLAYER_SOURCE)
+
+mplayer-unpacked: $(MPLAYER_DIR)/.unpacked
+
mplayer-clean:
rm -f $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
-$(MAKE) -C $(MPLAYER_DIR) clean
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mplayer
2007-09-25 12:01 ulf at uclibc.org
@ 2007-09-25 12:16 ` Bernhard Fischer
0 siblings, 0 replies; 10+ messages in thread
From: Bernhard Fischer @ 2007-09-25 12:16 UTC (permalink / raw)
To: buildroot
On Tue, Sep 25, 2007 at 05:01:28AM -0700, ulf at uclibc.org wrote:
>Author: ulf
>Date: 2007-09-25 05:01:27 -0700 (Tue, 25 Sep 2007)
>New Revision: 20013
>
>Log:
>Add source and unpacked targets to mplayer
$ find package/ -name "*.mk" -exec grep --exclude='*.svn*' -L
"\-source:" {} \; | grep -v x11r7
package/alsa-utils/alsa-utils.mk
package/busybox/initramfs.mk
package/gnuconfig/gnuconfig.mk
package/fbset/fbset.mk
package/alsa-lib/alsa-lib.mk
package/irda-utils/irda.mk
package/qte/qte.mk
package/customize/customize.mk
package/fusion/fusion.mk
package/ed/ed.mk
package/mtd/mtd.mk
package/imagemagick/imagemagick.mk
initramfs.mk is ok
gnuconfig.mk is ok
I'll take care of ed (done by now), the rest look like bugs introduced
by others..
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mplayer
@ 2007-09-25 11:56 ulf at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: ulf at uclibc.org @ 2007-09-25 11:56 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-25 04:56:34 -0700 (Tue, 25 Sep 2007)
New Revision: 20011
Log:
Fix LEGACY dependencies for mplayer
Added:
trunk/buildroot/package/mplayer/mplayer-1.0rc1-index.patch
Changeset:
Added: trunk/buildroot/package/mplayer/mplayer-1.0rc1-index.patch
===================================================================
--- trunk/buildroot/package/mplayer/mplayer-1.0rc1-index.patch (rev 0)
+++ trunk/buildroot/package/mplayer/mplayer-1.0rc1-index.patch 2007-09-25 11:56:34 UTC (rev 20011)
@@ -0,0 +1,22 @@
+diff -urN MPlayer-1.0rc1-0rig/stream/stream_dvb.c MPlayer-1.0rc1/stream/stream_dvb.c
+--- MPlayer-1.0rc1-0rig/stream/stream_dvb.c 2006-10-23 00:32:25.000000000 +0200
++++ MPlayer-1.0rc1/stream/stream_dvb.c 2007-09-25 08:37:54.000000000 +0200
+@@ -37,9 +37,7 @@
+ #include <sys/poll.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include <string.h>
+ #include <errno.h>
+-#include <fcntl.h>
+
+ #include "stream.h"
+ #include "libmpdemux/demuxer.h"
+@@ -168,7 +166,7 @@
+ if((line[0] == '#') || (strlen(line) == 0))
+ continue;
+
+- colon = index(line, ':');
++ colon = strchr(line, ':');
+ if(colon)
+ {
+ k = colon - line;
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/mplayer
@ 2007-08-30 22:40 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-08-30 22:40 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-08-30 15:40:22 -0700 (Thu, 30 Aug 2007)
New Revision: 19738
Log:
- mark duplicate hunk
Modified:
trunk/buildroot/package/mplayer/mplayer-1.0rc1-atmel.2.patch
Changeset:
Modified: trunk/buildroot/package/mplayer/mplayer-1.0rc1-atmel.2.patch
===================================================================
--- trunk/buildroot/package/mplayer/mplayer-1.0rc1-atmel.2.patch 2007-08-30 06:00:36 UTC (rev 19737)
+++ trunk/buildroot/package/mplayer/mplayer-1.0rc1-atmel.2.patch 2007-08-30 22:40:22 UTC (rev 19738)
@@ -111,6 +111,7 @@
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
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/mplayer
@ 2007-08-29 15:54 jacmet at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: jacmet at uclibc.org @ 2007-08-29 15:54 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-08-29 08:54:33 -0700 (Wed, 29 Aug 2007)
New Revision: 19732
Log:
Remove double avr patch
Removed:
trunk/buildroot/package/mplayer/mplayer-1.0rc1-avr32-support.patch
Changeset:
Sorry, the patch is too large to include (5953 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=19732
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mplayer
@ 2007-07-28 15:43 ulf at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: ulf at uclibc.org @ 2007-07-28 15:43 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-28 08:43:29 -0700 (Sat, 28 Jul 2007)
New Revision: 19293
Log:
Add AVR32 patch for mplayer
Added:
trunk/buildroot/package/mplayer/mplayer-1.0rc1-atmel.2.patch
Changeset:
Sorry, the patch is too large to include (6449 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=19293
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mplayer
@ 2007-07-23 12:40 ulf at uclibc.org
2007-07-23 12:35 ` Allan Clark
0 siblings, 1 reply; 10+ messages in thread
From: ulf at uclibc.org @ 2007-07-23 12:40 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-23 05:40:43 -0700 (Mon, 23 Jul 2007)
New Revision: 19229
Log:
Cleanup of mplayer package
Modified:
trunk/buildroot/package/mplayer/mplayer.mk
Changeset:
Modified: trunk/buildroot/package/mplayer/mplayer.mk
===================================================================
--- trunk/buildroot/package/mplayer/mplayer.mk 2007-07-23 12:33:22 UTC (rev 19228)
+++ trunk/buildroot/package/mplayer/mplayer.mk 2007-07-23 12:40:43 UTC (rev 19229)
@@ -3,10 +3,10 @@
# mplayer
#
#############################################################
-MPLAYER_VER:=1.0rc1
-MPLAYER_SOURCE:=MPlayer-$(MPLAYER_VER).tar.bz2
+MPLAYER_VERSION:=1.0rc1
+MPLAYER_SOURCE:=MPlayer-$(MPLAYER_VERSION).tar.bz2
MPLAYER_SITE:=http://www7.mplayerhq.hu/MPlayer/releases
-MPLAYER_DIR:=$(BUILD_DIR)/MPlayer-$(MPLAYER_VER)
+MPLAYER_DIR:=$(BUILD_DIR)/MPlayer-$(MPLAYER_VERSION)
MPLAYER_CAT:=$(BZCAT)
MPLAYER_BINARY:=mplayer
MPLAYER_TARGET_BINARY:=usr/bin/$(MPLAYER_BINARY)
@@ -22,12 +22,13 @@
$(MPLAYER_DIR)/.unpacked: $(DL_DIR)/$(MPLAYER_SOURCE)
$(MPLAYER_CAT) $(DL_DIR)/$(MPLAYER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(MPLAYER_DIR) package/mplayer/ mplayer-$(MPLAYER_VER)\*.patch\*
- @touch $@
+ toolchain/patch-kernel.sh $(MPLAYER_DIR) package/mplayer/ mplayer-$(MPLAYER_VERSION)\*.patch\*
+ touch $@
$(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
(cd $(MPLAYER_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
./configure \
@@ -46,16 +47,16 @@
--disable-tv \
--enable-dynamic-plugins \
);
- @touch $@
+ touch $@
$(MPLAYER_DIR)/$(MPLAYER_BINARY): $(MPLAYER_DIR)/.configured
$(MAKE) -C $(MPLAYER_DIR)
- @touch -c $@
+ touch -c $@
$(TARGET_DIR)/$(MPLAYER_TARGET_BINARY): $(MPLAYER_DIR)/$(MPLAYER_BINARY)
$(INSTALL) -m 0755 -D $(MPLAYER_DIR)/$(MPLAYER_BINARY) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
-$(STRIP) --strip-unneeded $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
- @touch -c $@
+ touch -c $@
mplayer: uclibc libmad $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mplayer
2007-07-23 12:40 ulf at uclibc.org
@ 2007-07-23 12:35 ` Allan Clark
2007-07-26 7:01 ` Hans-Christian Egtvedt
0 siblings, 1 reply; 10+ messages in thread
From: Allan Clark @ 2007-07-23 12:35 UTC (permalink / raw)
To: buildroot
On 7/23/07, ulf at uclibc.org <ulf@uclibc.org> wrote:
> Author: ulf
> Date: 2007-07-23 05:40:43 -0700 (Mon, 23 Jul 2007)
> New Revision: 19229
>
> Log:
> Cleanup of mplayer package
>
> [...]
>
> $(MPLAYER_DIR)/$(MPLAYER_BINARY): $(MPLAYER_DIR)/.configured
> $(MAKE) -C $(MPLAYER_DIR)
> - @touch -c $@
> + touch -c $@
>
> $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY): $(MPLAYER_DIR)/$(MPLAYER_BINARY)
> $(INSTALL) -m 0755 -D $(MPLAYER_DIR)/$(MPLAYER_BINARY) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
> -$(STRIP) --strip-unneeded $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
> - @touch -c $@
> + touch -c $@
I don't see the logic for these last two touch commands. Sure "-c"
says "do not create", but they seem unnecessary.
Allan
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mplayer
2007-07-23 12:35 ` Allan Clark
@ 2007-07-26 7:01 ` Hans-Christian Egtvedt
0 siblings, 0 replies; 10+ messages in thread
From: Hans-Christian Egtvedt @ 2007-07-26 7:01 UTC (permalink / raw)
To: buildroot
On Mon, 2007-07-23 at 08:35 -0400, Allan Clark wrote:
> On 7/23/07, ulf at uclibc.org <ulf@uclibc.org> wrote:
> > Author: ulf
> > Date: 2007-07-23 05:40:43 -0700 (Mon, 23 Jul 2007)
> > New Revision: 19229
> >
> > Log:
> > Cleanup of mplayer package
> >
> > [...]
> >
> > $(MPLAYER_DIR)/$(MPLAYER_BINARY): $(MPLAYER_DIR)/.configured
> > $(MAKE) -C $(MPLAYER_DIR)
> > - @touch -c $@
> > + touch -c $@
> >
> > $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY): $(MPLAYER_DIR)/$(MPLAYER_BINARY)
> > $(INSTALL) -m 0755 -D $(MPLAYER_DIR)/$(MPLAYER_BINARY) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
> > -$(STRIP) --strip-unneeded $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
> > - @touch -c $@
> > + touch -c $@
>
> I don't see the logic for these last two touch commands. Sure "-c"
> says "do not create", but they seem unnecessary.
Agree, all the "touch -c <some binary file given by the Makefile rule>"
does not do anything useful. Touch will return 0, and Makefile will
think it was a success.
~ > touch -c doesnotexist
~ > echo $?
0
~ >
--
With kind regards,
Hans-Christian Egtvedt, siv.ing. (M.Sc.)
Applications Engineer - AVR32 System Solutions - Atmel Norway
--
Mvh
Hans-Christian Egtvedt
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2007-09-25 12:16 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-20 21:52 [Buildroot] svn commit: trunk/buildroot/package/mplayer ulf at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2007-09-25 12:01 ulf at uclibc.org
2007-09-25 12:16 ` Bernhard Fischer
2007-09-25 11:56 ulf at uclibc.org
2007-08-30 22:40 aldot at uclibc.org
2007-08-29 15:54 jacmet at uclibc.org
2007-07-28 15:43 ulf at uclibc.org
2007-07-23 12:40 ulf at uclibc.org
2007-07-23 12:35 ` Allan Clark
2007-07-26 7:01 ` Hans-Christian Egtvedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox