sysprof: bump version

And drop patches now upstream.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/sysprof/sysprof-01-define-NT_GNU_BUILD_ID.patch b/package/sysprof/sysprof-01-define-NT_GNU_BUILD_ID.patch
new file mode 100644 (file)
index 0000000..dcc2cbe
--- /dev/null
+++ b/package/sysprof/sysprof-01-define-NT_GNU_BUILD_ID.patch
@@ -0,0 +1,22 @@
+On uclibc elf.h does not have GNU extentions but we need this define
+so we define it locally if its not getting it from elf.h
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+Index: git/elfparser.h
+===================================================================
+--- git.orig/elfparser.h       2011-07-16 18:57:41.000000000 -0700
++++ git/elfparser.h    2011-07-16 20:28:54.733829895 -0700
+@@ -17,6 +17,10 @@
+  */
+ #include <glib.h>
+ 
++#ifndef NT_GNU_BUILD_ID
++#define NT_GNU_BUILD_ID 3
++#endif
++
+ typedef struct ElfSym ElfSym;
+ typedef struct ElfParser ElfParser;
+ 

diff --git a/package/sysprof/sysprof-01-fix-kernel-version-warning.patch b/package/sysprof/sysprof-01-fix-kernel-version-warning.patch
deleted file mode 100644 (file)
index 7b45b30..0000000
--- a/package/sysprof/sysprof-01-fix-kernel-version-warning.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6a5dfd385ca86b9e40b1a73237408f76b671b490 Mon Sep 17 00:00:00 2001
-From: Pauli Nieminen <suokkos@gmail.com>
-Date: Mon, 09 Apr 2012 18:12:59 +0000
-Subject: Don't complain about old kernel for 3.0+ kernels
-
-Linux kernel version received bump to 3.0 that causes configure to
-complain about older kernel. To avoid the warning configure needs to
-check major and minor versions before micro.
-
-Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
----
-diff --git a/configure.ac b/configure.ac
-index 34fdc43..e4f6d5d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -83,7 +83,7 @@ Makefile
- 
- AC_OUTPUT
- 
--if [[ $KMICRO -lt 31 ]] ; then
-+if [[ $KMAJOR -eq 2 -a $KMINOR -eq 6 -a $KMICRO -lt 31 ]] ; then
-    echo
-    echo "%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%"
-    echo "@"  
---
-cgit v0.9.0.2

diff --git a/package/sysprof/sysprof-02-define-NT_GNU_BUILD_ID.patch b/package/sysprof/sysprof-02-define-NT_GNU_BUILD_ID.patch
deleted file mode 100644 (file)
index dcc2cbe..0000000
--- a/package/sysprof/sysprof-02-define-NT_GNU_BUILD_ID.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-On uclibc elf.h does not have GNU extentions but we need this define
-so we define it locally if its not getting it from elf.h
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-
-Index: git/elfparser.h
-===================================================================
---- git.orig/elfparser.h       2011-07-16 18:57:41.000000000 -0700
-+++ git/elfparser.h    2011-07-16 20:28:54.733829895 -0700
-@@ -17,6 +17,10 @@
-  */
- #include <glib.h>
- 
-+#ifndef NT_GNU_BUILD_ID
-+#define NT_GNU_BUILD_ID 3
-+#endif
-+
- typedef struct ElfSym ElfSym;
- typedef struct ElfParser ElfParser;
- 

diff --git a/package/sysprof/sysprof-03-fix-powerpc-checks.patch b/package/sysprof/sysprof-03-fix-powerpc-checks.patch
deleted file mode 100644 (file)
index 8d69f74..0000000
--- a/package/sysprof/sysprof-03-fix-powerpc-checks.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4708a509aa9d65ae93e9824e42ddbc6e8d42d90c Mon Sep 17 00:00:00 2001
-From: Michel Dänzer <michel@daenzer.net>
-Date: Sat, 27 Aug 2011 18:04:44 +0000
-Subject: Fix PowerPC checks for __NR_perf_counter_open.
-
-__ppc__ isn't defined here on Debian powerpc. Grepping through the headers
-installed in /usr/include, there are a few references to __ppc__ and
-__ppc64__, but I suspect they're for other OSs.
-
-Signed-off-by: Michel Dänzer <michel@daenzer.net>
----
-diff --git a/collector.c b/collector.c
-index b28964f..fe16967 100644
---- a/collector.c
-+++ b/collector.c
-@@ -175,7 +175,7 @@ sysprof_perf_counter_open (struct perf_counter_attr *attr,
- #define __NR_perf_counter_open 337
- #elif defined(__hppa__)
- #define __NR_perf_counter_open 318
--#elif defined(__ppc__) || defined(__ppc64__)
-+#elif defined(__powerpc__) || defined(__powerpc64__)
- #define __NR_perf_counter_open 319
- #elif defined(__s390__)
- #define __NR_perf_counter_open 331
---
-cgit v0.9.0.2

diff --git a/package/sysprof/sysprof.mk b/package/sysprof/sysprof.mk
index f288aaf7cc76eaf7d0b4194df98d41d4082c4e53..4f6ed54ba81008312621909df751693026825b80 100644 (file)
--- a/package/sysprof/sysprof.mk
+++ b/package/sysprof/sysprof.mk
@@ -4,10 +4,9 @@
 #
 ################################################################################
 
-SYSPROF_VERSION = 1.1.8
+SYSPROF_VERSION = 1.2.0
 SYSPROF_SITE = http://sysprof.com
 SYSPROF_DEPENDENCIES = libglib2
-SYSPROF_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_SYSPROF_GUI),y)
 SYSPROF_DEPENDENCIES += libgtk2 libglade gdk-pixbuf