Compare commits

...

29 Commits

Author SHA1 Message Date
Stephan Raue
690b76ee7e config/version: set version to 3.95.5
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-08 18:39:17 +02:00
Stephan Raue
ff6765de16 bcm2835-bootloader: update to bcm2835-bootloader-3ade415
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-08 17:55:28 +02:00
Stephan Raue
0368c98ae2 bcm2835-driver: update to bcm2835-driver-3ade415
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-08 17:55:28 +02:00
Stefan Saraev
24c8cea759 linux: pm: disable async suspend/resume by default
fixes some (not all) suspend/resume issues.
tested in irc by Desmoss900

ref #2862
2014-04-08 17:27:56 +02:00
Stephan Raue
2dbffe4a67 openssl: update to openssl-1.0.1g
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-08 17:27:56 +02:00
Stephan Raue
42c6fd2ed9 kmod: update to kmod-17
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-08 04:10:34 +02:00
Stephan Raue
7415fec141 pcre: update to pcre-8.35
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-08 04:10:33 +02:00
Stephan Raue
d218b9d9b5 linux: add patch to fix audio on AMD APUs, thanks to 'Anssi' and 'anykey_'
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-07 22:37:19 +02:00
Philippe Gaultier
06c4810f80 eventlircd: Add Igorplug USB support, this fixes #2716
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-07 22:37:19 +02:00
Stefan Saraev
36d116036c buildsys: cosmetics 2014-04-07 22:37:19 +02:00
Stephan Raue
ecd9d523a0 projects/RPi/options: add RTL8723AU driver support
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-07 22:37:19 +02:00
Stephan Raue
a54f4f5359 gcc: add patch to workaround aginst bug GCC-49423
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-07 22:37:19 +02:00
Stephan Raue
586296b91d make: update to make-4.0
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-07 22:37:19 +02:00
Stephan Raue
7215b3c422 simplejson: update to simplejson-3.4.0
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-07 22:37:18 +02:00
Stephan Raue
5d62ee13b8 busybox: add applet 'pgrep'
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-07 22:37:18 +02:00
Stephan Raue
02258e9790 sqlite: update to sqlite-autoconf-3080403
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-07 22:37:18 +02:00
Stefan Saraev
a566e7421b xf86-video-intel: dont install /usr/share/polkit 2014-04-07 18:56:00 +02:00
Stefan Saraev
ac2d229eac nano: dont install /usr/share/nano 2014-04-07 18:56:00 +02:00
fritsch
2e2a9e860c Linux (Radeon): Take care that post and ref divider don't grow too large 2014-04-07 18:46:34 +02:00
Stephan Raue
1ac36de7e1 xbmc: update to xbmc-13-ca6c289
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-05 20:23:11 +02:00
Stephan Raue
9ced960bd2 xbmc: add PR4489
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-05 18:54:21 +02:00
Stephan Raue
97230bafa8 curl: update to curl-7.36.0
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-05 18:54:21 +02:00
Stephan Raue
9eb6834a85 curl: downgrade to curl-7.34.0, add notes about recent releases
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-05 18:54:21 +02:00
Stephan Raue
67bad75f60 gmp: update to gmp-6.0.0a
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-05 18:54:21 +02:00
Stephan Raue
edf58f7c3e xbmc: add PR4519
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-05 18:54:21 +02:00
Stephan Raue
f99f986d5d xbmc: add PR4518
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-05 18:54:21 +02:00
Stephan Raue
f37e08a901 libass: update to libass-0.11.1
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-05 18:54:21 +02:00
Stephan Raue
bba617498f Revert "libass: add some notes for newer releases"
This reverts commit 960b3b57e2.
2014-04-05 18:54:21 +02:00
Stephan Raue
64de652b3d config/version: set version back to devel
Signed-off-by: Stephan Raue <stephan@openelec.tv>
2014-04-04 22:35:54 +02:00
43 changed files with 450 additions and 1013 deletions

View File

@@ -1,5 +1,5 @@
# VERSION: set full version, use "devel" for development version
OPENELEC_VERSION="3.95.4"
OPENELEC_VERSION="3.95.5"
# OS_VERSION: OS Version
OS_VERSION="4.0"

View File

@@ -17,7 +17,7 @@
################################################################################
PKG_NAME="sqlite"
PKG_VERSION="autoconf-3080402"
PKG_VERSION="autoconf-3080403"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="PublicDomain"

View File

@@ -17,12 +17,13 @@
################################################################################
PKG_NAME="gmp"
PKG_VERSION="5.1.3"
PKG_VERSION="6.0.0a"
PKG_SOURCE_DIR="$PKG_NAME-6.0.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"
PKG_LICENSE="LGPLv3+"
PKG_SITE="http://gmplib.org/"
PKG_URL="ftp://ftp.gmplib.org/pub/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_URL="https://gmplib.org/download/gmp/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_HOST="ccache:host"
PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"

View File

@@ -0,0 +1,21 @@
# HG changeset patch
# User Torbjorn Granlund <tege@gmplib.org>
# Date 1396035313 -3600
# Node ID c56ea318eb6435bdd28dbfef657b2fe372134f1f
# Parent c6fe20ab62acc266ff5ad3629bef447bc43dcd1b
Conditionalise ARM asm on !__thumb__.
diff -r c6fe20ab62ac -r c56ea318eb64 mpn/generic/mod_1_1.c
--- a/mpn/generic/mod_1_1.c Wed Mar 26 12:58:33 2014 +0100
+++ b/mpn/generic/mod_1_1.c Fri Mar 28 20:35:13 2014 +0100
@@ -129,7 +129,7 @@
"%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC)
#endif
-#if defined (__arm__) && W_TYPE_SIZE == 32
+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
#define add_mssaaaa(m, sh, sl, ah, al, bh, bl) \
__asm__ ( "adds %2, %5, %6\n\t" \
"adcs %1, %3, %4\n\t" \

View File

@@ -0,0 +1,21 @@
# HG changeset patch
# User Torbjorn Granlund <tege@gmplib.org>
# Date 1396602422 -7200
# Node ID 676e2d0f0e4dd301a7066079d2c9326c25c34a40
# Parent 0194a75b56b21a9196626430af86c5bd9110c42d
Conditionalise ARM asm on !__thumb__.
diff -r 0194a75b56b2 -r 676e2d0f0e4d mpn/generic/div_qr_1n_pi1.c
--- a/mpn/generic/div_qr_1n_pi1.c Thu Apr 03 23:58:51 2014 +0200
+++ b/mpn/generic/div_qr_1n_pi1.c Fri Apr 04 11:07:02 2014 +0200
@@ -130,7 +130,7 @@
"%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC)
#endif
-#if defined (__arm__) && W_TYPE_SIZE == 32
+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
#define add_mssaaaa(m, sh, sl, ah, al, bh, bl) \
__asm__ ( "adds %2, %5, %6\n\t" \
"adcs %1, %3, %4\n\t" \

View File

@@ -17,7 +17,7 @@
################################################################################
PKG_NAME="make"
PKG_VERSION="3.82"
PKG_VERSION="4.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@@ -1,26 +0,0 @@
diff -up make-3.82/main.c\~ make-3.82/main.c
--- make-3.82/main.c~ 2010-07-19 09:10:53.000000000 +0200
+++ make-3.82/main.c 2010-08-11 15:12:09.000000000 +0200
@@ -1765,6 +1765,20 @@ main (int argc, char **argv, char **envp
}
}
+#ifdef PIPE_BUF
+ if (job_slots > PIPE_BUF)
+#elif defined _POSIX_PIPE_BUF
+ if (job_slots > _POSIX_PIPE_BUF)
+#else
+ if (job_slots > 512)
+#endif
+ {
+ error (NILF,
+ _("More parallel jobs (-jN) than this platform can handle requested."));
+ error (NILF, _("Resetting to single job (-j1) mode."));
+ job_slots = 1;
+ }
+
/* If we have >1 slot but no jobserver-fds, then we're a top-level make.
Set up the pipe and install the fds option for our children. */
Diff finished. Wed Aug 11 15:12:32 2010

View File

@@ -1,14 +0,0 @@
diff -up make-3.82/make.h\~ make-3.82/make.h
--- make-3.82/make.h~ 2010-07-20 15:12:06.000000000 +0200
+++ make-3.82/make.h 2010-08-11 15:19:09.000000000 +0200
@@ -472,7 +472,7 @@ long int lseek ();
#endif /* Not GNU C library or POSIX. */
#ifdef HAVE_GETCWD
-# if !defined(VMS) && !defined(__DECC)
+# if !defined(VMS) && !defined(__DECC) && !defined(getcwd)
char *getcwd ();
# endif
#else
Diff finished. Wed Aug 11 15:19:12 2010

View File

@@ -1,157 +0,0 @@
diff -urp make-3.82/misc.c make-3.82-pm/misc.c
--- make-3.82/misc.c 2010-07-19 09:10:54.000000000 +0200
+++ make-3.82-pm/misc.c 2010-08-11 15:26:45.000000000 +0200
@@ -342,17 +342,31 @@ strerror (int errnum)
/* Print an error message from errno. */
void
+perror_with_name_err (const char *str, const char *name, int errnum)
+{
+ error (NILF, _("%s%s: %s"), str, name, strerror (errnum));
+}
+
+void
perror_with_name (const char *str, const char *name)
{
- error (NILF, _("%s%s: %s"), str, name, strerror (errno));
+ perror_with_name_err (str, name, errno);
}
/* Print an error message from errno and exit. */
void
+pfatal_with_name_err (const char *name, int errnum)
+{
+ fatal (NILF, _("%s: %s"), name, strerror (errnum));
+
+ /* NOTREACHED */
+}
+
+void
pfatal_with_name (const char *name)
{
- fatal (NILF, _("%s: %s"), name, strerror (errno));
+ pfatal_with_name_err (name, errno);
/* NOTREACHED */
}
diff -urp make-3.82/main.c make-3.82-pm/main.c
--- make-3.82/main.c 2010-08-11 15:34:12.000000000 +0200
+++ make-3.82-pm/main.c 2010-08-11 15:30:11.000000000 +0200
@@ -1536,13 +1536,13 @@ main (int argc, char **argv, char **envp
strcat (template, DEFAULT_TMPFILE);
outfile = open_tmpfile (&stdin_nm, template);
if (outfile == 0)
- pfatal_with_name (_("fopen (temporary file)"));
+ pfatal_with_name_err (_("fopen (temporary file)"), errno);
while (!feof (stdin) && ! ferror (stdin))
{
char buf[2048];
unsigned int n = fread (buf, 1, sizeof (buf), stdin);
if (n > 0 && fwrite (buf, 1, n, outfile) != n)
- pfatal_with_name (_("fwrite (temporary file)"));
+ pfatal_with_name_err (_("fwrite (temporary file)"), errno);
}
fclose (outfile);
@@ -1747,7 +1747,7 @@ main (int argc, char **argv, char **envp
else if ((job_rfd = dup (job_fds[0])) < 0)
{
if (errno != EBADF)
- pfatal_with_name (_("dup jobserver"));
+ pfatal_with_name_err (_("dup jobserver"), errno);
error (NILF,
_("warning: jobserver unavailable: using -j1. Add `+' to parent make rule."));
@@ -1788,7 +1788,7 @@ main (int argc, char **argv, char **envp
char c = '+';
if (pipe (job_fds) < 0 || (job_rfd = dup (job_fds[0])) < 0)
- pfatal_with_name (_("creating jobs pipe"));
+ pfatal_with_name_err (_("creating jobs pipe"), errno);
/* Every make assumes that it always has one job it can run. For the
submakes it's the token they were given by their parent. For the
@@ -1803,7 +1803,7 @@ main (int argc, char **argv, char **envp
EINTRLOOP (r, write (job_fds[1], &c, 1));
if (r != 1)
- pfatal_with_name (_("init jobserver pipe"));
+ pfatal_with_name_err (_("init jobserver pipe"), errno);
}
/* Fill in the jobserver_fds struct for our children. */
@@ -2226,7 +2226,7 @@ main (int argc, char **argv, char **envp
/* If there is a temp file from reading a makefile from stdin, get rid of
it now. */
if (stdin_nm && unlink (stdin_nm) < 0 && errno != ENOENT)
- perror_with_name (_("unlink (temporary file): "), stdin_nm);
+ perror_with_name_err (_("unlink (temporary file): "), stdin_nm, errno);
/* If there were no command-line goals, use the default. */
if (goals == 0)
Только в make-3.82-pm: job.c~
Только в make-3.82-pm: main.c~
diff -urp make-3.82/make.h make-3.82-pm/make.h
--- make-3.82/make.h 2010-08-11 15:34:12.000000000 +0200
+++ make-3.82-pm/make.h 2010-08-11 15:31:26.000000000 +0200
@@ -385,6 +385,8 @@ void die (int) __attribute__ ((noreturn)
void log_working_directory (int);
void pfatal_with_name (const char *) __attribute__ ((noreturn));
void perror_with_name (const char *, const char *);
+void pfatal_with_name_err (const char *, int errnum) __attribute__ ((noreturn));
+void perror_with_name_err (const char *, const char *, int errnum);
void *xmalloc (unsigned int);
void *xcalloc (unsigned int);
void *xrealloc (void *, unsigned int);
diff -urp make-3.82/job.c make-3.82-pm/job.c
--- make-3.82/job.c 2010-07-24 10:27:50.000000000 +0200
+++ make-3.82-pm/job.c 2010-08-11 15:33:54.000000000 +0200
@@ -917,7 +917,7 @@ free_child (struct child *child)
EINTRLOOP (r, write (job_fds[1], &token, 1));
if (r != 1)
- pfatal_with_name (_("write jobserver"));
+ pfatal_with_name_err (_("write jobserver"), errno);
DB (DB_JOBS, (_("Released token for child %p (%s).\n"),
child, child->file->name));
@@ -1768,6 +1768,7 @@ new_job (struct file *file)
/* Set interruptible system calls, and read() for a job token. */
set_child_handler_action_flags (1, waiting_jobs != NULL);
+ errno = 0;
got_token = read (job_rfd, &token, 1);
saved_errno = errno;
set_child_handler_action_flags (0, waiting_jobs != NULL);
@@ -1782,10 +1783,14 @@ new_job (struct file *file)
/* If the error _wasn't_ expected (EINTR or EBADF), punt. Otherwise,
go back and reap_children(), and try again. */
- errno = saved_errno;
- if (errno != EINTR && errno != EBADF)
- pfatal_with_name (_("read jobs pipe"));
- if (errno == EBADF)
+ if (saved_errno != EINTR && saved_errno != EBADF)
+ {
+ if (got_token == 0)
+ fatal (NILF, _("read jobs pipe EOF"));
+ else
+ pfatal_with_name_err (_("read jobs pipe"), saved_errno);
+ }
+ if (saved_errno == EBADF)
DB (DB_JOBS, ("Read returned EBADF.\n"));
}
#endif
@@ -1909,7 +1914,8 @@ load_too_high (void)
error (NILF,
_("cannot enforce load limits on this operating system"));
else
- perror_with_name (_("cannot enforce load limit: "), "getloadavg");
+ perror_with_name_err (_("cannot enforce load limit: "),
+ "getloadavg", errno);
}
lossage = errno;
load = 0;
Только в make-3.82-pm: make.h~
Только в make-3.82-pm: misc.c.orig

View File

@@ -1,30 +0,0 @@
diff -up make-3.82/job.c\~ make-3.82/job.c
--- make-3.82/job.c~ 2010-08-12 14:57:15.000000000 +0200
+++ make-3.82/job.c 2010-08-12 14:58:23.000000000 +0200
@@ -2876,7 +2876,7 @@ construct_command_argv_internal (char *l
}
new_line = alloca (shell_len + 1 + sflags_len + 1
- + (line_len*2) + 1);
+ + (line_len*4) + 1);
ap = new_line;
memcpy (ap, shell, shell_len);
ap += shell_len;
@@ -2904,13 +2904,14 @@ construct_command_argv_internal (char *l
#endif
if (PRESERVE_BSNL)
{
- *(ap++) = '\\';
+ *(ap++) = '\'';
/* Only non-batch execution needs another backslash,
because it will be passed through a recursive
invocation of this function. */
if (!batch_mode_shell)
*(ap++) = '\\';
*(ap++) = '\n';
+ *(ap++) = '\'';
}
++p;
continue;
Diff finished. Thu Aug 12 14:58:34 2010

View File

@@ -1,19 +0,0 @@
diff -up make-3.82/main.c\~ make-3.82/main.c
--- make-3.82/main.c~ 2010-08-12 14:59:20.000000000 +0200
+++ make-3.82/main.c 2010-08-12 15:00:07.000000000 +0200
@@ -1756,8 +1756,11 @@ main (int argc, char **argv, char **envp
if (job_slots > 0)
{
- close (job_fds[0]);
- close (job_fds[1]);
+ if (restarts == 0)
+ {
+ close (job_fds[0]);
+ close (job_fds[1]);
+ }
job_fds[0] = job_fds[1] = -1;
free (jobserver_fds->list);
free (jobserver_fds);
Diff finished. Thu Aug 12 15:00:22 2010

View File

@@ -1,250 +0,0 @@
diff -urpN make/ChangeLog make-new/ChangeLog
--- make/ChangeLog 2010-09-13 13:42:35.000000000 +0200
+++ make-new/ChangeLog 2010-09-13 13:42:09.000000000 +0200
@@ -1,3 +1,22 @@
+2010-08-13 Paul Smith <psmith@gnu.org>
+
+ * NEWS: Accidentally forgot to back out the sorted wildcard
+ enhancement in 3.82, so update NEWS.
+ Also add NEWS about the error check for explicit and pattern
+ targets in the same rule, added to 3.82.
+
+ * main.c (main): Add "oneshell" to $(.FEATURES) (forgot to add
+ this in 3.82!)
+
+ * read.c (parse_file_seq): Fix various errors parsing archives
+ with multiple objects in the parenthesis, as well as wildcards.
+ Fixes Savannah bug #30612.
+
+2010-08-10 Paul Smith <psmith@gnu.org>
+
+ * main.c (main): Expand MAKEFLAGS before adding it to the
+ environment when re-exec'ing. Fixes Savannah bug #30723.
+
2010-07-28 Paul Smith <psmith@gnu.org>
Version 3.82 released.
diff -urpN make/main.c make-new/main.c
--- make/main.c 2010-09-13 13:42:35.000000000 +0200
+++ make-new/main.c 2010-09-13 13:42:12.000000000 +0200
@@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp
a macro and some compilers (MSVC) don't like conditionals in macros. */
{
const char *features = "target-specific order-only second-expansion"
- " else-if shortest-stem undefine"
+ " else-if shortest-stem undefine oneshell"
#ifndef NO_ARCHIVES
" archives"
#endif
@@ -2093,7 +2093,7 @@ main (int argc, char **argv, char **envp
const char *pv = define_makeflags (1, 1);
char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
sprintf (p, "MAKEFLAGS=%s", pv);
- putenv (p);
+ putenv (allocated_variable_expand (p));
}
if (ISDB (DB_BASIC))
diff -urpN make/NEWS make-new/NEWS
--- make/NEWS 2010-09-13 13:42:35.000000000 +0200
+++ make-new/NEWS 2010-09-13 13:42:11.000000000 +0200
@@ -18,14 +18,6 @@ http://sv.gnu.org/bugs/index.php?group=m
* Compiling GNU make now requires a conforming ISO C 1989 compiler and
standard runtime library.
-* WARNING: Future backward-incompatibility!
- Wildcards are not documented as returning sorted values, but up to and
- including this release the results have been sorted and some makefiles are
- apparently depending on that. In the next release of GNU make, for
- performance reasons, we may remove that sorting. If your makefiles
- require sorted results from wildcard expansions, use the $(sort ...)
- function to request it explicitly.
-
* WARNING: Backward-incompatibility!
The POSIX standard for make was changed in the 2008 version in a
fundamentally incompatible way: make is required to invoke the shell as if
@@ -42,6 +34,21 @@ http://sv.gnu.org/bugs/index.php?group=m
existing targets were provided in $?).
* WARNING: Backward-incompatibility!
+ Wildcards were not documented as returning sorted values, but the results
+ have been sorted up until this release.. If your makefiles require sorted
+ results from wildcard expansions, use the $(sort ...) function to request
+ it explicitly.
+
+* WARNING: Backward-incompatibility!
+ In previous versions of make it was acceptable to list one or more explicit
+ targets followed by one or more pattern targets in the same rule and it
+ worked "as expected". However, this was not documented as acceptable and if
+ you listed any explicit targets AFTER the pattern targets, the entire rule
+ would be mis-parsed. This release removes this ability completely: make
+ will generate an error message if you mix explicit and pattern targets in
+ the same rule.
+
+* WARNING: Backward-incompatibility!
As a result of parser enhancements, three backward-compatibility issues
exist: first, a prerequisite containing an "=" cannot be escaped with a
backslash any longer. You must create a variable containing an "=" and
diff -urpN make/read.c make-new/read.c
--- make/read.c 2010-09-13 13:42:35.000000000 +0200
+++ make-new/read.c 2010-09-13 13:42:11.000000000 +0200
@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned
{
/* This looks like the first element in an open archive group.
A valid group MUST have ')' as the last character. */
- const char *e = p + nlen;
+ const char *e = p;
do
{
e = next_token (e);
@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned
Go to the next item in the string. */
if (flags & PARSEFS_NOGLOB)
{
- NEWELT (concat (2, prefix, tp));
+ NEWELT (concat (2, prefix, tmpbuf));
continue;
}
/* If we get here we know we're doing glob expansion.
TP is a string in tmpbuf. NLEN is no longer used.
We may need to do more work: after this NAME will be set. */
- name = tp;
+ name = tmpbuf;
/* Expand tilde if applicable. */
- if (tp[0] == '~')
+ if (tmpbuf[0] == '~')
{
- tildep = tilde_expand (tp);
+ tildep = tilde_expand (tmpbuf);
if (tildep != 0)
name = tildep;
}
@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned
else
{
/* We got a chain of items. Attach them. */
- (*newp)->next = found;
+ if (*newp)
+ (*newp)->next = found;
+ else
+ *newp = found;
/* Find and set the new end. Massage names if necessary. */
while (1)
diff -urpN make/tests/ChangeLog make-new/tests/ChangeLog
--- make/tests/ChangeLog 2010-09-13 13:42:35.000000000 +0200
+++ make-new/tests/ChangeLog 2010-09-13 13:42:10.000000000 +0200
@@ -1,3 +1,16 @@
+2010-08-13 Paul Smith <psmith@gnu.org>
+
+ * scripts/features/archives: New regression tests for archive
+ support. Test for fix to Savannah bug #30612.
+
+ * run_make_tests.pl (set_more_defaults): Set a %FEATURES hash to
+ the features available in $(.FEATURES).
+
+2010-08-10 Paul Smith <psmith@gnu.org>
+
+ * scripts/features/reinvoke: Ensure command line variable settings
+ are preserved across make re-exec. Tests Savannah bug #30723.
+
2010-07-28 Paul Smith <psmith@gnu.org>
* scripts/targets/POSIX: Compatibility issues with Solaris (and
diff -urpN make/tests/run_make_tests.pl make-new/tests/run_make_tests.pl
--- make/tests/run_make_tests.pl 2010-09-13 13:42:35.000000000 +0200
+++ make-new/tests/run_make_tests.pl 2010-09-13 13:42:10.000000000 +0200
@@ -29,6 +29,7 @@
# You should have received a copy of the GNU General Public License along with
# this program. If not, see <http://www.gnu.org/licenses/>.
+%FEATURES = ();
$valgrind = 0; # invoke make with valgrind
$valgrind_args = '';
@@ -367,6 +368,8 @@ sub set_more_defaults
$parallel_jobs = 1;
}
+ %FEATURES = map { $_ => 1 } split /\s+/, `sh -c "echo '\\\$(info \\\$(.FEATURES))' | $make_path -f- 2>/dev/null"`;
+
# Set up for valgrind, if requested.
if ($valgrind) {
diff -urpN make/tests/scripts/features/archives make-new/tests/scripts/features/archives
--- make/tests/scripts/features/archives 1970-01-01 01:00:00.000000000 +0100
+++ make-new/tests/scripts/features/archives 2010-09-13 13:42:10.000000000 +0200
@@ -0,0 +1,42 @@
+# -*-mode: perl-*-
+
+$description = "Test GNU make's archive management features.";
+
+$details = "\
+This only works on systems that support it.";
+
+# If this instance of make doesn't support archives, skip it
+exists $FEATURES{archives} or return -1;
+
+# Create some .o files to work with
+utouch(-60, qw(a1.o a2.o a3.o));
+
+# Very simple
+run_make_test('all: libxx.a(a1.o)',
+ '', "ar rv libxx.a a1.o\nar: creating libxx.a\na - a1.o\n");
+
+# Multiple .o's. Add a new one to the existing library
+run_make_test('all: libxx.a(a1.o a2.o)',
+ '', "ar rv libxx.a a2.o\na - a2.o\n");
+
+# Touch one of the .o's so it's rebuilt
+utouch(-40, 'a1.o');
+run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n");
+
+# Use wildcards
+run_make_test('all: libxx.a(*.o)',
+ '', "#MAKE#: Nothing to be done for `all'.\n");
+
+# Touch one of the .o's so it's rebuilt
+utouch(-30, 'a1.o');
+run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n");
+
+# Use both wildcards and simple names
+utouch(-50, 'a2.o');
+run_make_test('all: libxx.a(a3.o *.o)', '',
+ "ar rv libxx.a a3.o\na - a3.o\nar rv libxx.a a2.o\nr - a2.o\n");
+
+rmfiles(qw(a1.o a2.o a3.o libxx.a));
+
+# This tells the test driver that the perl test script executed properly.
+1;
diff -urpN make/tests/scripts/features/reinvoke make-new/tests/scripts/features/reinvoke
--- make/tests/scripts/features/reinvoke 2010-09-13 13:42:35.000000000 +0200
+++ make-new/tests/scripts/features/reinvoke 2010-09-13 13:42:10.000000000 +0200
@@ -57,9 +57,24 @@ include $(F)',
# Now try with the file we're not updating being the actual file we're
# including: this and the previous one test different parts of the code.
-run_make_test(undef, "F=b", "[ -f b ] || echo >> b\nhello\n")
+run_make_test(undef, 'F=b', "[ -f b ] || echo >> b\nhello\n")
&rmfiles('a','b','c');
+# Ensure command line variables are preserved properly across re-exec
+# Tests for Savannah bug #30723
+
+run_make_test('
+ifdef RECURSE
+-include foo30723
+endif
+recurse: ; @$(MAKE) -f $(MAKEFILE_LIST) RECURSE=1 test
+test: ; @echo F.O=$(F.O)
+foo30723: ; @touch $@
+',
+ '--no-print-directory F.O=bar', "F.O=bar\n");
+
+unlink('foo30723');
+
# This tells the test driver that the perl test script executed properly.
1;

View File

@@ -1,22 +0,0 @@
diff -urp make-3.82/function.c make-3.82-pm/function.c
--- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200
+++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200
@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c
{
char c = *(t++);
- if (! isspace ((unsigned char)c))
+ if (! isblank ((unsigned char)c))
continue;
++wordi;
- while (isspace ((unsigned char)*t))
+ while (isblank ((unsigned char)*t))
++t;
}
Только в make-3.82-pm: function.c~
Двоичные файлы make-3.82/function.o и make-3.82-pm/function.o различаются
Двоичные файлы make-3.82/make и make-3.82-pm/make различаются
Только в make-3.82-pm: misc.c~

View File

@@ -1,77 +0,0 @@
From 2f661dc20617ba6fdeb2d7e243dc898653faafea Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Tue, 26 Apr 2011 21:50:26 +0200
Subject: [PATCH] Always copy the string before expanding it
It might get freed during expansion, e.g. with eval function.
A simple reproducer:
TRUE = $(eval TRUE := true)
all:
$(TRUE)
---
ChangeLog | 5 +++++
expand.c | 18 +++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 91878fb..7519164 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-26 Lubomir Rintel <lkundrak@v3.sk>
+
+ * expand.c (variable_expand_string): Always copy the string
+ to expand.
+
2010-08-13 Paul Smith <psmith@gnu.org>
* NEWS: Accidentally forgot to back out the sorted wildcard
diff --git a/expand.c b/expand.c
index 2315b06..3e6e346 100644
--- a/expand.c
+++ b/expand.c
@@ -197,7 +197,7 @@ variable_expand_string (char *line, const char *string, long length)
{
struct variable *v;
const char *p, *p1;
- char *abuf = NULL;
+ char *abuf;
char *o;
unsigned int line_offset;
@@ -214,14 +214,15 @@ variable_expand_string (char *line, const char *string, long length)
/* If we want a subset of the string, allocate a temporary buffer for it.
Most of the functions we use here don't work with length limits. */
- if (length > 0 && string[length] != '\0')
+ if (length == -1)
{
- abuf = xmalloc(length+1);
- memcpy(abuf, string, length);
- abuf[length] = '\0';
- string = abuf;
+ length = strlen (string);
}
- p = string;
+
+ abuf = xmalloc(length+1);
+ memcpy(abuf, string, length);
+ abuf[length] = '\0';
+ p = abuf;
while (1)
{
@@ -411,8 +412,7 @@ variable_expand_string (char *line, const char *string, long length)
++p;
}
- if (abuf)
- free (abuf);
+ free (abuf);
variable_buffer_output (o, "", 1);
return (variable_buffer + line_offset);
--
1.7.4.1

View File

@@ -1,30 +0,0 @@
Index: main.c
===================================================================
RCS file: /sources/make/make/main.c,v
retrieving revision 1.247
retrieving revision 1.246
diff -u -r1.247 -r1.246
--- a/main.c 18 Sep 2011 23:39:26 -0000 1.247
+++ b/main.c 29 Aug 2010 23:05:27 -0000 1.246
@@ -2089,6 +2089,11 @@
++restarts;
+ /* If we're re-exec'ing the first make, put back the number of
+ job slots so define_makefiles() will get it right. */
+ if (master_job_slots)
+ job_slots = master_job_slots;
+
/* Reset makeflags in case they were changed. */
{
const char *pv = define_makeflags (1, 1);
@@ -2830,9 +2825,6 @@
&& (*(unsigned int *) cs->value_ptr ==
*(unsigned int *) cs->noarg_value))
ADD_FLAG ("", 0); /* Optional value omitted; see below. */
- else if (cs->c == 'j')
- /* Special case for `-j'. */
- ADD_FLAG ("1", 1);
else
{
char *buf = alloca (30);

View File

@@ -1,84 +0,0 @@
diff --git a/function.c b/function.c
index e2f6c8c..ff0527f 100644
--- a/function.c
+++ b/function.c
@@ -2333,8 +2333,10 @@ func_call (char *o, char **argv, const char *funcname UNUSED)
v = lookup_variable (fname, flen);
if (v == 0)
- warn_undefined (fname, flen);
-
+ {
+ warn_undefined (fname, flen);
+ warn_undefined_function (fname, flen);
+ }
if (v == 0 || *v->value == '\0')
return o;
diff --git a/main.c b/main.c
index c6989e3..2f545a7 100644
--- a/main.c
+++ b/main.c
@@ -275,6 +275,11 @@ static int print_usage_flag = 0;
int warn_undefined_variables_flag;
+/* If nonzero, we should print a warning message
+ for each attemtp to call an undefined user function. */
+
+int warn_undefined_functions_flag;
+
/* If nonzero, always build all targets, regardless of whether
they appear out of date or not. */
@@ -368,6 +373,8 @@ static const char *const usage[] =
Consider FILE to be infinitely new.\n"),
N_("\
--warn-undefined-variables Warn when an undefined variable is referenced.\n"),
+ N_("\
+ --warn-undefined-functions Warn when an undefined user function is called.\n"),
NULL
};
@@ -424,6 +431,8 @@ static const struct command_switch switches[] =
{ CHAR_MAX+5, flag, &warn_undefined_variables_flag, 1, 1, 0, 0, 0,
"warn-undefined-variables" },
{ CHAR_MAX+6, string, &eval_strings, 1, 0, 0, 0, 0, "eval" },
+ { CHAR_MAX+7, flag, &warn_undefined_functions_flag, 1, 1, 0, 0, 0,
+ "warn-undefined-functions" },
{ 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
diff --git a/make.h b/make.h
index 60ade4c..f2ebb56 100644
--- a/make.h
+++ b/make.h
@@ -513,7 +513,7 @@ extern int env_overrides, no_builtin_rules_flag, no_builtin_variables_flag;
extern int print_version_flag, print_directory_flag, check_symlink_flag;
extern int warn_undefined_variables_flag, posix_pedantic, not_parallel;
extern int second_expansion, clock_skew_detected, rebuilding_makefiles;
-extern int one_shell;
+extern int one_shell, warn_undefined_functions_flag;
/* can we run commands via 'sh -c xxx' or must we use batch files? */
extern int batch_mode_shell;
diff --git a/variable.h b/variable.h
index c215867..02713c1 100644
--- a/variable.h
+++ b/variable.h
@@ -220,6 +220,13 @@ void undefine_variable_in_set (const char *name, unsigned int length,
(int)(l), (n)); \
}while(0)
+#define warn_undefined_function(n,l) do{\
+ if (warn_undefined_functions_flag) \
+ error (reading_file, \
+ _("warning: undefined function `%.*s'"), \
+ (int)(l), (n)); \
+ }while(0)
+
char **target_environment (struct file *file);
struct pattern_var *create_pattern_var (const char *target,
--
cgit v0.9.0.2-2-gbebe

View File

@@ -1,111 +0,0 @@
This patch add the support for --debug=c and --debug=e to make
this option when activated will trace in stdout the activity of $(call and $(eval in the Makefile
The trace use the format:
### xxx -->
### xxx <--
the number of space before ### is at least 1 and increase with the nesting of eval/call
usage: make --debug=c,e
diff -r -u make-3.82/debug.h make-3.82-lo_trace/debug.h
--- make-3.82/debug.h 2010-07-12 20:20:38.000000000 -0500
+++ make-3.82-lo_trace/debug.h 2011-06-22 12:06:37.000000000 -0500
@@ -21,6 +21,8 @@
#define DB_JOBS (0x004)
#define DB_IMPLICIT (0x008)
#define DB_MAKEFILES (0x100)
+#define DB_CALL (0x01000)
+#define DB_EVAL (0x02000)
#define DB_ALL (0xfff)
diff -r -u make-3.82/function.c make-3.82-lo_trace/function.c
--- make-3.82/function.c 2011-06-23 01:01:35.000000000 -0500
+++ make-3.82-lo_trace/function.c 2011-06-23 01:40:05.000000000 -0500
@@ -28,6 +28,8 @@
#include "amiga.h"
#endif
+static int depth = 0;
+
struct function_table_entry
{
@@ -1371,7 +1373,12 @@
install_variable_buffer (&buf, &len);
+ depth += 1;
+ DBS( DB_EVAL, ("### eval -->\n"));
+ DB( DB_EVAL, ("%s\n", argv[0]));
eval_buffer (argv[0]);
+ DBS( DB_EVAL, ("### eval <--\n"));
+ depth -= 1;
restore_variable_buffer (buf, len);
@@ -2338,6 +2345,7 @@
if (v == 0 || *v->value == '\0')
return o;
+ depth += 1;
body = alloca (flen + 4);
body[0] = '$';
body[1] = '(';
@@ -2345,6 +2353,7 @@
body[flen+2] = ')';
body[flen+3] = '\0';
+ DBS(DB_CALL, ("### call %s -->\n", body));
/* Set up arguments $(1) .. $(N). $(0) is the function name. */
push_new_variable_scope ();
@@ -2354,6 +2363,7 @@
char num[11];
sprintf (num, "%d", i);
+ DBS(DB_CALL, ("### arg %i for call %s is '%s'\n", i, body, *argv));
define_variable (num, strlen (num), *argv, o_automatic, 0);
}
@@ -2367,6 +2377,7 @@
char num[11];
sprintf (num, "%d", i);
+ DBS(DB_CALL, ("### arg %i for call %s is implicit\n", i, body));
define_variable (num, strlen (num), "", o_automatic, 0);
}
@@ -2377,7 +2388,14 @@
saved_args = max_args;
max_args = i;
+
o = variable_expand_string (o, body, flen+3);
+ DBS(DB_CALL, ("### call to %s expended into\n", body));
+ DB(DB_CALL, ("%s\n", o));
+ DBS(DB_CALL, ("### call %s <--\n", body));
+
+ depth -= 1;
+
max_args = saved_args;
v->exp_count = 0;
diff -r -u make-3.82/main.c make-3.82-lo_trace/main.c
--- make-3.82/main.c 2010-07-19 02:10:53.000000000 -0500
+++ make-3.82-lo_trace/main.c 2011-06-22 11:46:39.000000000 -0500
@@ -634,6 +634,12 @@
case 'b':
db_level |= DB_BASIC;
break;
+ case 'c':
+ db_level |= DB_CALL;
+ break;
+ case 'e':
+ db_level |= DB_EVAL;
+ break;
case 'i':
db_level |= DB_BASIC | DB_IMPLICIT;
break;

View File

@@ -1,116 +0,0 @@
Index: read.c
===================================================================
RCS file: /sources/make/make/read.c,v
retrieving revision 1.198
retrieving revision 1.200
diff -u -r1.198 -r1.200
--- a/read.c 29 Apr 2011 15:27:39 -0000 1.198
+++ b/read.c 7 May 2011 14:36:12 -0000 1.200
@@ -2901,6 +2901,7 @@
const char *name;
const char **nlist = 0;
char *tildep = 0;
+ int globme = 1;
#ifndef NO_ARCHIVES
char *arname = 0;
char *memname = 0;
@@ -3109,32 +3110,40 @@
}
#endif /* !NO_ARCHIVES */
- switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
- {
- case GLOB_NOSPACE:
- fatal (NILF, _("virtual memory exhausted"));
-
- case 0:
- /* Success. */
- i = gl.gl_pathc;
- nlist = (const char **)gl.gl_pathv;
- break;
-
- case GLOB_NOMATCH:
- /* If we want only existing items, skip this one. */
- if (flags & PARSEFS_EXISTS)
- {
- i = 0;
- break;
- }
- /* FALLTHROUGH */
-
- default:
- /* By default keep this name. */
+ /* glob() is expensive: don't call it unless we need to. */
+ if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
+ {
+ globme = 0;
i = 1;
nlist = &name;
- break;
- }
+ }
+ else
+ switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
+ {
+ case GLOB_NOSPACE:
+ fatal (NILF, _("virtual memory exhausted"));
+
+ case 0:
+ /* Success. */
+ i = gl.gl_pathc;
+ nlist = (const char **)gl.gl_pathv;
+ break;
+
+ case GLOB_NOMATCH:
+ /* If we want only existing items, skip this one. */
+ if (flags & PARSEFS_EXISTS)
+ {
+ i = 0;
+ break;
+ }
+ /* FALLTHROUGH */
+
+ default:
+ /* By default keep this name. */
+ i = 1;
+ nlist = &name;
+ break;
+ }
/* For each matched element, add it to the list. */
while (i-- > 0)
@@ -3174,7 +3183,8 @@
#endif /* !NO_ARCHIVES */
NEWELT (concat (2, prefix, nlist[i]));
- globfree (&gl);
+ if (globme)
+ globfree (&gl);
#ifndef NO_ARCHIVES
if (arname)
Index: tests/scripts/functions/wildcard
===================================================================
RCS file: /sources/make/make/tests/scripts/functions/wildcard,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- a/tests/scripts/functions/wildcard 13 Jun 2009 21:21:49 -0000 1.6
+++ b/tests/scripts/functions/wildcard 7 May 2011 14:36:11 -0000 1.7
@@ -88,4 +88,16 @@
!,
'', "\n");
+# TEST #5: wildcard used to verify file existence
+
+touch('xxx.yyy');
+
+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
+ '', "file=xxx.yyy\n");
+
+unlink('xxx.yyy');
+
+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
+ '', "file=\n");
+
1;

View File

@@ -17,7 +17,7 @@
################################################################################
PKG_NAME="pcre"
PKG_VERSION="8.33"
PKG_VERSION="8.35"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@@ -17,7 +17,7 @@
################################################################################
PKG_NAME="bcm2835-driver"
PKG_VERSION="4016cb2"
PKG_VERSION="3ade415"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="nonfree"

View File

@@ -0,0 +1,118 @@
Date: Tue, 18 Jun 2013 16:42:13 +0100
From: Julian Brown <julian at codesourcery dot com>
To: <gcc-patches at gcc dot gnu dot org>, Richard Earnshaw <Richard dot Earnshaw at arm dot com>, Ramana Radhakrishnan <ramrad01 at arm dot com>
Subject: [PATCH, ARM] Reintroduce minipool ranges for zero-extension insn patterns
Hi,
The following patch removed pool_range/neg_pool_range attributes from
several instructions as a cleanup, which I believe to have been
incorrect:
http://gcc.gnu.org/ml/gcc-patches/2010-07/msg01036.html
On a Mentor-local branch, this caused problems with instructions like:
(insn 77 53 87 (set (reg:SI 8 r8 [orig:197 s.4 ] [197])
(zero_extend:SI (mem/u/c:HI (symbol_ref/u:SI ("*.LC0") [flags 0x2]) [7 S2 A16]))) [...] 161 {*arm_zero_extendhisi2_v6}
(nil))
The reasoning behind the cleanup was that the instructions in question
have no immediate constraints -- but the minipool code is used for more
than just immediates, e.g. in the above case where a symbol reference
("m") is loaded.
I don't have a test case for the problem on mainline at present, but I
believe it is still a latent bug. Tested with the default multilibs (ARM
& Thumb mode) on arm-none-eabi, with no regressions. (The patch has
also been tested with more multilibs on our local branches for a while,
and I did ensure previously that it did not adversely affect Bernd's
patch linked above.)
OK to apply?
Thanks,
Julian
ChangeLog
gcc/
* arm.md (*thumb1_zero_extendhisi2, *arm_zero_extendhisi2)
(*arm_zero_extendhisi2_v6, *thumb1_zero_extendqisi2)
(*thumb1_zero_extendqisi2_v6, *arm_zero_extendqisi2)
(*arm_zero_extendqisi2_v6): Add pool_range, neg_pool_range
attributes.
Index: gcc/config/arm/arm.md
===================================================================
--- a/gcc/config/arm/arm.md (revision 200171)
+++ b/gcc/config/arm/arm.md (working copy)
@@ -5313,7 +5313,8 @@
[(if_then_else (eq_attr "is_arch6" "yes")
(const_int 2) (const_int 4))
(const_int 4)])
- (set_attr "type" "simple_alu_shift, load_byte")]
+ (set_attr "type" "simple_alu_shift, load_byte")
+ (set_attr "pool_range" "*,60")]
)
(define_insn "*arm_zero_extendhisi2"
@@ -5324,7 +5325,9 @@
#
ldr%(h%)\\t%0, %1"
[(set_attr "type" "alu_shift,load_byte")
- (set_attr "predicable" "yes")]
+ (set_attr "predicable" "yes")
+ (set_attr "pool_range" "*,256")
+ (set_attr "neg_pool_range" "*,244")]
)
(define_insn "*arm_zero_extendhisi2_v6"
@@ -5335,7 +5338,9 @@
uxth%?\\t%0, %1
ldr%(h%)\\t%0, %1"
[(set_attr "predicable" "yes")
- (set_attr "type" "simple_alu_shift,load_byte")]
+ (set_attr "type" "simple_alu_shift,load_byte")
+ (set_attr "pool_range" "*,256")
+ (set_attr "neg_pool_range" "*,244")]
)
(define_insn "*arm_zero_extendhisi2addsi"
@@ -5405,7 +5410,8 @@
uxtb\\t%0, %1
ldrb\\t%0, %1"
[(set_attr "length" "2")
- (set_attr "type" "simple_alu_shift,load_byte")]
+ (set_attr "type" "simple_alu_shift,load_byte")
+ (set_attr "pool_range" "*,32")]
)
(define_insn "*arm_zero_extendqisi2"
@@ -5417,7 +5423,9 @@
ldr%(b%)\\t%0, %1\\t%@ zero_extendqisi2"
[(set_attr "length" "8,4")
(set_attr "type" "alu_shift,load_byte")
- (set_attr "predicable" "yes")]
+ (set_attr "predicable" "yes")
+ (set_attr "pool_range" "*,4096")
+ (set_attr "neg_pool_range" "*,4084")]
)
(define_insn "*arm_zero_extendqisi2_v6"
@@ -5428,7 +5436,9 @@
uxtb%(%)\\t%0, %1
ldr%(b%)\\t%0, %1\\t%@ zero_extendqisi2"
[(set_attr "type" "simple_alu_shift,load_byte")
- (set_attr "predicable" "yes")]
+ (set_attr "predicable" "yes")
+ (set_attr "pool_range" "*,4096")
+ (set_attr "neg_pool_range" "*,4084")]
)
(define_insn "*arm_zero_extendqisi2addsi"
--MP_/ERKB4.gCWGZVf9oWJO6IZSe--

View File

@@ -0,0 +1,31 @@
From 146b3e334cdbfa4bf5b5d3a4162f7b677356773d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
Date: Fri, 4 Apr 2014 13:45:42 +0200
Subject: [PATCH] drm/radeon: apply more strict limits for PLL params
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Letting post and refernce divider get to big is bad for signal stability.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/radeon/radeon_display.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 386cfa4..d68863e 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -937,6 +937,9 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
}
post_div = post_div_best;
+ /* limit reference * post divider to a maximum */
+ ref_div_max = min(100 / post_div, ref_div_max);
+
/* get matching reference and feedback divider */
ref_div = max(den / post_div, 1u);
fb_div = nom;
--
1.9.1

View File

@@ -0,0 +1,54 @@
From b5e9423f4dfbef8da81217310c99cdcb79aaf25d Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi.hannula@iki.fi>
Date: Mon, 7 Apr 2014 22:16:52 +0300
Subject: [PATCH] ALSA: hda - Do not assign streams in reverse order
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Currently stream numbers are assigned in reverse order.
Unfortunately commit 7546abfb8e1f9933b5 ("ALSA: hda - Increment
default stream numbers for AMD HDMI controllers") assumed this was not
the case (specifically, it had the "old cards had single device only"
=> "extra unused stream numbers do not matter" assumption), causing
non-working audio regressions for AMD Radeon HDMI users.
Change the stream numbers to be assigned in forward order.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77002
Reported-by: Christian Güdel <cg@dmesg.ch>
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Tested-by: Christian Güdel <cg@dmesg.ch>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: <stable@vger.kernel.org> # 3.14
---
sound/pci/hda/hda_intel.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index e354ab1ec20f..7a7b7b10dddf 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1856,13 +1856,14 @@ azx_assign_device(struct azx *chip, struct snd_pcm_substream *substream)
struct azx_dev *azx_dev = &chip->azx_dev[dev];
dsp_lock(azx_dev);
if (!azx_dev->opened && !dsp_is_locked(azx_dev)) {
- res = azx_dev;
- if (res->assigned_key == key) {
- res->opened = 1;
- res->assigned_key = key;
+ if (azx_dev->assigned_key == key) {
+ azx_dev->opened = 1;
+ azx_dev->assigned_key = key;
dsp_unlock(azx_dev);
return azx_dev;
}
+ if (!res)
+ res = azx_dev;
}
dsp_unlock(azx_dev);
}
--
1.8.4.5

View File

@@ -0,0 +1,25 @@
From c314d9af9d774c052bea324e1a140ccdba0ca070 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Tue, 8 Apr 2014 14:02:53 +0300
Subject: [PATCH] pm: disable async suspend/resume by default
---
kernel/power/main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 1d1bf63..361db93 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -46,7 +46,7 @@ int pm_notifier_call_chain(unsigned long val)
}
/* If set, devices may be suspended and resumed asynchronously. */
-int pm_async_enabled = 1;
+int pm_async_enabled = 0;
static ssize_t pm_async_show(struct kobject *kobj, struct kobj_attribute *attr,
char *buf)
--
1.7.2.5

View File

@@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="13-14b7a12"
PKG_VERSION="13-ca6c289"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="13-14b7a12"
PKG_VERSION="13-ca6c289"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@@ -0,0 +1,59 @@
From f3070359e2114b14b3d7097d2fe35ca1e788bc02 Mon Sep 17 00:00:00 2001
From: Oleg Oshmyan <chortos@inbox.lv>
Date: Fri, 4 Apr 2014 22:05:00 +0300
Subject: [PATCH 1/2] overlays: don't reduce ASS texture width unnecessarily
Fixes OpenELEC/OpenELEC.tv#3059 on GitHub, where an ASS subtitle
texture could become too narrow to fit subtitle bitmaps in full,
causing them to be inappropriately clipped. This issue has become
obvious lately due to changes in libass that make it output wider
(but fewer) images than it used to.
---
xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp b/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp
index 72478ab..45861b8 100644
--- a/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp
+++ b/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp
@@ -205,8 +205,8 @@ bool convert_quad(ASS_Image* images, SQuads& quads)
if (quads.count == 0)
return false;
- while(quads.size_x > (int)g_Windowing.GetMaxTextureSize())
- quads.size_x /= 2;
+ if (quads.size_x > (int)g_Windowing.GetMaxTextureSize())
+ quads.size_x = g_Windowing.GetMaxTextureSize();
int curr_x = 0;
int curr_y = 0;
--
1.9.1
From 87e0250eaa5103f39054d678920dc42a7b7979c3 Mon Sep 17 00:00:00 2001
From: Oleg Oshmyan <chortos@inbox.lv>
Date: Fri, 4 Apr 2014 22:39:18 +0300
Subject: [PATCH 2/2] overlays: include padding in initial ASS texture width
computation
---
xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp b/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp
index 45861b8..ef473e4 100644
--- a/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp
+++ b/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp
@@ -198,7 +198,7 @@ bool convert_quad(ASS_Image* images, SQuads& quads)
if((img->color & 0xff) == 0xff || img->w == 0 || img->h == 0)
continue;
- quads.size_x += img->w;
+ quads.size_x += img->w + 1;
quads.count++;
}
--
1.9.1

View File

@@ -16,16 +16,13 @@
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
# TODO: libass-0.11.1 fails to render subtitles sometimes, see
# http://forum.xbmc.org/showthread.php?tid=184866&pid=1669869#pid1669869
PKG_NAME="libass"
PKG_VERSION="0.10.2"
PKG_VERSION="0.11.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"
PKG_SITE="http://code.google.com/p/libass/"
PKG_URL="http://libass.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_URL="https://github.com/libass/libass/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain freetype fontconfig enca fribidi"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
@@ -36,8 +33,14 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="--disable-test \
--enable-enca \
--enable-fontconfig \
--disable-harfbuzz \
--disable-silent-rules \
--with-gnu-ld"
--enable-enca \
--enable-fontconfig \
--disable-harfbuzz \
--disable-silent-rules \
--with-gnu-ld"
if [ $TARGET_ARCH = "i386" -o $TARGET_ARCH = "x86_64" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET yasm:host"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-asm"
fi

View File

@@ -17,7 +17,7 @@
################################################################################
PKG_NAME="simplejson"
PKG_VERSION="2.6.2"
PKG_VERSION="3.4.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@@ -1,12 +0,0 @@
diff -Naur simplejson-2.6.2/setup.py simplejson-2.6.2.patch/setup.py
--- simplejson-2.6.2/setup.py 2012-09-21 21:25:54.000000000 +0200
+++ simplejson-2.6.2.patch/setup.py 2012-11-06 20:22:56.327643425 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/env python
import sys
-from distutils.core import setup, Extension, Command
+from setuptools import setup, Extension, Command
from distutils.command.build_ext import build_ext
from distutils.errors import CCompilerError, DistutilsExecError, \
DistutilsPlatformError

View File

@@ -17,7 +17,7 @@
################################################################################
PKG_NAME="openssl"
PKG_VERSION="1.0.1f"
PKG_VERSION="1.0.1g"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.22.0
# Wed Jan 1 15:36:26 2014
# Busybox version: 1.22.1
# Sun Apr 6 15:00:27 2014
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -913,7 +913,7 @@ CONFIG_FUSER=y
CONFIG_KILL=y
CONFIG_KILLALL=y
CONFIG_KILLALL5=y
# CONFIG_PGREP is not set
CONFIG_PGREP=y
CONFIG_PIDOF=y
# CONFIG_FEATURE_PIDOF_SINGLE is not set
# CONFIG_FEATURE_PIDOF_OMIT is not set

View File

@@ -17,7 +17,7 @@
################################################################################
PKG_NAME="kmod"
PKG_VERSION="16"
PKG_VERSION="17"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@@ -0,0 +1,39 @@
KEY_0 = KEY_NUMERIC_0 # 0
KEY_1 = KEY_NUMERIC_1 # 1
KEY_2 = KEY_NUMERIC_2 # 2
KEY_3 = KEY_NUMERIC_3 # 3
KEY_4 = KEY_NUMERIC_4 # 4
KEY_5 = KEY_NUMERIC_5 # 5
KEY_6 = KEY_NUMERIC_6 # 6
KEY_7 = KEY_NUMERIC_7 # 7
KEY_8 = KEY_NUMERIC_8 # 8
KEY_9 = KEY_NUMERIC_9 # 9
KEY_MUTE = KEY_MUTE # Mute
KEY_PAUSE = KEY_PAUSE # Pause
KEY_INFO = KEY_INFO # Info
KEY_VOLDOWN = KEY_VOLUMEDOWN # Volume Down
KEY_VOLUP = KEY_VOLUMEUP # Volume Up
KEY_CHDOWN = KEY_CHANNELDOWN # Channel Down
KEY_CHUP = KEY_CHANNELUP # Channel Up
KEY_FORWARD = KEY_FORWARD # Forward
KEY_PLAY = KEY_PLAY
KEY_CLEAR = KEY_CLEAR # Clear
KEY_BACK = KEY_BACK # BACK/Clear
KEY_UP = KEY_UP # Up
KEY_DOWN = KEY_DOWN # Direction Down
KEY_MENU = KEY_MENU # Menu
KEY_EXIT = KEY_EXIT # Back/Exit
KEY_LEFT = KEY_LEFT # Direction Left
KEY_RIGHT = KEY_RIGHT # Right Arrow
KEY_OK = KEY_OK # Direction OK (also used for Enter)
KEY_ENTER = KEY_ENTER # Enter (also used for Direction OK)
KEY_STOP = KEY_STOP # Stop
KEY_FFORWARD = KEY_FASTFORWARD # Forward
KEY_REWIND = KEY_REWIND # Rewind
KEY_RED = KEY_RED # Red
KEY_GREEN = KEY_GREEN # Green
KEY_YELLOW = KEY_YELLOW # Yellow
KEY_BLUE = KEY_BLUE # Blue
KEY_GUIDE = KEY_EPG # EPG
KEY_RECORD = KEY_RECORD # Record

View File

@@ -115,6 +115,10 @@ ENV{ID_VENDOR_ID}=="1784", ENV{ID_MODEL_ID}=="0004", \
ENV{eventlircd_enable}="true", \
ENV{eventlircd_evmap}="topseed.evmap"
ENV{ID_VENDOR_ID}=="03eb", ENV{ID_MODEL_ID}=="0002", \
ENV{eventlircd_enable}="true", \
ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"
ENV{ID_VENDOR_ID}=="05a4", ENV{ID_MODEL_ID}=="9881", \
ENV{eventlircd_enable}="true", \
ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"

View File

@@ -17,7 +17,7 @@
################################################################################
PKG_NAME="bcm2835-bootloader"
PKG_VERSION="4016cb2"
PKG_VERSION="3ade415"
PKG_REV="1"
PKG_ARCH="arm"
PKG_LICENSE="nonfree"

View File

@@ -37,5 +37,5 @@ export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
export LIBS="$LIBS -lz"
post_makeinstall_target() {
rm -rf $INSTALL/usr/share/nano/man-html
rm -rf $INSTALL/usr/share/nano
}

View File

@@ -17,15 +17,15 @@
################################################################################
# Notes:
# -build curl with OpenSSL support instead GnuTLS support to
# work around a long standing bug on Pi where https streams often hang on
# start. This hang is normally fatal and requires a reboot.
# see also http://trac.xbmc.org/ticket/14674 .
# Easiest way to reproduce is to install gdrive addon and play a video from
# there: http://forum.xbmc.org/showthread.php?tid=177557
# - build curl with OpenSSL support instead GnuTLS support to
# work around a long standing bug on Pi where https streams often hang on
# start. This hang is normally fatal and requires a reboot.
# see also http://trac.xbmc.org/ticket/14674 .
# Easiest way to reproduce is to install gdrive addon and play a video from
# there: http://forum.xbmc.org/showthread.php?tid=177557
PKG_NAME="curl"
PKG_VERSION="7.35.0"
PKG_VERSION="7.36.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="MIT"

View File

@@ -0,0 +1,31 @@
Apply fix from 38d582ff541353d738858299d4a2b78bafac03ed to unbreak
building with --disable-manual.
We don't use the literal patch since that means re-generating files
from the tarball that are usually shipped.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
diff -Nura curl-7.36.0.orig/src/tool_hugehelp.c curl-7.36.0/src/tool_hugehelp.c
--- curl-7.36.0.orig/src/tool_hugehelp.c 2014-03-31 19:28:23.018515093 -0300
+++ curl-7.36.0/src/tool_hugehelp.c 2014-03-31 19:28:09.994076200 -0300
@@ -4165,6 +4165,10 @@
" these mailing lists instead of mailing any individual.\n"
, stdout) ;
}
+#else /* !USE_MANUAL */
+/* built-in manual is disabled, blank function */
+#include "tool_hugehelp.h"
+void hugehelp(void) {}
#endif /* USE_MANUAL */
#else
/*
@@ -8192,5 +8196,9 @@
}
inflateEnd(&z);
}
+#else
+/* built-in manual is disabled, blank function */
+#include "tool_hugehelp.h"
+void hugehelp(void) {}
#endif /* USE_MANUAL */
#endif /* HAVE_LIBZ */

View File

@@ -1,26 +0,0 @@
From 69e0602a6d44f2d1bc93f059f275417c37a05b48 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 29 Mar 2014 13:18:26 +0200
Subject: [PATCH] rtsp: parse "Session:" header properly
backport https://github.com/bagder/curl/commit/4ff71183b999761b07d54dd44743a4d59b2dad84
---
lib/rtsp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/rtsp.c b/lib/rtsp.c
index 9d7a9a9..6e7aecd 100644
--- a/lib/rtsp.c
+++ b/lib/rtsp.c
@@ -761,7 +761,7 @@ CURLcode Curl_rtsp_parseheader(struct connectdata *conn,
char *start;
/* Find the first non-space letter */
- start = header + 9;
+ start = header + 8;
while(*start && ISSPACE(*start))
start++;
--
1.7.2.5

View File

@@ -49,3 +49,7 @@ pre_configure_target() {
# TODO: xf86-video-intel-2.21.5 dont link with LTO enabled
strip_lto
}
post_makeinstall_target() {
rm -rf $INSTALL/usr/share/polkit-1
}

View File

@@ -174,7 +174,7 @@
# for a list of additinoal drivers see packages/linux-drivers
# Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8188EU dvbhdhomerun"
ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8188EU RTL8723AU dvbhdhomerun"
# build and install bluetooth support (yes / no)
BLUETOOTH_SUPPORT="yes"

View File

@@ -65,9 +65,6 @@ fi
if [ ! -f $STAMP ]; then
rm -f $STAMP
printf "%${BUILD_INDENT}c ${boldyellow}BUILD${endcolor} $PACKAGE_NAME ${boldwhite}($TARGET)${endcolor}\n" ' '>&$SILENT_OUT
export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
if [ "$TARGET" = "bootstrap" -o "$TARGET" = "init" ]; then
setup_toolchain target
else
@@ -192,6 +189,9 @@ if [ ! -f $STAMP ]; then
done
fi
printf "%${BUILD_INDENT}c ${boldyellow}BUILD${endcolor} $PACKAGE_NAME ${boldwhite}($TARGET)${endcolor}\n" ' '>&$SILENT_OUT
export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
if [ "$PKG_AUTORECONF" = yes ]; then
$SCRIPTS/autoreconf $PACKAGE_NAME
fi