From patchwork Thu Jul 4 00:34:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gilles Talis X-Patchwork-Id: 256772 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id B6AB02C00AC for ; Thu, 4 Jul 2013 10:34:49 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 139A4A0206; Thu, 4 Jul 2013 00:34:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id osj9r9EGmWfb; Thu, 4 Jul 2013 00:34:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 21C9FA00E6; Thu, 4 Jul 2013 00:34:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3B1AD8F753 for ; Thu, 4 Jul 2013 00:34:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2093783EEA for ; Thu, 4 Jul 2013 00:34:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jZ3UHDQYpdWU for ; Thu, 4 Jul 2013 00:34:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pd0-f181.google.com (mail-pd0-f181.google.com [209.85.192.181]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4057B8BE7D for ; Thu, 4 Jul 2013 00:34:41 +0000 (UTC) Received: by mail-pd0-f181.google.com with SMTP id 14so571027pdj.12 for ; Wed, 03 Jul 2013 17:34:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=XRSlBMqGFfTfwIYy4nymSpDnlvXAY58X7frplK7hRzM=; b=u5juSAqyL+x0Fl1BChr+NXdZBgsOW5pQhzKNtu7bi9zDpfrgKG8posKlX04f6oXa9h w55O5VaMfGdEEZrkucYPgaWP4rlNdIIQLP0AcnKEFTbr/HiEu5ZelxvcpvKdMnNxaUXp wg/cra0Qm+GcWrRoShOwouSMOsC/opXRUesH87e439HaGYvC6USsxSMI1AXjo284+YOw bfoOl2ObqhJ3Up3AY28QyOlE10RZNfurroJGh0nkK9r4/WJyLuL3CRaXJoFyGF9mPrh0 rr4a6R4HNV9iAUpIRBmj9WUMpXXMCPU+VHIwc6oxvmJMpKszqcBe3HsVuXVm+y1QI6MN oThg== X-Received: by 10.66.156.132 with SMTP id we4mr4804392pab.28.1372898080958; Wed, 03 Jul 2013 17:34:40 -0700 (PDT) Received: from localhost.localdomain ([72.166.5.70]) by mx.google.com with ESMTPSA id pb5sm407701pbc.29.2013.07.03.17.34.40 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Jul 2013 17:34:40 -0700 (PDT) From: Gilles Talis To: buildroot@busybox.net Date: Wed, 3 Jul 2013 17:34:35 -0700 Message-Id: <1372898075-30947-1-git-send-email-gilles.talis@gmail.com> X-Mailer: git-send-email 1.7.4.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] fbgrab: bump to version 1.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Gilles Talis --- ...bgrab-proper-Makefile-for-cross-compiling.patch | 39 ++++++++++++++++++++ package/fbgrab/fbgrab-proper_makefile.patch | 23 ------------ package/fbgrab/fbgrab.mk | 4 +- 3 files changed, 41 insertions(+), 25 deletions(-) create mode 100644 package/fbgrab/fbgrab-proper-Makefile-for-cross-compiling.patch delete mode 100644 package/fbgrab/fbgrab-proper_makefile.patch diff --git a/package/fbgrab/fbgrab-proper-Makefile-for-cross-compiling.patch b/package/fbgrab/fbgrab-proper-Makefile-for-cross-compiling.patch new file mode 100644 index 0000000..a211774 --- /dev/null +++ b/package/fbgrab/fbgrab-proper-Makefile-for-cross-compiling.patch @@ -0,0 +1,39 @@ +From 2283817b9aed0b6228d0255d5aba7968379c9854 Mon Sep 17 00:00:00 2001 +From: Gilles Talis +Date: Wed, 3 Jul 2013 11:40:36 -0700 +Subject: [PATCH] fbgrab: A proper Makefile for cross compiling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Respect to the CC, CFLAGS and LDFLAGS is required for cross compiling in +Buildroot. And there's no need to run the source through splint. + +Reworked original patch from: Daniel Nyström + +Signed-off-by: Daniel Nyström +Signed-off-by: Gilles Talis +--- + Makefile | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index aae16e6..2d6b6fc 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,8 +3,10 @@ + ### modular. So this is a simple gnu Makefile... + ### + +-fbgrab: fbgrab.c +- gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab ++LDFLAGS += -lpng -lz ++ ++fbgrab: fbgrab.o ++ $(CC) $(LDFLAGS) fbgrab.o -o $@ + + install: + install fbgrab /usr/bin/fbgrab +-- +1.7.4.1 + diff --git a/package/fbgrab/fbgrab-proper_makefile.patch b/package/fbgrab/fbgrab-proper_makefile.patch deleted file mode 100644 index e907ed7..0000000 --- a/package/fbgrab/fbgrab-proper_makefile.patch +++ /dev/null @@ -1,23 +0,0 @@ -[PATCH] fbgrab: A proper Makefile for cross compiling - -Respect to the CC, CFLAGS and LDFLAGS is required for cross compiling in -Buildroot. And there's no need to run the source through splint. - -Signed-off-by: Daniel Nyström - ---- fbgrab-1.0.orig/Makefile 2010-12-07 22:57:24.000000000 +0100 -+++ fbgrab-1.0/Makefile 2010-12-07 22:58:36.000000000 +0100 -@@ -3,9 +3,10 @@ - ### modular. So this is a simple gnu Makefile... - ### - --fbgrab: fbgrab.c -- splint +posixlib fbgrab.c -- gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab -+LDFLAGS += -lpng -lz -+ -+fbgrab: fbgrab.o -+ $(CC) $(LDFLAGS) fbgrab.o -o $@ - - install: - strip fbgrab diff --git a/package/fbgrab/fbgrab.mk b/package/fbgrab/fbgrab.mk index 62539a8..b404c69 100644 --- a/package/fbgrab/fbgrab.mk +++ b/package/fbgrab/fbgrab.mk @@ -4,9 +4,9 @@ # ################################################################################ -FBGRAB_VERSION = 1.0 +FBGRAB_VERSION = 1.1 FBGRAB_SOURCE = fbgrab-$(FBGRAB_VERSION).tar.gz -FBGRAB_SITE = http://hem.bredband.net/gmogmo/fbgrab +FBGRAB_SITE = http://fbgrab.monells.se FBGRAB_DEPENDENCIES = libpng FBGRAB_LICENSE = GPLv2 FBGRAB_LICENSE_FILES = COPYING