* [Buildroot] [PATCH 05/10] microcom: convert to gentargets
From: Martin Banky @ 2010-10-05 21:05 UTC (permalink / raw)
To: buildroot
In-Reply-To: <878w2cs9oo.fsf@macbook.be.48ers.dk>
Peter,
Yes, I'd be the one to complain ;-) I use it to troubleshoot serial
port communication issues on my embedded system. It's a fast and dirty way
to see if I have communication with the microprocessor. Basically it lets me
know if it's a hardware issue or if it's in my code. But other than that, I
don't have any other use for it. Also, buildroot is one of the few remaining
places to host it. Just my 2c's.
Martin
On Tue, Oct 5, 2010 at 12:48 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
> >>>>> "Martin" == Martin Banky <Martin.Banky@gmail.com> writes:
>
> Martin> Thomas,
>
> Martin> I guess I should have explained this better. What I meant
> Martin> about microcom being a flat archive, is that when you extract
> Martin> it, it does not create a directory for itself. It just sticks
> Martin> its files, without a directory being created, in the current
> Martin> directory. $(TAR_STRIP_COMPONENTS)=1 is 'Automatically detect
> Martin> tar --strip-path/components option', which, equates to either
> Martin> --strip-path or --strip-components, depending on the version of
> Martin> tar. Per the man page: --strip-components = 'strip NUMBER
> Martin> leading components from file names on extraction', which means
> Martin> that for microcom, which doesn't have a directory structure, it
> Martin> strips all the file names off, so no files actually get
> Martin> extracted. This in turn, means that the patch routine does not
> Martin> work. Hence, the reason for manually patching microcom. If you
> Martin> have a better solution, I'd appreciate it, if you would show
> Martin> me, because I couldn't figure one out. I hope this makes more
> Martin> sense.
>
> Maybe we should just get rid of the microcom package instead? It was
> integrated into busybox a few years ago, which is also why it was marked
> as deprecated.
>
> I'll remove it later this week unless someone complains.
>
> --
> Bye, Peter Korsgaard
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20101005/1f8e186b/attachment-0001.html>
^ permalink raw reply
* [Buildroot] [PATCH 05/10] microcom: convert to gentargets
From: Peter Korsgaard @ 2010-10-05 21:13 UTC (permalink / raw)
To: buildroot
In-Reply-To: <AANLkTinZJqbMMdmTRu-EY42FWFjTGkjf8szXqPn3=83c@mail.gmail.com>
>>>>> "Martin" == Martin Banky <Martin.Banky@gmail.com> writes:
Martin> Peter,
Martin> ???? Yes, I'd be the one to complain ;-) I use it to
Martin> troubleshoot serial port communication issues on my embedded
Martin> system. It's a fast and dirty way to see if I have
Martin> communication with the microprocessor. Basically it lets me
Martin> know if it's a hardware issue or if it's in my code. But other
Martin> than that, I don't have any other use for it. Also, buildroot
Martin> is one of the few remaining places to host it. Just my 2c's.
Ok, any specific reasons why you don't just use the version in busybox
instead? (besides the fact that it isn't enabled in the defconfig, which
I've just fixed now)
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit master 1/1] libpng: bump to 1.4.4
From: Martin Banky @ 2010-10-05 21:14 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=968ebae9dee10907e9bbc20ad5982e1de914efc5
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/libpng/libpng.mk | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 5608f4f..82b88da 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -3,23 +3,22 @@
# libpng (Portable Network Graphic library)
#
#############################################################
-LIBPNG_VERSION:=1.2.44
+LIBPNG_VERSION = 1.4.4
+LIBPNG_SERIES = 14
LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
LIBPNG_LIBTOOL_PATCH = NO
LIBPNG_INSTALL_STAGING = YES
-LIBPNG_CONF_OPT = --without-libpng-compat
LIBPNG_DEPENDENCIES = host-pkg-config zlib
-HOST_LIBPNG_CONF_OPT = --without-libpng-compat
HOST_LIBPNG_DEPENDENCIES = host-pkg-config host-zlib
define LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
- -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/libpng12\',g" \
+ -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/libpng$(LIBPNG_SERIES)\',g" \
-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
- $(STAGING_DIR)/usr/bin/libpng12-config
+ $(STAGING_DIR)/usr/bin/libpng$(LIBPNG_SERIES)-config
endef
LIBPNG_POST_INSTALL_STAGING_HOOKS += LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] busybox: 1.17.x.config: enable microcom applet
From: Peter Korsgaard @ 2010-10-05 21:14 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=a2fcdacad6d6051288982c06c2737eb9e7f251fd
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
So we can get rid of the deprecated microcom package.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/busybox/busybox-1.17.x.config | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/busybox/busybox-1.17.x.config b/package/busybox/busybox-1.17.x.config
index 192bba2..d131dd6 100644
--- a/package/busybox/busybox-1.17.x.config
+++ b/package/busybox/busybox-1.17.x.config
@@ -668,7 +668,7 @@ CONFIG_MAKEDEVS=y
# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
CONFIG_FEATURE_MAKEDEVS_TABLE=y
# CONFIG_MAN is not set
-# CONFIG_MICROCOM is not set
+CONFIG_MICROCOM=y
CONFIG_MOUNTPOINT=y
CONFIG_MT=y
# CONFIG_RAIDAUTORUN is not set
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 3/4] libpng: bump to 1.4.4
From: Peter Korsgaard @ 2010-10-05 21:49 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485599-29412-3-git-send-email-Martin.Banky@gmail.com>
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 05/10] microcom: convert to gentargets
From: Martin Banky @ 2010-10-05 21:58 UTC (permalink / raw)
To: buildroot
In-Reply-To: <874od0s5q7.fsf@macbook.be.48ers.dk>
Peter,
Only because, I didn't realize that busybox had it. I'll have to use
that one from now on. Much better from my way of thinking.
Martin
On Tue, Oct 5, 2010 at 2:13 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
> >>>>> "Martin" == Martin Banky <Martin.Banky@gmail.com> writes:
>
> Martin> Peter,
>
> Martin> Yes, I'd be the one to complain ;-) I use it to
> Martin> troubleshoot serial port communication issues on my embedded
> Martin> system. It's a fast and dirty way to see if I have
> Martin> communication with the microprocessor. Basically it lets me
> Martin> know if it's a hardware issue or if it's in my code. But other
> Martin> than that, I don't have any other use for it. Also, buildroot
> Martin> is one of the few remaining places to host it. Just my 2c's.
>
> Ok, any specific reasons why you don't just use the version in busybox
> instead? (besides the fact that it isn't enabled in the defconfig, which
> I've just fixed now)
>
> --
> Bye, Peter Korsgaard
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20101005/4e562904/attachment.html>
^ permalink raw reply
* [Buildroot] [PATCH 0/1] Could use some help with this one
From: Martin Banky @ 2010-10-05 22:45 UTC (permalink / raw)
To: buildroot
I've converted and bumped mrouted, but can't get it to build properly. I was
hoping that someone could take a look and see what I'm doing wrong. Also, is
anyone using this package?
Martin
[PATCH 1/1] mrouted: convet to gentargets and bump to version 3.9.2
^ permalink raw reply
* [Buildroot] [PATCH 1/1] mrouted: convet to gentargets and bump to version 3.9.2
From: Martin Banky @ 2010-10-05 22:45 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286318752-26740-1-git-send-email-Martin.Banky@gmail.com>
mrouted is once again being actively developed.
See http://github.com/troglobit/mrouted
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/mrouted/Config.in | 2 +-
.../mrouted-3.9-beta3-bcopy_bcmp_bzero.patch | 164 --------------------
package/mrouted/mrouted-3.9.2-bcopy.patch | 20 +++
package/mrouted/mrouted-3.9.2-makefile-flags.patch | 62 ++++++++
package/mrouted/mrouted-sys_errlist.patch | 44 ------
package/mrouted/mrouted.mk | 59 ++-----
6 files changed, 99 insertions(+), 252 deletions(-)
delete mode 100644 package/mrouted/mrouted-3.9-beta3-bcopy_bcmp_bzero.patch
create mode 100644 package/mrouted/mrouted-3.9.2-bcopy.patch
create mode 100644 package/mrouted/mrouted-3.9.2-makefile-flags.patch
delete mode 100644 package/mrouted/mrouted-sys_errlist.patch
diff --git a/package/mrouted/Config.in b/package/mrouted/Config.in
index df3c567..ed5852b 100644
--- a/package/mrouted/Config.in
+++ b/package/mrouted/Config.in
@@ -3,4 +3,4 @@ config BR2_PACKAGE_MROUTED
help
An implementation of the DVMRP multicast routing protocol.
- http://freshmeat.net/projects/mrouted/
+ http://github.com/troglobit/mrouted
diff --git a/package/mrouted/mrouted-3.9-beta3-bcopy_bcmp_bzero.patch b/package/mrouted/mrouted-3.9-beta3-bcopy_bcmp_bzero.patch
deleted file mode 100644
index e38efd2..0000000
--- a/package/mrouted/mrouted-3.9-beta3-bcopy_bcmp_bzero.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -urN mrouted-3.9-beta3.0rig/cfparse.y mrouted-3.9-beta3/cfparse.y
---- mrouted-3.9-beta3.0rig/cfparse.y 1998-03-01 02:48:58.000000000 +0100
-+++ mrouted-3.9-beta3/cfparse.y 2009-01-14 21:17:00.000000000 +0100
-@@ -583,8 +583,7 @@
- if (hp->h_addr_list[1])
- fatal("Hostname %s does not %s",
- $1, "map to a unique address");
--
-- bcopy(hp->h_addr_list[0], &$$,
-+ memmove (&$$, hp->h_addr_list[0],
- hp->h_length);
- }
-
-diff -urN mrouted-3.9-beta3.0rig/config.c mrouted-3.9-beta3/config.c
---- mrouted-3.9-beta3.0rig/config.c 1998-01-06 02:57:41.000000000 +0100
-+++ mrouted-3.9-beta3/config.c 2009-01-14 21:18:59.000000000 +0100
-@@ -89,7 +89,7 @@
- * SIOCGIFFLAGS stomps over it because the requests
- * are returned in a union.)
- */
-- bcopy(ifrp->ifr_name, ifr.ifr_name, sizeof(ifr.ifr_name));
-+ memmove (ifr.ifr_name, ifrp->ifr_name, sizeof(ifr.ifr_name));
-
- /*
- * Ignore loopback interfaces and interfaces that do not support
-diff -urN mrouted-3.9-beta3.0rig/defs.h mrouted-3.9-beta3/defs.h
---- mrouted-3.9-beta3.0rig/defs.h 2009-01-14 21:12:22.000000000 +0100
-+++ mrouted-3.9-beta3/defs.h 2009-01-14 21:20:05.000000000 +0100
-@@ -116,8 +116,6 @@
- #endif /* RSRR */
-
- #ifdef SYSV
--#define bcopy(a, b, c) memcpy(b, a, c)
--#define bzero(s, n) memset((s), 0, (n))
- #define setlinebuf(s) setvbuf(s, NULL, _IOLBF, 0)
- #endif
-
-diff -urN mrouted-3.9-beta3.0rig/igmp.c mrouted-3.9-beta3/igmp.c
---- mrouted-3.9-beta3.0rig/igmp.c 1998-01-06 02:57:43.000000000 +0100
-+++ mrouted-3.9-beta3/igmp.c 2009-01-14 21:27:41.000000000 +0100
-@@ -56,7 +56,7 @@
- k_set_loop(FALSE); /* disable multicast loopback */
-
- ip = (struct ip *)send_buf;
-- bzero(ip, sizeof(struct ip));
-+ memset(ip, 0, sizeof(struct ip));
- /*
- * Fields zeroed that aren't filled in later:
- * - IP ID (let the kernel fill it in)
-@@ -421,7 +421,7 @@
- }
- }
-
-- bzero(&sdst, sizeof(sdst));
-+ memset(&sdst, 0, sizeof(sdst));
- sdst.sin_family = AF_INET;
- #ifdef HAVE_SA_LEN
- sdst.sin_len = sizeof(sdst);
-diff -urN mrouted-3.9-beta3.0rig/ipip.c mrouted-3.9-beta3/ipip.c
---- mrouted-3.9-beta3.0rig/ipip.c 1998-01-06 02:57:45.000000000 +0100
-+++ mrouted-3.9-beta3/ipip.c 2009-01-14 21:28:19.000000000 +0100
-@@ -61,7 +61,7 @@
- ip = v->uv_encap_hdr = (struct ip *)malloc(sizeof(struct ip));
- if (ip == NULL)
- log(LOG_ERR, 0, "out of memory");
-- bzero(ip, sizeof(struct ip));
-+ memset(ip, 0, sizeof(struct ip));
- /*
- * Fields zeroed that aren't filled in later:
- * - IP ID (let the kernel fill it in)
-@@ -111,7 +111,7 @@
- ip->ip_len = htons(ip->ip_len);
- #endif
-
-- bzero(&sdst, sizeof(sdst));
-+ memset(&sdst, 0, sizeof(sdst));
- sdst.sin_family = AF_INET;
- #ifdef HAVE_SA_LEN
- sdst.sin_len = sizeof(sdst);
-@@ -123,7 +123,7 @@
- iov[1].iov_base = (caddr_t)send_buf;
- iov[1].iov_len = MIN_IP_HEADER_LEN + IGMP_MINLEN + datalen;
-
-- bzero(&msg, sizeof(msg));
-+ memset(&msg, 0, sizeof(msg));
- msg.msg_name = (caddr_t)&sdst;
- msg.msg_namelen = sizeof(sdst);
- msg.msg_iov = iov;
-diff -urN mrouted-3.9-beta3.0rig/main.c mrouted-3.9-beta3/main.c
---- mrouted-3.9-beta3.0rig/main.c 2009-01-14 21:12:22.000000000 +0100
-+++ mrouted-3.9-beta3/main.c 2009-01-14 21:22:33.000000000 +0100
-@@ -429,7 +429,7 @@
- gettimeofday(&curtime, NULL);
- lasttime = curtime;
- for(;;) {
-- bcopy((char *)&readers, (char *)&rfds, sizeof(rfds));
-+ memmove ((char *)&rfds, (char *)&readers, sizeof(rfds));
- secs = timer_nextTimer();
- if (secs == -1)
- timeout = NULL;
-diff -urN mrouted-3.9-beta3.0rig/prune.c mrouted-3.9-beta3/prune.c
---- mrouted-3.9-beta3.0rig/prune.c 1998-03-01 03:06:32.000000000 +0100
-+++ mrouted-3.9-beta3/prune.c 2009-01-14 21:27:06.000000000 +0100
-@@ -2450,7 +2450,7 @@
- /* copy the packet to the sending buffer */
- p = send_buf + MIN_IP_HEADER_LEN + IGMP_MINLEN;
-
-- bcopy(data, p, datalen);
-+ memmove (p, data, datalen);
-
- p += datalen;
-
-@@ -2469,7 +2469,7 @@
- * fill in initial response fields
- */
- resp = (struct tr_resp *)p;
-- bzero(resp, sizeof(struct tr_resp));
-+ memset(resp, 0, sizeof(struct tr_resp));
- datalen += RLEN;
-
- resp->tr_qarr = htonl(((tp.tv_sec + JAN_1970) << 16) +
-diff -urN mrouted-3.9-beta3.0rig/route.c mrouted-3.9-beta3/route.c
---- mrouted-3.9-beta3.0rig/route.c 1998-01-15 01:08:34.000000000 +0100
-+++ mrouted-3.9-beta3/route.c 2009-01-14 21:26:37.000000000 +0100
-@@ -388,7 +388,8 @@
- else r->rt_originwidth = 1;
- r->rt_flags = 0;
- r->rt_dominants = (u_int32 *)(r + 1);
-- bzero(r->rt_dominants, numvifs * sizeof(u_int32));
-+ memset(r->rt_dominants, 0, numvifs * sizeof(u_int32));
-+
- r->rt_groups = NULL;
- VIFM_CLRALL(r->rt_children);
- NBRM_CLRALL(r->rt_subordinates);
-@@ -968,7 +969,7 @@
- bh->bh_dst = dst;
- bh->bh_level = level;
- bh->bh_datalen = datalen;
-- bcopy(p, (char *)(bh + 1), datalen);
-+ memmove ((char *)(bh + 1), p, datalen);
- v->uv_blasterend += bblen;
-
- if (v->uv_blastertimer == 0) {
-diff -urN mrouted-3.9-beta3.0rig/rsrr.c mrouted-3.9-beta3/rsrr.c
---- mrouted-3.9-beta3.0rig/rsrr.c 1998-01-06 02:57:58.000000000 +0100
-+++ mrouted-3.9-beta3/rsrr.c 2009-01-14 21:29:18.000000000 +0100
-@@ -81,7 +81,7 @@
- log(LOG_ERR, errno, "Can't create RSRR socket");
-
- unlink(RSRR_SERV_PATH);
-- bzero((char *) &serv_addr, sizeof(serv_addr));
-+ memset((char *) &serv_addr, 0, sizeof(serv_addr));
- serv_addr.sun_family = AF_UNIX;
- strcpy(serv_addr.sun_path, RSRR_SERV_PATH);
- #ifdef HAVE_SA_LEN
-@@ -107,7 +107,7 @@
- {
- register int rsrr_recvlen;
-
-- bzero((char *) &client_addr, sizeof(client_addr));
-+ memset((char *) &client_addr, 0, sizeof(client_addr));
- rsrr_recvlen = recvfrom(rsrr_socket, rsrr_recv_buf, sizeof(rsrr_recv_buf),
- 0, (struct sockaddr *)&client_addr, &client_length);
- if (rsrr_recvlen < 0) {
diff --git a/package/mrouted/mrouted-3.9.2-bcopy.patch b/package/mrouted/mrouted-3.9.2-bcopy.patch
new file mode 100644
index 0000000..d20e4df
--- /dev/null
+++ b/package/mrouted/mrouted-3.9.2-bcopy.patch
@@ -0,0 +1,20 @@
+--- troglobit-mrouted-b192f82/mtrace.c-orig 2010-08-20 11:27:26.000000000 -0700
++++ troglobit-mrouted-b192f82/mtrace.c 2010-10-02 22:34:17.000000000 -0700
+@@ -558,7 +558,7 @@ int send_recv(u_int32_t dst, int type, i
+ save->rtime = ((tr.tv_sec + JAN_1970) << 16) +
+ (tr.tv_usec << 10) / 15625;
+ save->len = len;
+- bcopy((char *)igmp, (char *)&save->igmp, ipdatalen);
++ memmove((char *)&save->igmp, (char *)igmp, ipdatalen)
+ }
+ return recvlen;
+ }
+@@ -651,6 +651,8 @@ void passive_mode(void)
+ (tr.tv_usec << 10) / 15625;
+ base.len = len;
+ bcopy((char *)igmp, (char *)&base.igmp, ipdatalen);
++ memmove((char *)&base.igmp, (char *)igmp, ipdatalen)
++
+ /*
+ * If the user specified which traces to monitor,
+ * only accept traces that correspond to the
diff --git a/package/mrouted/mrouted-3.9.2-makefile-flags.patch b/package/mrouted/mrouted-3.9.2-makefile-flags.patch
new file mode 100644
index 0000000..c70cf3a
--- /dev/null
+++ b/package/mrouted/mrouted-3.9.2-makefile-flags.patch
@@ -0,0 +1,62 @@
+--- a/Makefile 2010-08-20 11:27:26.000000000 -0700
++++ b/Makefile 2010-10-05 15:25:32.000000000 -0700
+@@ -64,8 +64,8 @@ include config.mk
+ include snmp.mk
+
+ ## Common
+-CFLAGS = ${MCAST_INCLUDE} ${SNMPDEF} ${RSRRDEF} $(INCLUDES) $(DEFS) $(USERCOMPILE)
+-CFLAGS += -O2 -W -Wall -Werror
++MROUTED_CFLAGS = ${MCAST_INCLUDE} ${SNMPDEF} ${RSRRDEF} $(INCLUDES) $(DEFS) $(USERCOMPILE)
++#CFLAGS += -O2 -W -Wall
+ #CFLAGS += -O -g
+ LDLIBS = ${SNMPLIBDIR} ${SNMPLIBS} ${LIB2}
+ OBJS = ${IGMP_OBJS} ${ROUTER_OBJS} ${MAPPER_OBJS} ${MRINFO_OBJS} \
+@@ -80,6 +80,9 @@ LINTFLAGS = ${MCAST_INCLUDE} $(filte
+
+ all: $(EXECS) ${MSTAT}
+
++%.o: %.c
++ $(CC) $(MROUTED_CFLAGS) $(CFLAGS) -c -o $@ $<
++
+ install: $(EXECS)
+ $(Q)[ -n "$(DESTDIR)" -a ! -d $(DESTDIR) ] || install -d $(DESTDIR)
+ $(Q)install -d $(DESTDIR)$(prefix)/sbin
+@@ -111,7 +114,7 @@ mrouted: ${IGMP_OBJS} ${ROUTER_OBJS} ver
+ ifdef Q
+ @printf " LINK $(subst $(ROOTDIR),,$(shell pwd))/$@\n"
+ endif
+- $(Q)${CC} ${CFLAGS} ${LDFLAGS} -Wl,-Map,$@.map -o $@ $^ $(LDLIBS$(LDLIBS-$(@)))
++ $(Q)$(CC) $(MROUTED_CFLAGS) $(CFLAGS) $(LDFLAGS) -Wl,-Map,$@.map -o $@ $^ $(LDLIBS$(LDLIBS-$(@)))
+
+ vers.c: Makefile
+ @echo $(VERSION) | sed -e 's/.*/char todaysversion[]="&";/' > vers.c
+@@ -120,25 +123,25 @@ map-mbone: ${IGMP_OBJS} ${MAPPER_OBJS}
+ ifdef Q
+ @printf " LINK $(subst $(ROOTDIR),,$(shell pwd))/$@\n"
+ endif
+- $(Q)${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${IGMP_OBJS} ${MAPPER_OBJS} ${LIB2}
++ $(Q)$(CC) $(MROUTED_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ${IGMP_OBJS} ${MAPPER_OBJS} ${LIB2}
+
+ mrinfo: ${IGMP_OBJS} ${MRINFO_OBJS}
+ ifdef Q
+ @printf " LINK $(subst $(ROOTDIR),,$(shell pwd))/$@\n"
+ endif
+- $(Q)${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${IGMP_OBJS} ${MRINFO_OBJS} ${LIB2}
++ $(Q)$(CC) $(MROUTED_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ${IGMP_OBJS} ${MRINFO_OBJS} ${LIB2}
+
+ mtrace: ${IGMP_OBJS} ${MTRACE_OBJS}
+ ifdef Q
+ @printf " LINK $(subst $(ROOTDIR),,$(shell pwd))/$@\n"
+ endif
+- $(Q)${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${IGMP_OBJS} ${MTRACE_OBJS} ${LIB2}
++ $(Q)$(CC) $(MROUTED_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ${IGMP_OBJS} ${MTRACE_OBJS} ${LIB2}
+
+ mstat: ${MSTAT_OBJS} snmplib/libsnmp.a
+ ifdef Q
+ @printf " LINK $(subst $(ROOTDIR),,$(shell pwd))/$@\n"
+ endif
+- $(Q)${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${MSTAT_OBJS} -Lsnmplib -lsnmp
++ $(Q)$(CC) $(MROUTED_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ${MSTAT_OBJS} -Lsnmplib -lsnmp
+
+ clean: ${SNMPCLEAN}
+ -$(Q)$(RM) $(OBJS) $(EXECS)
diff --git a/package/mrouted/mrouted-sys_errlist.patch b/package/mrouted/mrouted-sys_errlist.patch
deleted file mode 100644
index 8498dc7..0000000
--- a/package/mrouted/mrouted-sys_errlist.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Patches from Kevin P. Fleming <kpfleming@backtobasicsmgmt.com>.
-
---- mrouted-3.9-beta3.orig/main.c~ 2004-03-10 19:00:38.000000000 -0700
-+++ mrouted-3.9-beta3.orig/main.c 2004-03-10 19:02:33.000000000 -0700
-@@ -1001,10 +1001,8 @@
- thyme->tm_min, thyme->tm_sec, now.tv_usec / 1000, msg);
- if (syserr == 0)
- fprintf(stderr, "\n");
-- else if (syserr < sys_nerr)
-- fprintf(stderr, ": %s\n", sys_errlist[syserr]);
- else
-- fprintf(stderr, ": errno %d\n", syserr);
-+ fprintf(stderr, ": %s\n", strerror(syserr));
- }
-
- /*
---- mrouted-3.9-beta3.orig/mrinfo.c~ 1998-02-28 20:05:20.000000000 -0700
-+++ mrouted-3.9-beta3.orig/mrinfo.c 2004-03-10 19:01:49.000000000 -0700
-@@ -159,10 +159,8 @@
- vfprintf(stderr, fmt, ap);
- if (syserr == 0)
- fprintf(stderr, "\n");
-- else if (syserr < sys_nerr)
-- fprintf(stderr, ": %s\n", sys_errlist[syserr]);
- else
-- fprintf(stderr, ": errno %d\n", syserr);
-+ fprintf(stderr, ": %s\n", strerror(syserr));
- }
-
- if (severity <= LOG_ERR)
---- mrouted-3.9-beta3.orig/mapper.c~ 1998-01-05 18:57:47.000000000 -0700
-+++ mrouted-3.9-beta3.orig/mapper.c 2004-03-10 19:02:04.000000000 -0700
-@@ -197,10 +197,8 @@
- vfprintf(stderr, fmt, ap);
- if (syserr == 0)
- fprintf(stderr, "\n");
-- else if (syserr < sys_nerr)
-- fprintf(stderr, ": %s\n", sys_errlist[syserr]);
- else
-- fprintf(stderr, ": errno %d\n", syserr);
-+ fprintf(stderr, ": %s\n", strerror(syserr));
- }
-
- if (severity <= LOG_ERR)
diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk
index 4438c6d..00c8d28 100644
--- a/package/mrouted/mrouted.mk
+++ b/package/mrouted/mrouted.mk
@@ -4,52 +4,25 @@
#
#
#############################################################
-MROUTED_VERSION:=3.9-beta3.orig
-MROUTED_SOURCE:=mrouted_$(MROUTED_VERSION).tar.gz
-MROUTED_SITE:=http://archive.debian.org/debian-archive/pool/non-free/m/mrouted/
-MROUTED_DIR:=$(BUILD_DIR)/mrouted-$(MROUTED_VERSION)
-MROUTED_CAT:=$(ZCAT)
-MROUTED_PATCH:=mrouted_3.9-beta3-1.1.diff.gz
-MROUTED_BINARY:=mrouted
-MROUTED_TARGET_BINARY:=usr/sbin/mrouted
+MROUTED_VERSION = 3.9.2
+MROUTED_SOURCE = troglobit-mrouted-$(MROUTED_VERSION)-*.tar.gz
+MROUTED_SITE = http://github.com/troglobit/mrouted/tarball/3.9.2
-$(DL_DIR)/$(MROUTED_SOURCE):
- $(call DOWNLOAD,$(MROUTED_SITE),$(MROUTED_SOURCE))
-
-$(DL_DIR)/$(MROUTED_PATCH):
- $(call DOWNLOAD,$(MROUTED_SITE),$(MROUTED_PATCH))
-
-$(MROUTED_DIR)/.unpacked: $(DL_DIR)/$(MROUTED_SOURCE) $(DL_DIR)/$(MROUTED_PATCH)
- $(MROUTED_CAT) $(DL_DIR)/$(MROUTED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(MROUTED_CAT) $(DL_DIR)/$(MROUTED_PATCH) | patch -p1 -d $(MROUTED_DIR)
- toolchain/patch-kernel.sh $(MROUTED_DIR) package/mrouted/ mrouted\*.patch
- touch $(MROUTED_DIR)/.unpacked
-
-$(MROUTED_DIR)/$(MROUTED_BINARY): $(MROUTED_DIR)/.unpacked
+define MROUTED_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) \
- $(MAKE) CC="$(TARGET_CC)" -C $(MROUTED_DIR)
-
-$(TARGET_DIR)/$(MROUTED_TARGET_BINARY): $(MROUTED_DIR)/$(MROUTED_BINARY)
- cp -a $(MROUTED_DIR)/$(MROUTED_BINARY) $(TARGET_DIR)/$(MROUTED_TARGET_BINARY)
-
-mrouted: $(TARGET_DIR)/$(MROUTED_TARGET_BINARY)
+ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
+endef
-mrouted-source: $(DL_DIR)/$(MROUTED_SOURCE) $(DL_DIR)/$(MROUTED_PATCH)
+define MROUTED_INSTALL_TARGET_CMDS
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef
-mrouted-unpacked: $(MROUTED_DIR)/.unpacked
+define MROUTED_UNINSTALL_TARGET_CMDS
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall
+endef
-mrouted-clean:
- rm -f $(TARGET_DIR)/$(MROUTED_TARGET_BINARY)
- -$(MAKE) -C $(MROUTED_DIR) clean
+define MROUTED_CLEAN_CMDS
+ $(MAKE) -C $(@D) clean
+endef
-mrouted-dirclean:
- rm -rf $(MROUTED_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_MROUTED),y)
-TARGETS+=mrouted
-endif
+$(eval $(call GENTARGETS,package,mrouted))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 09/10] mplayer: convert to gentargets
From: Chih-Min Chao @ 2010-10-06 3:42 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286266963-23413-9-git-send-email-Martin.Banky@gmail.com>
On Tue, Oct 5, 2010 at 4:22 PM, Martin Banky <martin.banky@gmail.com> wrote:
> Would have bumped the version, but someone smarter than me is going to have to
> do it.
>
> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
> ---
> ?package/multimedia/mplayer/mplayer.mk | ? 88 +++++++++++---------------------
> ?1 files changed, 30 insertions(+), 58 deletions(-)
>
> diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
> index ac3a67e..a53c687 100644
> --- a/package/multimedia/mplayer/mplayer.mk
> +++ b/package/multimedia/mplayer/mplayer.mk
> @@ -3,67 +3,54 @@
> ?# mplayer
> ?#
> ?#############################################################
> -MPLAYER_VERSION:=1.0rc2
> -MPLAYER_SOURCE:=MPlayer-$(MPLAYER_VERSION).tar.bz2
> -MPLAYER_SITE:=http://www7.mplayerhq.hu/MPlayer/releases
> -MPLAYER_DIR:=$(BUILD_DIR)/MPlayer-$(MPLAYER_VERSION)
> -MPLAYER_CAT:=$(BZCAT)
> -MPLAYER_BINARY:=mplayer
> -MPLAYER_TARGET_BINARY:=usr/bin/$(MPLAYER_BINARY)
> +MPLAYER_VERSION = 1.0rc2
> +MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.bz2
> +MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
>
> ?MPLAYER_DEPENDENCIES = \
> ? ? ? ?$(if $(BR2_PACKAGE_LIBMAD),libmad) \
> ? ? ? ?$(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib)
>
> ?ifeq ($(BR2_ENDIAN),"BIG")
> -MPLAYER_ENDIAN:=--enable-big-endian
> +MPLAYER_CONF_OPTS += --enable-big-endian
> ?else
> -MPLAYER_ENDIAN:=--disable-big-endian
> +MPLAYER_CONF_OPTS += --disable-big-endian
> ?endif
How about using MPLAYER_CONF_OPT += --disable-sdl rather than
creating new var ?
>
> -# mplayer unfortunately uses --disable-largefileS, so we cannot use
> +# mplayer unfortunately uses --disable-largefiles, so we cannot use
> ?# DISABLE_LARGEFILE
> ?ifeq ($(BR2_LARGEFILE),y)
> -MPLAYER_LARGEFILE:=--enable-largefiles
> +MPLAYER_CONF_OPTS += --enable-largefiles
> ?else
> ?# dvdread/dvdcss requires largefile support
> -MPLAYER_LARGEFILE:=--disable-largefiles \
> +MPLAYER_CONF_OPTS += --disable-largefiles \
> ? ? ? ? ? ? ? ? ? --disable-dvdread-internal \
> ? ? ? ? ? ? ? ? ? --disable-libdvdcss-internal
> ?endif
>
> ?ifeq ($(BR2_PACKAGE_SDL),y)
> -MPLAYER_SDL:=--enable-sdl --with-sdl-config=$(STAGING_DIR)/usr/bin/sdl-config
> +MPLAYER_CONF_OPTS += --enable-sdl --with-sdl-config=$(STAGING_DIR)/usr/bin/sdl-config
> ?MPLAYER_DEPENDENCIES += sdl
> ?else
> -MPLAYER_SDL:=--disable-sdl
> +MPLAYER_CONF_OPTS += --disable-sdl
> ?endif
>
> ?ifeq ($(BR2_PACKAGE_FREETYPE),y)
> -MPLAYER_FREETYPE:= \
> +MPLAYER_CONF_OPTS += ?\
> ? ? ? ?--enable-freetype \
> ? ? ? ?--with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
> ?MPLAYER_DEPENDENCIES += freetype
> ?else
> -MPLAYER_FREETYPE:=--disable-freetype
> +MPLAYER_CONF_OPTS += --disable-freetype
> ?endif
>
> ?ifeq ($(BR2_i386),y)
> ?# This seems to be required to compile some of the inline asm
> -MPLAYER_CFLAGS:=-fomit-frame-pointer
> +MPLAYER_CFLAGS = -fomit-frame-pointer
> ?endif
>
> -$(DL_DIR)/$(MPLAYER_SOURCE):
> - ? ? ? $(call DOWNLOAD,$(MPLAYER_SITE),$(MPLAYER_SOURCE))
> -
> -$(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/multimedia/mplayer/ mplayer-$(MPLAYER_VERSION)\*.patch\*
> - ? ? ? $(CONFIG_UPDATE) $(MPLAYER_DIR)
> - ? ? ? touch $@
> -
> -$(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
> - ? ? ? (cd $(MPLAYER_DIR); rm -rf config.cache; \
> +define MPLAYER_CONFIGURE_CMDS
> + ? ? ? (cd $(@D); rm -rf config.cache; \
> ? ? ? ? ? ? ? ?$(TARGET_CONFIGURE_OPTS) \
> ? ? ? ? ? ? ? ?$(TARGET_CONFIGURE_ARGS) \
> ? ? ? ? ? ? ? ?CFLAGS="$(TARGET_CFLAGS) $(MPLAYER_CFLAGS)" \
> @@ -80,44 +67,29 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
> ? ? ? ? ? ? ? ?--charset=UTF-8 \
> ? ? ? ? ? ? ? ?--enable-mad \
> ? ? ? ? ? ? ? ?--enable-fbdev \
> - ? ? ? ? ? ? ? $(MPLAYER_ENDIAN) \
> - ? ? ? ? ? ? ? $(MPLAYER_LARGEFILE) \
> - ? ? ? ? ? ? ? $(MPLAYER_SDL) \
> - ? ? ? ? ? ? ? $(MPLAYER_FREETYPE) \
> + ? ? ? ? ? ? ? $(MPLAYER_CONF_OPTS) \
> ? ? ? ? ? ? ? ?--enable-cross-compile \
> ? ? ? ? ? ? ? ?--disable-ivtv \
> ? ? ? ? ? ? ? ?--disable-tv \
> ? ? ? ? ? ? ? ?--disable-live \
> ? ? ? ? ? ? ? ?--enable-dynamic-plugins \
> ? ? ? ?)
> - ? ? ? touch $@
> -
> -$(MPLAYER_DIR)/$(MPLAYER_BINARY): $(MPLAYER_DIR)/.configured
> - ? ? ? $(MAKE1) -C $(MPLAYER_DIR)
> - ? ? ? touch -c $@
> +endef
merge target option to (PKG)_CONF_OPT and defining CONFIGURE_CMDS is
not necessary
>
> -$(TARGET_DIR)/$(MPLAYER_TARGET_BINARY): $(MPLAYER_DIR)/$(MPLAYER_BINARY)
> - ? ? ? $(INSTALL) -m 0755 -D $(MPLAYER_DIR)/$(MPLAYER_BINARY) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
> - ? ? ? -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
> - ? ? ? touch -c $@
> +define MPLAYER_BUILD_CMDS
> + ? ? ? $(MAKE1) -C $(@D)
> +endef
is it necessary ?
>
> -mplayer: $(MPLAYER_DEPENDENCIES) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
> +define MPLAYER_INSTALL_TARGET_CMDS
> + ? ? ? $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
> +endef
>
> -mplayer-source: $(DL_DIR)/$(MPLAYER_SOURCE)
> +define MPLAYER_UNINSTALL_TARGET_CMDS
> + ? ? ? $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall
> +endef
>
> -mplayer-unpacked: $(MPLAYER_DIR)/.unpacked
> +define MPLAYER_CLEAN_CMDS
> + ? ? ? $(MAKE) -C $(@D) clean
> +endef
>
> -mplayer-clean:
> - ? ? ? rm -f $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
> - ? ? ? -$(MAKE) -C $(MPLAYER_DIR) clean
> -
> -mplayer-dirclean:
> - ? ? ? rm -rf $(MPLAYER_DIR)
> -#############################################################
> -#
> -# Toplevel Makefile options
> -#
> -#############################################################
> -ifeq ($(BR2_PACKAGE_MPLAYER),y)
> -TARGETS+=mplayer
> -endif
> +$(eval $(call GENTARGETS,package/multimedia,mplayer))
> --
> 1.7.3.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply
* [Buildroot] [PATCH 09/10] mplayer: convert to gentargets
From: Martin Banky @ 2010-10-06 5:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <AANLkTinB19PdEHHv7zfV9p2RwKoCv5_syOZDWQ4wBLhu@mail.gmail.com>
On Tue, Oct 5, 2010 at 8:42 PM, Chih-Min Chao <cmchao@gmail.com> wrote:
> On Tue, Oct 5, 2010 at 4:22 PM, Martin Banky <martin.banky@gmail.com>
> wrote:
> > Would have bumped the version, but someone smarter than me is going to
> have to
> > do it.
> >
> > Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
> > ---
> > package/multimedia/mplayer/mplayer.mk | 88
> +++++++++++---------------------
> > 1 files changed, 30 insertions(+), 58 deletions(-)
> >
> > diff --git a/package/multimedia/mplayer/mplayer.mkb/package/multimedia/mplayer/
> mplayer.mk
> > index ac3a67e..a53c687 100644
> > --- a/package/multimedia/mplayer/mplayer.mk
> > +++ b/package/multimedia/mplayer/mplayer.mk
> > @@ -3,67 +3,54 @@
> > # mplayer
> > #
> > #############################################################
> > -MPLAYER_VERSION:=1.0rc2
> > -MPLAYER_SOURCE:=MPlayer-$(MPLAYER_VERSION).tar.bz2
> > -MPLAYER_SITE:=http://www7.mplayerhq.hu/MPlayer/releases
> > -MPLAYER_DIR:=$(BUILD_DIR)/MPlayer-$(MPLAYER_VERSION)
> > -MPLAYER_CAT:=$(BZCAT)
> > -MPLAYER_BINARY:=mplayer
> > -MPLAYER_TARGET_BINARY:=usr/bin/$(MPLAYER_BINARY)
> > +MPLAYER_VERSION = 1.0rc2
> > +MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.bz2
> > +MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
> >
> > MPLAYER_DEPENDENCIES = \
> > $(if $(BR2_PACKAGE_LIBMAD),libmad) \
> > $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib)
> >
> > ifeq ($(BR2_ENDIAN),"BIG")
> > -MPLAYER_ENDIAN:=--enable-big-endian
> > +MPLAYER_CONF_OPTS += --enable-big-endian
> > else
> > -MPLAYER_ENDIAN:=--disable-big-endian
> > +MPLAYER_CONF_OPTS += --disable-big-endian
> > endif
>
> How about using MPLAYER_CONF_OPT += --disable-sdl rather than
> creating new var ?
> >
> > -# mplayer unfortunately uses --disable-largefileS, so we cannot use
> > +# mplayer unfortunately uses --disable-largefiles, so we cannot use
> > # DISABLE_LARGEFILE
> > ifeq ($(BR2_LARGEFILE),y)
> > -MPLAYER_LARGEFILE:=--enable-largefiles
> > +MPLAYER_CONF_OPTS += --enable-largefiles
> > else
> > # dvdread/dvdcss requires largefile support
> > -MPLAYER_LARGEFILE:=--disable-largefiles \
> > +MPLAYER_CONF_OPTS += --disable-largefiles \
> > --disable-dvdread-internal \
> > --disable-libdvdcss-internal
> > endif
> >
> > ifeq ($(BR2_PACKAGE_SDL),y)
> > -MPLAYER_SDL:=--enable-sdl
> --with-sdl-config=$(STAGING_DIR)/usr/bin/sdl-config
> > +MPLAYER_CONF_OPTS += --enable-sdl
> --with-sdl-config=$(STAGING_DIR)/usr/bin/sdl-config
> > MPLAYER_DEPENDENCIES += sdl
> > else
> > -MPLAYER_SDL:=--disable-sdl
> > +MPLAYER_CONF_OPTS += --disable-sdl
> > endif
> >
> > ifeq ($(BR2_PACKAGE_FREETYPE),y)
> > -MPLAYER_FREETYPE:= \
> > +MPLAYER_CONF_OPTS += \
> > --enable-freetype \
> > --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
> > MPLAYER_DEPENDENCIES += freetype
> > else
> > -MPLAYER_FREETYPE:=--disable-freetype
> > +MPLAYER_CONF_OPTS += --disable-freetype
> > endif
> >
> > ifeq ($(BR2_i386),y)
> > # This seems to be required to compile some of the inline asm
> > -MPLAYER_CFLAGS:=-fomit-frame-pointer
> > +MPLAYER_CFLAGS = -fomit-frame-pointer
> > endif
> >
> > -$(DL_DIR)/$(MPLAYER_SOURCE):
> > - $(call DOWNLOAD,$(MPLAYER_SITE),$(MPLAYER_SOURCE))
> > -
> > -$(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/multimedia/mplayer/ mplayer-$(MPLAYER_VERSION)\*.patch\*
> > - $(CONFIG_UPDATE) $(MPLAYER_DIR)
> > - touch $@
> > -
> > -$(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
> > - (cd $(MPLAYER_DIR); rm -rf config.cache; \
> > +define MPLAYER_CONFIGURE_CMDS
> > + (cd $(@D); rm -rf config.cache; \
> > $(TARGET_CONFIGURE_OPTS) \
> > $(TARGET_CONFIGURE_ARGS) \
> > CFLAGS="$(TARGET_CFLAGS) $(MPLAYER_CFLAGS)" \
> > @@ -80,44 +67,29 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
> > --charset=UTF-8 \
> > --enable-mad \
> > --enable-fbdev \
> > - $(MPLAYER_ENDIAN) \
> > - $(MPLAYER_LARGEFILE) \
> > - $(MPLAYER_SDL) \
> > - $(MPLAYER_FREETYPE) \
> > + $(MPLAYER_CONF_OPTS) \
> > --enable-cross-compile \
> > --disable-ivtv \
> > --disable-tv \
> > --disable-live \
> > --enable-dynamic-plugins \
> > )
> > - touch $@
> > -
> > -$(MPLAYER_DIR)/$(MPLAYER_BINARY): $(MPLAYER_DIR)/.configured
> > - $(MAKE1) -C $(MPLAYER_DIR)
> > - touch -c $@
> > +endef
> merge target option to (PKG)_CONF_OPT and defining CONFIGURE_CMDS is
> not necessary
>
> >
> > -$(TARGET_DIR)/$(MPLAYER_TARGET_BINARY): $(MPLAYER_DIR)/$(MPLAYER_BINARY)
> > - $(INSTALL) -m 0755 -D $(MPLAYER_DIR)/$(MPLAYER_BINARY)
> $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
> > - -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)
> $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
> > - touch -c $@
> > +define MPLAYER_BUILD_CMDS
> > + $(MAKE1) -C $(@D)
> > +endef
>
> is it necessary ?
> >
> > -mplayer: $(MPLAYER_DEPENDENCIES) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
> > +define MPLAYER_INSTALL_TARGET_CMDS
> > + $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
> > +endef
> >
> > -mplayer-source: $(DL_DIR)/$(MPLAYER_SOURCE)
> > +define MPLAYER_UNINSTALL_TARGET_CMDS
> > + $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall
> > +endef
> >
> > -mplayer-unpacked: $(MPLAYER_DIR)/.unpacked
> > +define MPLAYER_CLEAN_CMDS
> > + $(MAKE) -C $(@D) clean
> > +endef
> >
> > -mplayer-clean:
> > - rm -f $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY)
> > - -$(MAKE) -C $(MPLAYER_DIR) clean
> > -
> > -mplayer-dirclean:
> > - rm -rf $(MPLAYER_DIR)
> > -#############################################################
> > -#
> > -# Toplevel Makefile options
> > -#
> > -#############################################################
> > -ifeq ($(BR2_PACKAGE_MPLAYER),y)
> > -TARGETS+=mplayer
> > -endif
> > +$(eval $(call GENTARGETS,package/multimedia,mplayer))
> > --
> > 1.7.3.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
> >
>
This is a gentargets package, (PKG)_CONF_OPT is only available to
autotargets. This is why I added the 'S' to the end of the variable name, to
show that it's not an autotargets package. As for MAKE1, I'm not sure if
it's necessary, but it was in the original package, so I used it.
Martin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20101005/99239999/attachment.html>
^ permalink raw reply
* [Buildroot] [git commit master 1/1] dropbear: really fix xauth tweak since dbcec2b2
From: Peter Korsgaard @ 2010-10-06 7:45 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=36a5ccd0235c22491158634cef40cbdac278c53c
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Commit d5576fd2 tried to fix this, but introduced a new typo.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/dropbear/dropbear.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 0457935..b07cb63 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -21,7 +21,7 @@ define DROPBEAR_FIX_XAUTH
$(SED) 's,^#define XAUTH_COMMAND.*/xauth,#define XAUTH_COMMAND "/usr/bin/xauth,g' $(@D)/options.h
endef
-DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_FIX_AUTH
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_FIX_XAUTH
define DROPBEAR_DISABLE_REVERSE_DNS
$(SED) 's,^#define DO_HOST_LOOKUP.*,/* #define DO_HOST_LOOKUP */,' $(@D)/options.h
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH] pcmciautils: added package
From: Patrik Dahlström @ 2010-10-06 7:45 UTC (permalink / raw)
To: buildroot
Subject: [PATCH] pcmciautils: added package
Date: Wednesday 06 October 2010, 09:41:18
From: "Patrik Dahlstr?m" <risca88@gmail.com>
To: buildroot at busybox.net
CC: Patrik Dahlstr?m <patrikd@telia.com>
---
package/Config.in | 1 +
package/pcmciautils/Config.in | 24 +++++++++++++++++++++
package/pcmciautils/pcmciautils.mk | 41
++++++++++++++++++++++++++++++++++++
3 files changed, 66 insertions(+), 0 deletions(-)
create mode 100644 package/pcmciautils/Config.in
create mode 100644 package/pcmciautils/pcmciautils.mk
diff --git a/package/Config.in b/package/Config.in
index 5e08d59..c75932b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -177,6 +177,7 @@ source "package/mtd/Config.in"
source "package/ntfs-3g/Config.in"
source "package/ntfsprogs/Config.in"
source "package/pciutils/Config.in"
+source "package/pcmciautils/Config.in"
source "package/setserial/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
# busybox has fdisk
diff --git a/package/pcmciautils/Config.in b/package/pcmciautils/Config.in
new file mode 100644
index 0000000..022558a
--- /dev/null
+++ b/package/pcmciautils/Config.in
@@ -0,0 +1,24 @@
+config BR2_PACKAGE_PCMCIAUTILS
+ bool "pcmciautils"
+ select BR2_PACKAGE_LIBSYSFS
+ depends on BR2_PACKAGE_UDEV
+ help
+ Set of tools needed to use PC-card slots usually found in laptops
+
+comment "pcmciautils requires udev"
+ depends on !BR2_PACKAGE_UDEV
+
+if BR2_PACKAGE_PCMCIAUTILS
+
+config BR2_PACKAGE_PCMCIAUTILS_STARTUP
+ bool "Build socket-startup script"
+ default y
+ help
+ Enable this if you need the socket-startup script
+
+ You don't need it if the socket driver does not select
+ PCCARD_NONSTATIC -- that is the case for many embedded systems --
+ and for yenta_socket if the cardbus bridge is either below a
+ PCI-PCI bridge, or where the PCI bus is not equivalent to the host
+ bus (e.g. on PPC)
+endif
diff --git a/package/pcmciautils/pcmciautils.mk
b/package/pcmciautils/pcmciautils.mk
new file mode 100644
index 0000000..532b5ea
--- /dev/null
+++ b/package/pcmciautils/pcmciautils.mk
@@ -0,0 +1,41 @@
+#############################################################
+#
+# pcmciautils
+#
+#############################################################
+PCMCIAUTILS_VERSION:=017
+PCMCIAUTILS_SOURCE:=pcmciautils-$(PCMCIAUTILS_VERSION).tar.gz
+PCMCIAUTILS_SITE:=http://www.kernel.org/pub/linux/utils/kernel/pcmcia/
+PCMCIAUTILS_DEPENDENCIES = libsysfs
+
+ifeq ($(BR2_PACKAGE_PCMCIAUTILS_STARTUP),y)
+ BR2_PACKAGE_PCMCIAUTILS_BUILD_STARTUP=true
+else
+ BR2_PACKAGE_PCMCIAUTILS_BUILD_STARTUP=false
+endif
+
+ifeq ($(BR2_PREFER_STATIC),y)
+ BR2_PACKAGE_PCMCIAUTILS_BUILD_STATIC=true
+else
+ BR2_PACKAGE_PCMCIAUTILS_BUILD_STATIC=false
+endif
+
+define PCMCIAUTILS_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_CC)" -C "$(@D)" \
+ STARTUP=$(BR2_PACKAGE_PCMCIAUTILS_BUILD_STARTUP) \
+ UDEV="true" \
+ STATIC=$(BR2_PACKAGE_PCMCIAUTILS_BUILD_STATIC) \
+ DESTDIR="$(TARGET_DIR)" \
+ HOSTCC="$(HOSTCC)" \
+ V="true"
+endef
+
+define PCMCIAUTILS_INSTALL_TARGET_CMDS
+ $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_CC)" -C "$(@D)" \
+ DESTDIR="$(TARGET_DIR)" \
+ INSTALL="$(INSTALL)" \
+ INSTALL_PROGRAM="$(INSTALL)" \
+ install
+endef
+
+$(eval $(call GENTARGETS,package,pcmciautils))
--
1.7.3.1
Hi!
my current mail-provided doesn't play nice with git send-email so I had to
send using a different mail and then forward with the mail registered to
buildroot mailing list. Sorry for the delay, this patch have been done for a
week now.
MvH
Patrik Dahlstr?m
Ordf?rande - http://www.studentfiket.com/
Penga-Mas (Kass?r) - Dalarnas Nation
"Alla djur, utom m?nniskan, vet att livets huvudsakliga mening ?r att njuta av
det! --Samuel Butler
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] xapp_twm: needs libX11/Xext/Xt/Xmu
From: Peter Korsgaard @ 2010-10-06 8:04 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=a82675239c4125340938299aa729d4d83558ad72
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 1 +
package/x11r7/xapp_twm/Config.in | 4 ++++
package/x11r7/xapp_twm/xapp_twm.mk | 1 +
3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/CHANGES b/CHANGES
index d93e9e1..2fc43b0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -43,6 +43,7 @@
shared-mime-info, speex, sqlite, squashfs, strace, sylpheed,
taglib, tcpdump, thttpd, tiff, tn5250, udev, udpcast,
usbmount, usbutils, vsftpd, vtun, which, wpa_supplicant,
+ xapp_twm,
xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},
xdriver-xf86-input-{mouse,synaptics,vmmouse,void},
xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev},
diff --git a/package/x11r7/xapp_twm/Config.in b/package/x11r7/xapp_twm/Config.in
index 77f8554..25bf800 100644
--- a/package/x11r7/xapp_twm/Config.in
+++ b/package/x11r7/xapp_twm/Config.in
@@ -1,4 +1,8 @@
config BR2_PACKAGE_XAPP_TWM
bool "twm"
+ select BR2_PACKAGE_XLIB_LIBX11
+ select BR2_PACKAGE_XLIB_LIBXEXT
+ select BR2_PACKAGE_XLIB_LIBXT
+ select BR2_PACKAGE_XLIB_LIBXMU
help
No description available
diff --git a/package/x11r7/xapp_twm/xapp_twm.mk b/package/x11r7/xapp_twm/xapp_twm.mk
index 28fc225..bc35293 100644
--- a/package/x11r7/xapp_twm/xapp_twm.mk
+++ b/package/x11r7/xapp_twm/xapp_twm.mk
@@ -8,5 +8,6 @@ XAPP_TWM_VERSION = 1.0.3
XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.bz2
XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_TWM_AUTORECONF = NO
+XAPP_TWM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xlib_libXmu
$(eval $(call AUTOTARGETS,package/x11r7,xapp_twm))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] xapp_xbacklight: needs libXrandr/Xrender
From: Peter Korsgaard @ 2010-10-06 8:18 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=73a1f4ba5f53f69173c7e63ae07bb3d5984c68d9
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 2 +-
package/x11r7/xapp_xbacklight/Config.in | 2 ++
package/x11r7/xapp_xbacklight/xapp_xbacklight.mk | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CHANGES b/CHANGES
index 2fc43b0..c979607 100644
--- a/CHANGES
+++ b/CHANGES
@@ -43,7 +43,7 @@
shared-mime-info, speex, sqlite, squashfs, strace, sylpheed,
taglib, tcpdump, thttpd, tiff, tn5250, udev, udpcast,
usbmount, usbutils, vsftpd, vtun, which, wpa_supplicant,
- xapp_twm,
+ xapp_twm, xapp_xbacklight,
xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},
xdriver-xf86-input-{mouse,synaptics,vmmouse,void},
xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev},
diff --git a/package/x11r7/xapp_xbacklight/Config.in b/package/x11r7/xapp_xbacklight/Config.in
index 3d727e2..9756235 100644
--- a/package/x11r7/xapp_xbacklight/Config.in
+++ b/package/x11r7/xapp_xbacklight/Config.in
@@ -1,5 +1,7 @@
config BR2_PACKAGE_XAPP_XBACKLIGHT
bool "xbacklight"
select BR2_PACKAGE_XLIB_LIBX11
+ select BR2_PACKAGE_XLIB_LIBXRANDR
+ select BR2_PACKAGE_XLIB_LIBXRENDER
help
xbacklight
diff --git a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
index 03f62b1..9da0c65 100644
--- a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
+++ b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
@@ -8,6 +8,6 @@ XAPP_XBACKLIGHT_VERSION = 1.1.1
XAPP_XBACKLIGHT_SOURCE = xbacklight-$(XAPP_XBACKLIGHT_VERSION).tar.bz2
XAPP_XBACKLIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XBACKLIGHT_AUTORECONF = NO
-XAPP_XBACKLIGHT_DEPENDENCIES = xlib_libX11
+XAPP_XBACKLIGHT_DEPENDENCIES = xlib_libX11 xlib_libXrandr xlib_libXrender
$(eval $(call AUTOTARGETS,package/x11r7,xapp_xbacklight))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] imagemagick: fix s/IMAGEMAGISK/IMAGEMAGICK/ typo
From: Peter Korsgaard @ 2010-10-06 9:48 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=259a129e81184b9d5f0fd998a940c7b4943fde81
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/imagemagick/imagemagick.mk | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index f14adb9..30158e0 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -33,49 +33,49 @@ ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
IMAGEMAGICK_CONF_OPT += --with-fontconfig
IMAGEMAGICK_DEPENDENCIES += fontconfig
else
-IMAGEMAGISK_CONF_OPT += --without-fontconfig
+IMAGEMAGICK_CONF_OPT += --without-fontconfig
endif
ifeq ($(BR2_PACKAGE_FREETYPE),y)
IMAGEMAGICK_CONF_OPT += --with-freetype
IMAGEMAGICK_DEPENDENCIES += freetype
else
-IMAGEMAGISK_CONF_OPT += --without-freetype
+IMAGEMAGICK_CONF_OPT += --without-freetype
endif
ifeq ($(BR2_PACKAGE_JPEG),y)
IMAGEMAGICK_CONF_OPT += --with-jpeg
IMAGEMAGICK_DEPENDENCIES += jpeg
else
-IMAGEMAGISK_CONF_OPT += --without-jpeg
+IMAGEMAGICK_CONF_OPT += --without-jpeg
endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
IMAGEMAGICK_CONF_OPT += --with-png
IMAGEMAGICK_DEPENDENCIES += libpng
else
-IMAGEMAGISK_CONF_OPT += --without-png
+IMAGEMAGICK_CONF_OPT += --without-png
endif
ifeq ($(BR2_PACKAGE_LIBRSVG),y)
IMAGEMAGICK_CONF_OPT += --with-rsvg
IMAGEMAGICK_DEPENDENCIES += librsvg
else
-IMAGEMAGISK_CONF_OPT += --without-rsvg
+IMAGEMAGICK_CONF_OPT += --without-rsvg
endif
ifeq ($(BR2_PACKAGE_LIBXML2),y)
IMAGEMAGICK_CONF_OPT += --with-xml
IMAGEMAGICK_DEPENDENCIES += libxml2
else
-IMAGEMAGISK_CONF_OPT += --without-xml
+IMAGEMAGICK_CONF_OPT += --without-xml
endif
ifeq ($(BR2_PACKAGE_TIFF),y)
IMAGEMAGICK_CONF_OPT += --with-tiff
IMAGEMAGICK_DEPENDENCIES += tiff
else
-IMAGEMAGISK_CONF_OPT += --without-tiff
+IMAGEMAGICK_CONF_OPT += --without-tiff
endif
$(eval $(call AUTOTARGETS,package,imagemagick))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] gst-plugins-ugle: add option for mpeg2dec support
From: Peter Korsgaard @ 2010-10-06 9:48 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=3506706dad5234a33d862bdc7baac6a732d1b466
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 32 ++++++++++----------
package/multimedia/gst-plugins-ugly/Config.in | 4 ++
.../gst-plugins-ugly/gst-plugins-ugly.mk | 7 ++++
3 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/CHANGES b/CHANGES
index a8bd699..1f80097 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,22 +28,22 @@
bootutils, bridge-utils, bsdiff, busybox, cvs, dbus, dmraid,
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
fconfig, ffmpeg, freetype, gadgetfs-test, gamin, gawk, gperf,
- gtk2-themes, gtkperf, gvfs, haserl, hdparm, hostapd, hwdata,
- ifplugd, imagemagick, iperf, ipsec-tools, iproute2, iptables,
- iw, jpeg, kexec, kismet, less, libcgi, libcurl, libdaemon,
- libdnet, liberation, libevent, libeXosip2, libglade, libgtk2,
- libiconv, libidn, libintl, libmms, libnl, liboil, libosip2,
- libpcap, libpng, libtool, libungif, libxml2, libxslt,
- lighttpd, lite, lm-sensors, lockfile-progs, logrotate, m4,
- mdadm, mesa3d, metacity, mtd-utils, mysql_client, nano, nbd,
- ncftp, neon, netperf, netsnmp, ng-spice-rework, ntfsprogs,
- ntp, openntpd, openssh, openvpn, oprofile, pango, patch, pcre,
- php, pkg-config, prboom, radvd, rdesktop, ruby, qt, quagga,
- samba, sawman, sdl_mixer, sdl_sound, setserial,
- shared-mime-info, speex, sqlite, squashfs, strace, sylpheed,
- taglib, tcpdump, thttpd, tiff, tn5250, udev, udpcast,
- usbmount, usbutils, vsftpd, vtun, which, wpa_supplicant,
- xapp_twm, xapp_xbacklight,
+ gst-plugins-ugly, gtk2-themes, gtkperf, gvfs, haserl, hdparm,
+ hostapd, hwdata, ifplugd, imagemagick, iperf, ipsec-tools,
+ iproute2, iptables, iw, jpeg, kexec, kismet, less, libcgi,
+ libcurl, libdaemon, libdnet, liberation, libevent, libeXosip2,
+ libglade, libgtk2, libiconv, libidn, libintl, libmms, libnl,
+ liboil, libosip2, libpcap, libpng, libtool, libungif, libxml2,
+ libxslt, lighttpd, lite, lm-sensors, lockfile-progs,
+ logrotate, m4, mdadm, mesa3d, metacity, mtd-utils,
+ mysql_client, nano, nbd, ncftp, neon, netperf, netsnmp,
+ ng-spice-rework, ntfsprogs, ntp, openntpd, openssh, openvpn,
+ oprofile, pango, patch, pcre, php, pkg-config, prboom, radvd,
+ rdesktop, ruby, qt, quagga, samba, sawman, sdl_mixer,
+ sdl_sound, setserial, shared-mime-info, speex, sqlite,
+ squashfs, strace, sylpheed, taglib, tcpdump, thttpd, tiff,
+ tn5250, udev, udpcast, usbmount, usbutils, vsftpd, vtun,
+ which, wpa_supplicant, xapp_twm, xapp_xbacklight,
xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},
xdriver-xf86-input-{mouse,synaptics,vmmouse,void},
xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev},
diff --git a/package/multimedia/gst-plugins-ugly/Config.in b/package/multimedia/gst-plugins-ugly/Config.in
index 190c4d8..9f738cf 100644
--- a/package/multimedia/gst-plugins-ugly/Config.in
+++ b/package/multimedia/gst-plugins-ugly/Config.in
@@ -47,4 +47,8 @@ config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD
select BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ID3TAG
select BR2_PACKAGE_LIBMAD
+config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEG2DEC
+ bool "mpeg2dec"
+ select BR2_PACKAGE_LIBMPEG2
+
endif
diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
index c87451f..fc2fcff 100644
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -75,4 +75,11 @@ else
GST_PLUGINS_UGLY_CONF_OPT += --disable-mad
endif
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y)
+GST_PLUGINS_UGLY_CONF_OPT += --enable-mpeg2dec
+GST_PLUGINS_UGLY_DEPENDENCIES += libmpeg2
+else
+GST_PLUGINS_UGLY_CONF_OPT += --disable-mpeg2dec
+endif
+
$(eval $(call AUTOTARGETS,package/multimedia,gst-plugins-ugly))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] package: add libmpeg2
From: Peter Korsgaard @ 2010-10-06 9:48 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=d089c987a67359f1f1b697d0b6bb60e95be2ba62
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
libmpeg2 is a mpeg1/mpeg2 video decoder library.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 2 +-
package/multimedia/Config.in | 1 +
package/multimedia/libmpeg2/Config.in | 13 +++++++++++++
package/multimedia/libmpeg2/libmpeg2.mk | 28 ++++++++++++++++++++++++++++
4 files changed, 43 insertions(+), 1 deletions(-)
create mode 100644 package/multimedia/libmpeg2/Config.in
create mode 100644 package/multimedia/libmpeg2/libmpeg2.mk
diff --git a/CHANGES b/CHANGES
index c979607..a8bd699 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,7 +21,7 @@
Alpha, Cris, IA64 and Sparc64 architecture support removed.
- New packages: librsvg, xz
+ New packages: libmpeg2, librsvg, xz
Updated/fixed packages: acpid, alsa-lib, argus, at, autoconf,
automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa,
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 3b0eec5..91def57 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -16,6 +16,7 @@ source "package/multimedia/libid3tag/Config.in"
source "package/multimedia/libmad/Config.in"
source "package/multimedia/libmms/Config.in"
source "package/multimedia/libmpd/Config.in"
+source "package/multimedia/libmpeg2/Config.in"
source "package/multimedia/libogg/Config.in"
source "package/multimedia/libsndfile/Config.in"
source "package/multimedia/libtheora/Config.in"
diff --git a/package/multimedia/libmpeg2/Config.in b/package/multimedia/libmpeg2/Config.in
new file mode 100644
index 0000000..a3fafb0
--- /dev/null
+++ b/package/multimedia/libmpeg2/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBMPEG2
+ bool "libmpeg2"
+ help
+ MPEG1/MPEG2 video decoder library
+
+ http://libmpeg2.sourceforge.net/
+
+config BR2_PACKAGE_LIBMPEG2_BINS
+ bool "mpeg2 binaries"
+ depends on BR2_PACKAGE_LIBMPEG2
+ help
+ Install mpeg2dec, corrupt_mpeg2 and extrac_mpeg2 programs as
+ well.
diff --git a/package/multimedia/libmpeg2/libmpeg2.mk b/package/multimedia/libmpeg2/libmpeg2.mk
new file mode 100644
index 0000000..cd8ac89
--- /dev/null
+++ b/package/multimedia/libmpeg2/libmpeg2.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# libmpeg2
+#
+#############################################################
+LIBMPEG2_VERSION = 0.5.1
+LIBMPEG2_SOURCE = libmpeg2-$(LIBMPEG2_VERSION).tar.gz
+LIBMPEG2_SITE = http://libmpeg2.sourceforge.net/files/
+LIBMPEG2_INSTALL_STAGING = YES
+LIBMPEG2_CONF_OPT = --without-x --disable-directx
+
+ifeq ($(BR2_PACKAGE_SDL),y)
+LIBMPEG2_CONF_OPT += --enable-sdl
+LIBMPEG2_DEPENDENCIES += sdl
+else
+LIBMPEG2_CONF_OPT += --disable-sdl
+endif
+
+ifneq ($(BR2_PACKAGE_LIBMPEG2_BINS),y)
+define LIBMPEG2_REMOVE_BINS
+ rm -f $(addprefix $(TARGET_DIR)/usr/bin/,\
+ mpeg2dec corrupt_mpeg2 extract_mpeg2)
+endef
+
+LIBMPEG2_POST_INSTALL_TARGET_HOOKS += LIBMPEG2_REMOVE_BINS
+endif
+
+$(eval $(call AUTOTARGETS,package/multimedia,libmpeg2))
--
1.7.1
^ permalink raw reply related
* [Buildroot] libpam inclusion
From: Yegor Yefremov @ 2010-10-06 10:45 UTC (permalink / raw)
To: buildroot
There are some packages depending on libpam: sudo, busybox (PAM
support). Should it be included in staging and target or are there any
problems with including this lib into buildroot?
Regards,
Yegor
^ permalink raw reply
* [Buildroot] [Bug 2665] New: tslib examples doesn't support 24-bit display
From: bugzilla at busybox.net @ 2010-10-06 11:16 UTC (permalink / raw)
To: buildroot
https://bugs.busybox.net/show_bug.cgi?id=2665
Summary: tslib examples doesn't support 24-bit display
Product: buildroot
Version: unspecified
Platform: PC
OS/Version: Linux
Status: NEW
Severity: enhancement
Priority: P5
Component: Other
AssignedTo: unassigned at buildroot.uclibc.org
ReportedBy: tajen_junk at hotmail.com
CC: buildroot at uclibc.org
Estimated Hours: 0.0
Just a bit annoying.
I've also fixed it - patch attached
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 2665] tslib examples doesn't support 24-bit display
From: bugzilla at busybox.net @ 2010-10-06 11:19 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-2665-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=2665
--- Comment #1 from tajen_junk at hotmail.com ---
Created attachment 2563
--> https://bugs.busybox.net/attachment.cgi?id=2563
Drop in buildroot-x.x/package/tslib/
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 2665] tslib examples doesn't support 24-bit display
From: bugzilla at busybox.net @ 2010-10-06 11:19 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-2665-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=2665
tajen_junk at hotmail.com changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |RESOLVED
Resolution| |FIXED
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [PATCH 17/21] nano: bump to 2.2.5
From: Peter Korsgaard @ 2010-10-06 11:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1284864823-18993-18-git-send-email-Martin.Banky@gmail.com>
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit master 1/1] genext2fs: bump to 1.4.1
From: Peter Korsgaard @ 2010-10-06 11:38 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=285b8fe9047e64e0c63239d2b0b8c667936ca176
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 35 ++++++++++---------
...squash.patch => genext2fs-1.4.1-nosquash.patch} | 0
... => genext2fs-1.4.1-remove_ugly_warnings.patch} | 0
package/genext2fs/genext2fs.mk | 2 +-
4 files changed, 19 insertions(+), 18 deletions(-)
rename package/genext2fs/{genext2fs-1.4-nosquash.patch => genext2fs-1.4.1-nosquash.patch} (100%)
rename package/genext2fs/{genext2fs-1.4-remove_ugly_warnings.patch => genext2fs-1.4.1-remove_ugly_warnings.patch} (100%)
diff --git a/CHANGES b/CHANGES
index 1f80097..c2ab972 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,23 +27,24 @@
automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa,
bootutils, bridge-utils, bsdiff, busybox, cvs, dbus, dmraid,
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
- fconfig, ffmpeg, freetype, gadgetfs-test, gamin, gawk, gperf,
- gst-plugins-ugly, gtk2-themes, gtkperf, gvfs, haserl, hdparm,
- hostapd, hwdata, ifplugd, imagemagick, iperf, ipsec-tools,
- iproute2, iptables, iw, jpeg, kexec, kismet, less, libcgi,
- libcurl, libdaemon, libdnet, liberation, libevent, libeXosip2,
- libglade, libgtk2, libiconv, libidn, libintl, libmms, libnl,
- liboil, libosip2, libpcap, libpng, libtool, libungif, libxml2,
- libxslt, lighttpd, lite, lm-sensors, lockfile-progs,
- logrotate, m4, mdadm, mesa3d, metacity, mtd-utils,
- mysql_client, nano, nbd, ncftp, neon, netperf, netsnmp,
- ng-spice-rework, ntfsprogs, ntp, openntpd, openssh, openvpn,
- oprofile, pango, patch, pcre, php, pkg-config, prboom, radvd,
- rdesktop, ruby, qt, quagga, samba, sawman, sdl_mixer,
- sdl_sound, setserial, shared-mime-info, speex, sqlite,
- squashfs, strace, sylpheed, taglib, tcpdump, thttpd, tiff,
- tn5250, udev, udpcast, usbmount, usbutils, vsftpd, vtun,
- which, wpa_supplicant, xapp_twm, xapp_xbacklight,
+ fconfig, ffmpeg, freetype, gadgetfs-test, gamin, gawk,
+ genext2fs, gperf, gst-plugins-ugly, gtk2-themes, gtkperf,
+ gvfs, haserl, hdparm, hostapd, hwdata, ifplugd, imagemagick,
+ iperf, ipsec-tools, iproute2, iptables, iw, jpeg, kexec,
+ kismet, less, libcgi, libcurl, libdaemon, libdnet, liberation,
+ libevent, libeXosip2, libglade, libgtk2, libiconv, libidn,
+ libintl, libmms, libnl, liboil, libosip2, libpcap, libpng,
+ libtool, libungif, libxml2, libxslt, lighttpd, lite,
+ lm-sensors, lockfile-progs, logrotate, m4, mdadm, mesa3d,
+ metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon,
+ netperf, netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd,
+ openssh, openvpn, oprofile, pango, patch, pcre, php,
+ pkg-config, prboom, radvd, rdesktop, ruby, qt, quagga, samba,
+ sawman, sdl_mixer, sdl_sound, setserial, shared-mime-info,
+ speex, sqlite, squashfs, strace, sylpheed, taglib, tcpdump,
+ thttpd, tiff, tn5250, udev, udpcast, usbmount, usbutils,
+ vsftpd, vtun, which, wpa_supplicant, xapp_twm,
+ xapp_xbacklight,
xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},
xdriver-xf86-input-{mouse,synaptics,vmmouse,void},
xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev},
diff --git a/package/genext2fs/genext2fs-1.4-nosquash.patch b/package/genext2fs/genext2fs-1.4.1-nosquash.patch
similarity index 100%
rename from package/genext2fs/genext2fs-1.4-nosquash.patch
rename to package/genext2fs/genext2fs-1.4.1-nosquash.patch
diff --git a/package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch b/package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch
similarity index 100%
rename from package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch
rename to package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch
diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
index 8c4981e..b4a8e70 100644
--- a/package/genext2fs/genext2fs.mk
+++ b/package/genext2fs/genext2fs.mk
@@ -4,7 +4,7 @@
#
#############################################################
-GENEXT2FS_VERSION=1.4
+GENEXT2FS_VERSION=1.4.1
GENEXT2FS_SOURCE=genext2fs-$(GENEXT2FS_VERSION).tar.gz
GENEXT2FS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] nano: bump to 2.2.5
From: Peter Korsgaard @ 2010-10-06 11:38 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=475de409fd6ea4d55321edfcac8b142b7abb95d6
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/nano/nano.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index 47355a3..5e9824b 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -4,7 +4,7 @@
#
#############################################################
-NANO_VERSION = 2.2.3
+NANO_VERSION = 2.2.5
NANO_SITE = http://www.nano-editor.org/dist/v2.2
NANO_MAKE_ENV = CURSES_LIB="-lncurses"
NANO_CONF_OPT = --without-slang --enable-tiny
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 08/21] genext2fs: bump to 1.4.1
From: Peter Korsgaard @ 2010-10-06 11:39 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1284864823-18993-9-git-send-email-Martin.Banky@gmail.com>
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox