libretro/Lakka
1
0
Fork 0
mirror of https://github.com/libretro/Lakka.git synced 2024-12-04 14:18:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://openelec.git.sourceforge.net/gitroot/openelec/openelec

Browse Source
This commit is contained in:
Stephan Raue 2010-06-22 05:22:04 +02:00
commit 81b539ddc1
28 changed files with 129 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/graphics/Mesa/url
View File

@ -1,2 +1,2 @@
ftp://freedesktop.org/pub/mesa/7.8.1/MesaLib-7.8.1.tar.bz2
ftp://freedesktop.org/pub/mesa/7.8.1/MesaDemos-7.8.1.tar.bz2
ftp://freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2
ftp://freedesktop.org/pub/mesa/7.8.2/MesaDemos-7.8.2.tar.bz2

2
packages/mediacenter/xbmc-theme-Confluence/url
View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-theme-Confluence-31095.tar.bz2
http://sources.openelec.tv/svn/xbmc-theme-Confluence-31280.tar.bz2

2
packages/mediacenter/xbmc/url
View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-31095.tar.bz2
http://sources.openelec.tv/svn/xbmc-31280.tar.bz2

8
packages/network/ppp/install
View File

@ -12,12 +12,12 @@ mkdir -p $INSTALL/etc/ppp
ln -sf /var/cache/chap-secrets $INSTALL/etc/ppp/chap-secrets
ln -sf /var/cache/pap-secrets $INSTALL/etc/ppp/pap-secrets
#/etc/ppp/peers/adsl must be writeable
ln -sf /var/cache/adsl $INSTALL/etc/ppp/peers/adsl
mkdir -p $INSTALL/etc/ppp/peers
cp $PKG_DIR/config/adsl.sample $INSTALL/etc/ppp/peers/
# /etc/ppp/peers/adsl must be writeable
ln -sf /var/cache/adsl $INSTALL/etc/ppp/peers/adsl
mkdir -p $INSTALL/etc/ppp/plugins
cp $PKG_BUILD/pppd/plugins/rp-pppoe/rp-pppoe.so $INSTALL/etc/ppp/plugins

15
packages/sysutils/busybox/patches/busybox-1.16.1-ash.diff
View File

@ -1,15 +0,0 @@
diff -urpN busybox-1.16.1/shell/ash.c busybox-1.16.1-ash/shell/ash.c
--- busybox-1.16.1/shell/ash.c 2010-03-28 19:44:04.000000000 +0200
+++ busybox-1.16.1-ash/shell/ash.c 2010-04-26 14:18:36.000000000 +0200
@@ -5424,7 +5424,11 @@ rmescapes(char *str, int flag)
size_t fulllen = len + strlen(p) + 1;
if (flag & RMESCAPE_GROW) {
+ int strloc = str - (char *)stackblock();
r = makestrspace(fulllen, expdest);
+ /* p and str may be invalidated by makestrspace */
+ str = (char *)stackblock() + strloc;
+ p = str + len;
} else if (flag & RMESCAPE_HEAP) {
r = ckmalloc(fulllen);
} else {

51
packages/sysutils/busybox/patches/busybox-1.16.1-cpio.diff
View File

@ -1,51 +0,0 @@
diff -urpN busybox-1.16.1/archival/cpio.c busybox-1.16.1-cpio/archival/cpio.c
--- busybox-1.16.1/archival/cpio.c 2010-03-20 03:58:07.000000000 +0100
+++ busybox-1.16.1-cpio/archival/cpio.c 2010-04-27 08:15:37.000000000 +0200
@@ -424,7 +424,7 @@ int cpio_main(int argc UNUSED_PARAM, cha
if (archive_handle->cpio__blocks != (off_t)-1
&& !(opt & CPIO_OPT_QUIET)
) {
- printf("%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
+ fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
}
return EXIT_SUCCESS;
diff -urpN busybox-1.16.1/testsuite/cpio.tests busybox-1.16.1-cpio/testsuite/cpio.tests
--- busybox-1.16.1/testsuite/cpio.tests 2010-03-28 19:59:59.000000000 +0200
+++ busybox-1.16.1-cpio/testsuite/cpio.tests 2010-04-27 08:15:37.000000000 +0200
@@ -32,7 +32,7 @@ rm -rf cpio.testdir cpio.testdir2 2>/dev
# testing "test name" "command" "expected result" "file input" "stdin"
testing "cpio extracts zero-sized hardlinks" \
-"$ECHO -ne '$hexdump' | bzcat | cpio -i; echo \$?;
+"$ECHO -ne '$hexdump' | bzcat | cpio -i 2>&1; echo \$?;
ls -ln cpio.testdir | $FILTER_LS" \
"\
1 blocks
@@ -45,7 +45,7 @@ ls -ln cpio.testdir | $FILTER_LS" \
test x"$SKIP_KNOWN_BUGS" = x"" && {
# Currently fails. Numerous buglets: "1 blocks" versus "1 block",
-# "1 block" must go to stderr, does not list cpio.testdir/x and cpio.testdir/y
+# does not list cpio.testdir/x and cpio.testdir/y
testing "cpio lists hardlinks" \
"$ECHO -ne '$hexdump' | bzcat | cpio -t 2>&1; echo \$?" \
"\
@@ -70,7 +70,7 @@ ln cpio.testdir/nonempty cpio.testdir/no
mkdir cpio.testdir2
testing "cpio extracts zero-sized hardlinks 2" \
-"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i); echo \$?;
+"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i 2>&1); echo \$?;
ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \
"\
2 blocks
@@ -87,7 +87,7 @@ ls -ln cpio.testdir2/cpio.testdir | $FIL
# Was trying to create "/usr/bin", correct is "usr/bin".
rm -rf cpio.testdir
testing "cpio -p with absolute paths" \
-"echo /usr/bin | cpio -dp cpio.testdir; echo \$?;
+"echo /usr/bin | cpio -dp cpio.testdir 2>&1; echo \$?;
ls cpio.testdir" \
"\
1 blocks

12
packages/sysutils/busybox/patches/busybox-1.16.1-dhcpd.diff
View File

@ -1,12 +0,0 @@
diff -urpN busybox-1.16.1/networking/udhcp/leases.c busybox-1.16.1-dhcpd/networking/udhcp/leases.c
--- busybox-1.16.1/networking/udhcp/leases.c 2010-03-28 19:43:36.000000000 +0200
+++ busybox-1.16.1-dhcpd/networking/udhcp/leases.c 2010-05-15 20:47:08.000000000 +0200
@@ -64,6 +64,8 @@ struct dyn_lease* FAST_FUNC add_lease(
oldest->hostname[0] = '\0';
if (hostname) {
char *p;
+
+ hostname_len++; /* include NUL */
if (hostname_len > sizeof(oldest->hostname))
hostname_len = sizeof(oldest->hostname);
p = safe_strncpy(oldest->hostname, hostname, hostname_len);

48
packages/sysutils/busybox/patches/busybox-1.16.1-dnsd.diff
View File

@ -1,48 +0,0 @@
diff -urpN busybox-1.16.1/include/platform.h busybox-1.16.1-dnsd/include/platform.h
--- busybox-1.16.1/include/platform.h 2010-03-28 19:43:35.000000000 +0200
+++ busybox-1.16.1-dnsd/include/platform.h 2010-04-14 19:06:10.000000000 +0200
@@ -291,10 +291,12 @@ typedef unsigned smalluint;
#if 1 /* if needed: !defined(arch1) && !defined(arch2) */
# define ALIGN1 __attribute__((aligned(1)))
# define ALIGN2 __attribute__((aligned(2)))
+# define ALIGN4 __attribute__((aligned(4)))
#else
/* Arches which MUST have 2 or 4 byte alignment for everything are here */
# define ALIGN1
# define ALIGN2
+# define ALIGN4
#endif
diff -urpN busybox-1.16.1/networking/dnsd.c busybox-1.16.1-dnsd/networking/dnsd.c
--- busybox-1.16.1/networking/dnsd.c 2010-03-28 19:43:36.000000000 +0200
+++ busybox-1.16.1-dnsd/networking/dnsd.c 2010-04-26 14:20:25.000000000 +0200
@@ -44,10 +44,15 @@ struct dns_head {
uint16_t nauth;
uint16_t nadd;
};
+/* Structure used to access type and class fields.
+ * They are totally unaligned, but gcc 4.3.4 thinks that pointer of type uint16_t*
+ * is 16-bit aligned and replaces 16-bit memcpy (in move_from_unaligned16 macro)
+ * with aligned halfword access on arm920t!
+ * Oh well. Slapping PACKED everywhere seems to help: */
struct dns_prop {
- uint16_t type;
- uint16_t class;
-};
+ uint16_t type PACKED;
+ uint16_t class PACKED;
+} PACKED;
/* element of known name, ip address and reversed ip address */
struct dns_entry {
struct dns_entry *next;
@@ -459,7 +464,8 @@ int dnsd_main(int argc UNUSED_PARAM, cha
unsigned lsa_size;
int udps, opts;
uint16_t port = 53;
- uint8_t buf[MAX_PACK_LEN + 1];
+ /* Ensure buf is 32bit aligned (we need 16bit, but 32bit can't hurt) */
+ uint8_t buf[MAX_PACK_LEN + 1] ALIGN4;
opts = getopt32(argv, "vi:c:t:p:d", &listen_interface, &fileconf, &sttl, &sport);
//if (opts & 0x1) // -v

152
packages/sysutils/busybox/patches/busybox-1.16.1-hwclock.diff
View File

@ -1,152 +0,0 @@
diff -urpN busybox-1.16.1/util-linux/hwclock.c busybox-1.16.1-hwclock/util-linux/hwclock.c
--- busybox-1.16.1/util-linux/hwclock.c 2010-03-20 03:58:07.000000000 +0100
+++ busybox-1.16.1-hwclock/util-linux/hwclock.c 2010-04-14 18:29:37.000000000 +0200
@@ -109,10 +109,53 @@ static void to_sys_clock(const char **pp
static void from_sys_clock(const char **pp_rtcname, int utc)
{
-#define TWEAK_USEC 200
- struct tm tm_time;
+#if 1
struct timeval tv;
+ struct tm tm_time;
+ int rtc;
+
+ rtc = rtc_xopen(pp_rtcname, O_WRONLY);
+ gettimeofday(&tv, NULL);
+ /* Prepare tm_time */
+ if (sizeof(time_t) == sizeof(tv.tv_sec)) {
+ if (utc)
+ gmtime_r((time_t*)&tv.tv_sec, &tm_time);
+ else
+ localtime_r((time_t*)&tv.tv_sec, &tm_time);
+ } else {
+ time_t t = tv.tv_sec;
+ if (utc)
+ gmtime_r(&t, &tm_time);
+ else
+ localtime_r(&t, &tm_time);
+ }
+#else
+/* Bloated code which tries to set hw clock with better precision.
+ * On x86, even though code does set hw clock within <1ms of exact
+ * whole seconds, apparently hw clock (at least on some machines)
+ * doesn't reset internal fractional seconds to 0,
+ * making all this a pointless excercise.
+ */
+ /* If we see that we are N usec away from whole second,
+ * we'll sleep for N-ADJ usecs. ADJ corrects for the fact
+ * that CPU is not infinitely fast.
+ * On infinitely fast CPU, next wakeup would be
+ * on (exactly_next_whole_second - ADJ). On real CPUs,
+ * this difference between current time and whole second
+ * is less than ADJ (assuming system isn't heavily loaded).
+ */
+ /* Small value of 256us gives very precise sync for 2+ GHz CPUs.
+ * Slower CPUs will fail to sync and will go to bigger
+ * ADJ values. qemu-emulated armv4tl with ~100 MHz
+ * performance ends up using ADJ ~= 4*1024 and it takes
+ * 2+ secs (2 tries with successively larger ADJ)
+ * to sync. Even straced one on the same qemu (very slow)
+ * takes only 4 tries.
+ */
+#define TWEAK_USEC 256
unsigned adj = TWEAK_USEC;
+ struct tm tm_time;
+ struct timeval tv;
int rtc = rtc_xopen(pp_rtcname, O_WRONLY);
/* Try to catch the moment when whole second is close */
@@ -124,55 +167,64 @@ static void from_sys_clock(const char **
t = tv.tv_sec;
rem_usec = 1000000 - tv.tv_usec;
- if (rem_usec < 1024) {
- /* Less than 1ms to next second. Good enough */
+ if (rem_usec < adj) {
+ /* Close enough */
small_rem:
t++;
}
- /* Prepare tm */
+ /* Prepare tm_time from t */
if (utc)
gmtime_r(&t, &tm_time); /* may read /etc/xxx (it takes time) */
else
localtime_r(&t, &tm_time); /* same */
- tm_time.tm_isdst = 0;
+
+ if (adj >= 32*1024) {
+ break; /* 32 ms diff and still no luck?? give up trying to sync */
+ }
/* gmtime/localtime took some time, re-get cur time */
gettimeofday(&tv, NULL);
- if (tv.tv_sec < t /* may happen if rem_usec was < 1024 */
- || (tv.tv_sec == t && tv.tv_usec < 1024)
+ if (tv.tv_sec < t /* we are still in old second */
+ || (tv.tv_sec == t && tv.tv_usec < adj) /* not too far into next second */
) {
- /* We are not too far into next second. Good. */
- break;
- }
- adj += 32; /* 2^(10-5) = 2^5 = 32 iterations max */
- if (adj >= 1024) {
- /* Give up trying to sync */
- break;
+ break; /* good, we are in sync! */
}
- /* Try to sync up by sleeping */
rem_usec = 1000000 - tv.tv_usec;
- if (rem_usec < 1024) {
- goto small_rem; /* already close, don't sleep */
+ if (rem_usec < adj) {
+ t = tv.tv_sec;
+ goto small_rem; /* already close to next sec, don't sleep */
}
- /* Need to sleep.
- * Note that small adj on slow processors can make us
- * to always overshoot tv.tv_usec < 1024 check on next
- * iteration. That's why adj is increased on each iteration.
- * This also allows it to be reused as a loop limiter.
- */
- usleep(rem_usec - adj);
- }
- xioctl(rtc, RTC_SET_TIME, &tm_time);
+ /* Try to sync up by sleeping */
+ usleep(rem_usec - adj);
- /* Debug aid to find "good" TWEAK_USEC.
+ /* Jump to 1ms diff, then increase fast (x2): EVERY loop
+ * takes ~1 sec, people won't like slowly converging code here!
+ */
+ //bb_error_msg("adj:%d tv.tv_usec:%d", adj, (int)tv.tv_usec);
+ if (adj < 512)
+ adj = 512;
+ /* ... and if last "overshoot" does not look insanely big,
+ * just use it as adj increment. This makes convergence faster.
+ */
+ if (tv.tv_usec < adj * 8) {
+ adj += tv.tv_usec;
+ continue;
+ }
+ adj *= 2;
+ }
+ /* Debug aid to find "optimal" TWEAK_USEC with nearly exact sync.
* Look for a value which makes tv_usec close to 999999 or 0.
- * for 2.20GHz Intel Core 2: TWEAK_USEC ~= 200
+ * For 2.20GHz Intel Core 2: optimal TWEAK_USEC ~= 200
*/
- //bb_error_msg("tv.tv_usec:%d adj:%d", (int)tv.tv_usec, adj);
+ //bb_error_msg("tv.tv_usec:%d", (int)tv.tv_usec);
+#endif
+
+ tm_time.tm_isdst = 0;
+ xioctl(rtc, RTC_SET_TIME, &tm_time);
if (ENABLE_FEATURE_CLEAN_UP)
close(rtc);

12
packages/sysutils/busybox/patches/busybox-1.16.1-indexcgi.diff
View File

@ -1,12 +0,0 @@
diff -urpN busybox-1.16.1/networking/httpd_indexcgi.c busybox-1.16.1-indexcgi/networking/httpd_indexcgi.c
--- busybox-1.16.1/networking/httpd_indexcgi.c 2010-03-20 03:58:07.000000000 +0100
+++ busybox-1.16.1-indexcgi/networking/httpd_indexcgi.c 2010-04-15 17:39:01.000000000 +0200
@@ -315,7 +315,7 @@ int main(int argc, char *argv[])
if (S_ISREG(cdir->dl_mode))
fmt_ull(cdir->dl_size);
fmt_str("<td class=dt>");
- tm = gmtime(&cdir->dl_mtime);
+ ptm = gmtime(&cdir->dl_mtime);
fmt_04u(1900 + ptm->tm_year); *dst++ = '-';
fmt_02u(ptm->tm_mon + 1); *dst++ = '-';
fmt_02u(ptm->tm_mday); *dst++ = ' ';

89
packages/sysutils/busybox/patches/busybox-1.16.1-sed.diff
View File

@ -1,89 +0,0 @@
diff -urpN busybox-1.16.1/editors/sed.c busybox-1.16.1-sed/editors/sed.c
--- busybox-1.16.1/editors/sed.c 2010-03-28 19:43:35.000000000 +0200
+++ busybox-1.16.1-sed/editors/sed.c 2010-05-12 01:46:57.000000000 +0200
@@ -487,7 +487,7 @@ static const char *parse_cmd_args(sed_cm
static void add_cmd(const char *cmdstr)
{
sed_cmd_t *sed_cmd;
- int temp;
+ unsigned len, n;
/* Append this line to any unfinished line from last time. */
if (G.add_cmd_line) {
@@ -496,12 +496,14 @@ static void add_cmd(const char *cmdstr)
cmdstr = G.add_cmd_line = tp;
}
- /* If this line ends with backslash, request next line. */
- temp = strlen(cmdstr);
- if (temp && cmdstr[--temp] == '\\') {
+ /* If this line ends with unescaped backslash, request next line. */
+ n = len = strlen(cmdstr);
+ while (n && cmdstr[n-1] == '\\')
+ n--;
+ if ((len - n) & 1) { /* if odd number of trailing backslashes */
if (!G.add_cmd_line)
G.add_cmd_line = xstrdup(cmdstr);
- G.add_cmd_line[temp] = '\0';
+ G.add_cmd_line[len-1] = '\0';
return;
}
@@ -936,7 +938,15 @@ static void process_files(void)
/* Skip blocks of commands we didn't match */
if (sed_cmd->cmd == '{') {
if (sed_cmd->invert ? matched : !matched) {
- while (sed_cmd->cmd != '}') {
+ unsigned nest_cnt = 0;
+ while (1) {
+ if (sed_cmd->cmd == '{')
+ nest_cnt++;
+ if (sed_cmd->cmd == '}') {
+ nest_cnt--;
+ if (nest_cnt == 0)
+ break;
+ }
sed_cmd = sed_cmd->next;
if (!sed_cmd)
bb_error_msg_and_die("unterminated {");
@@ -1031,7 +1041,7 @@ static void process_files(void)
case 'c':
/* Only triggers on last line of a matching range. */
if (!sed_cmd->in_match)
- sed_puts(sed_cmd->string, NO_EOL_CHAR);
+ sed_puts(sed_cmd->string, '\n');
goto discard_line;
/* Read file, append contents to output */
diff -urpN busybox-1.16.1/testsuite/sed.tests busybox-1.16.1-sed/testsuite/sed.tests
--- busybox-1.16.1/testsuite/sed.tests 2010-03-20 03:58:07.000000000 +0100
+++ busybox-1.16.1-sed/testsuite/sed.tests 2010-05-12 01:46:57.000000000 +0200
@@ -248,4 +248,28 @@ testing "sed beginning (^) matches only
">/usr</>lib<\n" "" \
"/usr/lib\n"
+testing "sed c" \
+ "sed 'crepl'" \
+ "repl\nrepl\n" "" \
+ "first\nsecond\n"
+
+testing "sed nested {}s" \
+ "sed '/asd/ { p; /s/ { s/s/c/ }; p; q }'" \
+ "qwe\nasd\nacd\nacd\n" "" \
+ "qwe\nasd\nzxc\n"
+
+testing "sed a cmd ended by double backslash" \
+ "sed -e '/| one /a \\
+ | three \\\\' -e '/| one-/a \\
+ | three-* \\\\'" \
+' | one \\
+ | three \\
+ | two \\
+' '' \
+' | one \\
+ | two \\
+'
+
+# testing "description" "arguments" "result" "infile" "stdin"
+
exit $FAILCOUNT

2
packages/sysutils/busybox/url
View File

@ -1 +1 @@
http://busybox.net/downloads/busybox-1.16.1.tar.bz2
http://busybox.net/downloads/busybox-1.16.2.tar.bz2

2
packages/sysutils/module-init-tools/url
View File

@ -1 +1 @@
http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.12-pre2.tar.gz
http://kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.12.tar.bz2

84
packages/sysutils/pm-utils/install
View File

@ -13,45 +13,59 @@ mkdir -p $INSTALL/etc/pm/power.d
mkdir -p $INSTALL/etc/pm/sleep.d
mkdir -p $INSTALL/usr/bin
for file in import-fdi-quirkdb on_ac_power pm-is-supported; do
cp -P $PKG_BUILD/src/$file $INSTALL/usr/bin
done
mkdir -p $INSTALL/usr/lib/pm-utils/bin
for file in pm-action pm-pmu pm-reset-swap service; do
cp -P $PKG_BUILD/src/$file $INSTALL/usr/lib/pm-utils/bin
done
cp $PKG_BUILD/src/on_ac_power $INSTALL/usr/bin
cp $PKG_BUILD/src/pm-is-supported $INSTALL/usr/bin
mkdir -p $INSTALL/usr/lib/pm-utils/
for file in defaults functions pm-functions; do
cp -P $PKG_BUILD/pm/$file $INSTALL/usr/lib/pm-utils
done
cp $PKG_BUILD/pm/defaults $INSTALL/usr/lib/pm-utils
cp $PKG_BUILD/pm/functions $INSTALL/usr/lib/pm-utils
cp $PKG_BUILD/pm/pm-functions $INSTALL/usr/lib/pm-utils
mkdir -p $INSTALL/usr/lib/pm-utils/bin
cp $PKG_BUILD/src/pm-action $INSTALL/usr/lib/pm-utils/bin
cp $PKG_BUILD/src/pm-pmu $INSTALL/usr/lib/pm-utils/bin
cp $PKG_BUILD/src/pm-reset-swap $INSTALL/usr/lib/pm-utils/bin
cp $PKG_BUILD/src/service $INSTALL/usr/lib/pm-utils/bin
mkdir -p $INSTALL/usr/lib/pm-utils/module.d
cp $PKG_BUILD/pm/module.d/kernel $INSTALL/usr/lib/pm-utils/module.d
cp $PKG_BUILD/pm/module.d/uswsusp $INSTALL/usr/lib/pm-utils/module.d
cp $PKG_BUILD/pm/module.d/tuxonice $INSTALL/usr/lib/pm-utils/module.d
mkdir -p $INSTALL/usr/lib/pm-utils/power.d
cp $PKG_BUILD/pm/power.d/disable_wol $INSTALL/usr/lib/pm-utils/power.d
cp $PKG_BUILD/pm/power.d/harddrive $INSTALL/usr/lib/pm-utils/power.d
cp $PKG_BUILD/pm/power.d/hal-cd-polling $INSTALL/usr/lib/pm-utils/power.d
cp $PKG_BUILD/pm/power.d/journal-commit $INSTALL/usr/lib/pm-utils/power.d
cp $PKG_BUILD/pm/power.d/intel-audio-powersave $INSTALL/usr/lib/pm-utils/power.d
cp $PKG_BUILD/pm/power.d/pcie_aspm $INSTALL/usr/lib/pm-utils/power.d
cp $PKG_BUILD/pm/power.d/laptop-mode $INSTALL/usr/lib/pm-utils/power.d
cp $PKG_BUILD/pm/power.d/sata_alpm $INSTALL/usr/lib/pm-utils/power.d
cp $PKG_BUILD/pm/power.d/readahead $INSTALL/usr/lib/pm-utils/power.d
cp $PKG_BUILD/pm/power.d/sched-powersave $INSTALL/usr/lib/pm-utils/power.d
cp $PKG_BUILD/pm/power.d/wireless $INSTALL/usr/lib/pm-utils/power.d
cp $PKG_BUILD/pm/power.d/xfs_buffer $INSTALL/usr/lib/pm-utils/power.d
chmod +x $INSTALL/usr/lib/pm-utils/power.d/*
mkdir -p $INSTALL/usr/lib/pm-utils/sleep.d
cp $PKG_BUILD/pm/sleep.d/00logging $INSTALL/usr/lib/pm-utils/sleep.d
cp $PKG_BUILD/pm/sleep.d/00powersave $INSTALL/usr/lib/pm-utils/sleep.d
cp $PKG_BUILD/pm/sleep.d/01grub $INSTALL/usr/lib/pm-utils/sleep.d
cp $PKG_BUILD/pm/sleep.d/49bluetooth $INSTALL/usr/lib/pm-utils/sleep.d
cp $PKG_BUILD/pm/sleep.d/55NetworkManager $INSTALL/usr/lib/pm-utils/sleep.d
cp $PKG_BUILD/pm/sleep.d/75modules $INSTALL/usr/lib/pm-utils/sleep.d
cp $PKG_BUILD/pm/sleep.d/90clock $INSTALL/usr/lib/pm-utils/sleep.d
cp $PKG_BUILD/pm/sleep.d/94cpufreq $INSTALL/usr/lib/pm-utils/sleep.d
cp $PKG_BUILD/pm/sleep.d/95led $INSTALL/usr/lib/pm-utils/sleep.d
cp $PKG_BUILD/pm/sleep.d/98video-quirk-db-handler $INSTALL/usr/lib/pm-utils/sleep.d
cp $PKG_BUILD/pm/sleep.d/99video $INSTALL/usr/lib/pm-utils/sleep.d
chmod +x $INSTALL/usr/lib/pm-utils/sleep.d/*
mkdir -p $INSTALL/usr/lib/pm-utils/video-quirks/
cp $PKG_DIR/quirks/*.quirkdb $INSTALL/usr/lib/pm-utils/video-quirks/
mkdir -p $INSTALL/usr/lib/pm-utils/module.d
# tuxonice
for file in kernel uswsusp; do
cp -P $PKG_BUILD/pm/module.d/$file $INSTALL/usr/lib/pm-utils/module.d
done
mkdir -p $INSTALL/usr/lib/pm-utils/power.d
# disabled, because not needed
# for file in sched-powersave; do
# cp -P $PKG_BUILD/pm/power.d/$file $INSTALL/usr/lib/pm-utils/power.d
# chmod +x $INSTALL/usr/lib/pm-utils/power.d/$file
# done
mkdir -p $INSTALL/usr/lib/pm-utils/sleep.d
# 01grub 49bluetooth 55NetworkManager 90clock 95led
for file in 00logging 00powersave 75modules 94cpufreq 98video-quirk-db-handler 99video; do
cp -P $PKG_BUILD/pm/sleep.d/$file $INSTALL/usr/lib/pm-utils/sleep.d
chmod +x $INSTALL/usr/lib/pm-utils/sleep.d/$file
done
mkdir -p $INSTALL/usr/sbin
cp -P $PKG_BUILD/src/pm-powersave $INSTALL/usr/sbin
for file in pm-hibernate pm-suspend pm-suspend-hybrid; do
ln -sf /usr/lib/pm-utils/bin/pm-action $INSTALL/usr/sbin/$file
done
cp $PKG_BUILD/src/pm-powersave $INSTALL/usr/sbin
ln -sf /usr/lib/pm-utils/bin/pm-action $INSTALL/usr/sbin/pm-hibernate
ln -sf /usr/lib/pm-utils/bin/pm-action $INSTALL/usr/sbin/pm-suspend
ln -sf /usr/lib/pm-utils/bin/pm-action $INSTALL/usr/sbin/pm-suspend-hybrid

3
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-dell.quirkdb
View File

@ -53,6 +53,9 @@
match system.hardware.product regex 1501|8600
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
addquirk --quirk-radeon-off
endmatch
endmatch
match system.hardware.product regex 9300
addquirk --quirk-s3-bios

3
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-hp.quirkdb
View File

@ -67,6 +67,9 @@
endmatch
endmatch
match system.hardware.vendor regex ^Hewlett-Packard
match system.hardware.product regex ^COMPAQ MINI 500$
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex V2000 \(EP381UA#|X1000 \(DK454AV\)| 6715s|6820s
addquirk --quirk-s3-bios
endmatch

2
packages/sysutils/pm-utils/quirks/url
View File

@ -1 +1 @@
http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.gz
http://pm-utils.freedesktop.org/releases/pm-quirks-20100619.tar.gz

2
packages/sysutils/pm-utils/url
View File

@ -1 +1 @@
http://sources.openelec.tv/svn/pm-utils-20100428.tar.bz2
http://pm-utils.freedesktop.org/releases/pm-utils-1.4.0.tar.gz

24
packages/sysutils/upower/install
View File

@ -9,31 +9,31 @@ $SCRIPTS/install dbus-glib
$SCRIPTS/install polkit
$SCRIPTS/install pm-utils
mkdir -p $INSTALL/etc
cp -P $PKG_BUILD/etc/UPower.conf $INSTALL/etc
mkdir -p $INSTALL/etc/UPower
cp $PKG_BUILD/etc/UPower.conf $INSTALL/etc/UPower
mkdir -p $INSTALL/etc/dbus-1/system.d
cp -P $PKG_BUILD/src/org.freedesktop.UPower.conf $INSTALL/etc/dbus-1/system.d
cp $PKG_BUILD/src/org.freedesktop.UPower.conf $INSTALL/etc/dbus-1/system.d
mkdir -p $INSTALL/usr/bin
cp -P $PKG_BUILD/tools/.libs/upower $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/upower $INSTALL/usr/bin
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/devkit-power-gobject/.libs/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/libupower-glib/.libs/*.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/lib/upower
cp -P $PKG_BUILD/src/.libs/upowerd $INSTALL/usr/lib/upower
cp $PKG_BUILD/src/.libs/upowerd $INSTALL/usr/lib/upower
mkdir -p $INSTALL/usr/share/dbus-1/interfaces
cp -P $PKG_BUILD/src/org.freedesktop.UPower.Device.xml $INSTALL/usr/share/dbus-1/interfaces
cp -P $PKG_BUILD/src/org.freedesktop.UPower.QoS.xml $INSTALL/usr/share/dbus-1/interfaces
cp -P $PKG_BUILD/src/org.freedesktop.UPower.Wakeups.xml $INSTALL/usr/share/dbus-1/interfaces
cp -P $PKG_BUILD/src/org.freedesktop.UPower.xml $INSTALL/usr/share/dbus-1/interfaces
cp $PKG_BUILD/src/org.freedesktop.UPower.Device.xml $INSTALL/usr/share/dbus-1/interfaces
cp $PKG_BUILD/src/org.freedesktop.UPower.QoS.xml $INSTALL/usr/share/dbus-1/interfaces
cp $PKG_BUILD/src/org.freedesktop.UPower.Wakeups.xml $INSTALL/usr/share/dbus-1/interfaces
cp $PKG_BUILD/src/org.freedesktop.UPower.xml $INSTALL/usr/share/dbus-1/interfaces
mkdir -p $INSTALL/usr/share/dbus-1/system-services
cp -P $PKG_BUILD/src/org.freedesktop.UPower.service $INSTALL/usr/share/dbus-1/system-services
cp $PKG_BUILD/src/org.freedesktop.UPower.service $INSTALL/usr/share/dbus-1/system-services
mkdir -p $INSTALL/usr/share/polkit-1/actions
cp -P $PKG_BUILD/policy/org.freedesktop.upower.policy $INSTALL/usr/share/polkit-1/actions
cp -P $PKG_BUILD/policy/org.freedesktop.upower.qos.policy $INSTALL/usr/share/polkit-1/actions
cp $PKG_BUILD/policy/org.freedesktop.upower.policy $INSTALL/usr/share/polkit-1/actions
cp $PKG_BUILD/policy/org.freedesktop.upower.qos.policy $INSTALL/usr/share/polkit-1/actions

3
packages/sysutils/util-linux-ng/build
View File

@ -19,4 +19,7 @@ make -C mount
make -C shlibs
make -C misc-utils blkid
# needed by pm-utils
make -C sys-utils flock
$MAKEINSTALL -C shlibs

3
packages/sysutils/util-linux-ng/install
View File

@ -15,3 +15,6 @@ mkdir -p $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libblkid.so*T
cp -PR $PKG_BUILD/shlibs/uuid/src/.libs/libuuid.so* $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libuuid.so*T
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/sys-utils/flock $INSTALL/usr/bin

38
packages/web/curl/build
View File

@ -16,14 +16,52 @@ cd $PKG_BUILD
--disable-static \
--enable-shared \
--disable-debug \
--enable-optimize \
--enable-warnings \
--disable-curldebug \
--disable-ares \
--enable-largefile \
--enable-http \
--enable-ftp \
--enable-file \
--disable-ldap \
--disable-ldaps \
--disable-rtsp \
--enable-proxy \
--disable-dict \
--enable-telnet \
--enable-tftp \
--disable-pop3 \
--disable-imap \
--disable-smtp \
--disable-manual \
--enable-libgcc \
--disable-ipv6 \
--enable-nonblocking \
--enable-threaded-resolver \
--enable-verbose \
--disable-sspi \
--enable-crypto-auth \
--enable-cookies \
--enable-hidden-symbols \
--disable-soname-bump \
--with-gnu-ld \
--without-krb4 \
--without-spnego \
--without-gssapi \
--with-ssl \
--with-zlib \
--without-egd-socket \
--enable-thread \
--with-random=/dev/urandom \
--without-gnutls \
--without-polarssl \
--without-nss \
--with-ca-bundle="/etc/ssl/certs/ca-bundle.crt" \
--without-ca-path \
--without-libssh2 \
--with-librtmp \
--without-libidn \
make

6
packages/x11/data/xkeyboard-config/build
View File

@ -5,8 +5,6 @@
$SCRIPTS/build toolchain
$SCRIPTS/build xkbcomp
SRC_DIR=`ls -d $ROOT/$PKG_BUILD`
cd $PKG_BUILD
XKBCOMP="/usr/bin/xkbcomp" \
./configure --host=$TARGET_NAME \
@ -15,8 +13,8 @@ XKBCOMP="/usr/bin/xkbcomp" \
--sysconfdir=/etc \
--enable-compat-rules \
--with-xkb-base=$XORG_PATH_XKB \
--disable-xkbcomp-symlink \
--with-xkb-rules-symlink=xorg
make
make DESTDIR=$SRC_DIR/.install install
make DESTDIR=`pwd`/.install install

2
packages/x11/data/xkeyboard-config/install
View File

@ -3,4 +3,4 @@
. config/options
mkdir -p $INSTALL/$XORG_PATH_XKB
cp -PR $PKG_BUILD/.install/$XORG_PATH_XKB/* $INSTALL/$XORG_PATH_XKB
cp -R $PKG_BUILD/.install/$XORG_PATH_XKB/* $INSTALL/$XORG_PATH_XKB

2
packages/x11/data/xkeyboard-config/url
View File

@ -1 +1 @@
http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.8.tar.bz2
http://people.freedesktop.org/~svu/xkeyboard-config-1.9.tar.bz2

33
packages/x11/driver/xf86-video-intel/patches/intel-2.11-no-pageflipping.diff
View File

@ -1,33 +0,0 @@
diff -up xf86-video-intel-2.11.0/src/drmmode_display.c.no-flip xf86-video-intel-2.11.0/src/drmmode_display.c
--- xf86-video-intel-2.11.0/src/drmmode_display.c.no-flip 2010-05-03 15:30:19.000000000 -0400
+++ xf86-video-intel-2.11.0/src/drmmode_display.c 2010-05-03 15:30:59.000000000 -0400
@@ -1504,10 +1504,15 @@ Bool drmmode_pre_init(ScrnInfoPtr scrn,
gp.value = &has_flipping;
(void)drmCommandWriteRead(intel->drmSubFD, DRM_I915_GETPARAM, &gp,
sizeof(gp));
+
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
+ "Pageflipping %s in kernel, %s disabled in X\n",
+ has_flipping ? "enabled" : "disabled",
+ has_flipping ? "but" : "and");
if (has_flipping) {
xf86DrvMsg(scrn->scrnIndex, X_INFO,
- "Kernel page flipping support detected, enabling\n");
- intel->use_pageflipping = TRUE;
+ "Don't panic: https://bugzilla.redhat.com/588421\n");
+ intel->use_pageflipping = FALSE;
drmmode->flip_count = 0;
drmmode->event_context.version = DRM_EVENT_CONTEXT_VERSION;
drmmode->event_context.vblank_handler = drmmode_vblank_handler;
diff -up xf86-video-intel-2.11.0/src/i830_dri.c.no-flip xf86-video-intel-2.11.0/src/i830_dri.c
--- xf86-video-intel-2.11.0/src/i830_dri.c.no-flip 2010-03-29 14:23:02.000000000 -0400
+++ xf86-video-intel-2.11.0/src/i830_dri.c 2010-05-03 15:30:19.000000000 -0400
@@ -1013,7 +1013,7 @@ Bool I830DRI2ScreenInit(ScreenPtr screen
info.CopyRegion = I830DRI2CopyRegion;
#if DRI2INFOREC_VERSION >= 4
- if (intel->use_pageflipping) {
+ if (intel->use_pageflipping || 1) {
info.version = 4;
info.ScheduleSwap = I830DRI2ScheduleSwap;
info.GetMSC = I830DRI2GetMSC;

2
packages/x11/driver/xf86-video-intel/url
View File

@ -1 +1 @@
http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.11.0.tar.bz2
http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.11.901.tar.bz2

2
packages/x11/xserver/xorg-server/url
View File

@ -1 +1 @@
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.8.1.tar.bz2
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.8.1.902.tar.bz2