head 1.5; access; symbols OPENPKG_E1_MP_HEAD:1.5 OPENPKG_E1_MP:1.5 OPENPKG_E1_MP_2_STABLE:1.5.2.2 OPENPKG_E1_FP:1.5.2.2 OPENPKG_2_STABLE_MP:1.5 OPENPKG_2_STABLE_20061018:1.5.2.2 OPENPKG_2_STABLE:1.5.0.2 OPENPKG_CW_FP:1.5 OPENPKG_1_STABLE_MP:1.3; locks; strict; comment @# @; 1.5 date 2003.09.05.09.39.36; author ms; state Exp; branches 1.5.2.1; next 1.4; 1.4 date 2003.08.04.06.19.52; author ms; state Exp; branches; next 1.3; 1.3 date 2003.06.29.13.50.11; author mlelstv; state Exp; branches; next 1.2; 1.2 date 2003.01.31.11.24.41; author rse; state dead; branches; next 1.1; 1.1 date 2003.01.31.09.35.16; author ps; state Exp; branches; next ; 1.5.2.1 date 2003.09.05.09.39.36; author rse; state dead; branches; next 1.5.2.2; commitid iZxwRSmmWscPXUQr; 1.5.2.2 date 2006.10.16.14.58.29; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.5 log @upgrading package: xmms 1.2.7 -> 1.2.8 @ text @diff -Naur xmms-1.2.8.orig/xmms/skin.c xmms-1.2.8/xmms/skin.c --- xmms-1.2.8.orig/xmms/skin.c Mon Mar 17 15:49:08 2003 +++ xmms-1.2.8/xmms/skin.c Fri Sep 5 11:08:47 2003 @@@@ -600,10 +600,10 @@@@ unzip = getenv("UNZIPCMD"); if (!unzip) - unzip = "unzip"; + unzip = "@@l_unzip@@"; tar = getenv("TARCMD"); if (!tar) - tar = "tar"; + tar = "@@l_tar@@"; if ((ending = strrchr(path, '.')) == NULL) return NULL; @@@@ -621,9 +621,9 @@@@ if (!strcasecmp(ending, ".zip") || !strcasecmp(ending, ".wsz")) tmp = g_strdup_printf("%s >/dev/null -o -j \"%s\" -d %s", unzip, escaped, tempdir); if (!strcasecmp(ending, ".tgz") || !strcasecmp(ending, ".gz")) - tmp = g_strdup_printf("%s >/dev/null xzf \"%s\" -C %s", tar, escaped, tempdir); + tmp = g_strdup_printf("@@l_gzip@@ -dc \"%s\" | %s >/dev/null xf - -C %s", escaped, tar, tempdir); if (!strcasecmp(ending, ".bz2")) - tmp = g_strdup_printf("bzip2 -dc \"%s\" | %s >/dev/null xf - -C %s", escaped, tar, tempdir); + tmp = g_strdup_printf("@@l_bzip2@@ -dc \"%s\" | %s >/dev/null xf - -C %s", escaped, tar, tempdir); if (!strcasecmp(ending, ".tar")) tmp = g_strdup_printf("%s >/dev/null xf \"%s\" -C %s", tar, escaped, tempdir); @ 1.5.2.1 log @file xmms.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:58:29 +0000 @ text @d1 28 @ 1.5.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 28 diff -Naur xmms-1.2.8.orig/xmms/skin.c xmms-1.2.8/xmms/skin.c --- xmms-1.2.8.orig/xmms/skin.c Mon Mar 17 15:49:08 2003 +++ xmms-1.2.8/xmms/skin.c Fri Sep 5 11:08:47 2003 @@@@ -600,10 +600,10 @@@@ unzip = getenv("UNZIPCMD"); if (!unzip) - unzip = "unzip"; + unzip = "@@l_unzip@@"; tar = getenv("TARCMD"); if (!tar) - tar = "tar"; + tar = "@@l_tar@@"; if ((ending = strrchr(path, '.')) == NULL) return NULL; @@@@ -621,9 +621,9 @@@@ if (!strcasecmp(ending, ".zip") || !strcasecmp(ending, ".wsz")) tmp = g_strdup_printf("%s >/dev/null -o -j \"%s\" -d %s", unzip, escaped, tempdir); if (!strcasecmp(ending, ".tgz") || !strcasecmp(ending, ".gz")) - tmp = g_strdup_printf("%s >/dev/null xzf \"%s\" -C %s", tar, escaped, tempdir); + tmp = g_strdup_printf("@@l_gzip@@ -dc \"%s\" | %s >/dev/null xf - -C %s", escaped, tar, tempdir); if (!strcasecmp(ending, ".bz2")) - tmp = g_strdup_printf("bzip2 -dc \"%s\" | %s >/dev/null xf - -C %s", escaped, tar, tempdir); + tmp = g_strdup_printf("@@l_bzip2@@ -dc \"%s\" | %s >/dev/null xf - -C %s", escaped, tar, tempdir); if (!strcasecmp(ending, ".tar")) tmp = g_strdup_printf("%s >/dev/null xf \"%s\" -C %s", tar, escaped, tempdir); @ 1.4 log @Correctly build and install plugins as shared objects, make sure out compression tools are used, include a set of custom skins, and correctly test the operating system and hardware architecture when configuring @ text @d1 4 a4 35 diff -Naur xmms-1.2.7.orig/configure xmms-1.2.7/configure --- xmms-1.2.7.orig/configure 2003-08-03 00:44:27.915287000 +0200 +++ xmms-1.2.7/configure 2003-08-03 00:59:20.419469000 +0200 @@@@ -11885,10 +11885,13 @@@@ *-hpux-*) ARCH_DEFINES="-DHPUX" ;; - *-sun-*) - have_solaris=yes - ;; esac +case "$host_os" in + *solaris*) + have_solaris=yes + ;; +esac + diff -Naur xmms-1.2.7.orig/libxmms/util.c xmms-1.2.7/libxmms/util.c --- xmms-1.2.7.orig/libxmms/util.c 2003-08-03 00:59:03.308605000 +0200 +++ xmms-1.2.7/libxmms/util.c 2003-08-03 00:09:20.631805000 +0200 @@@@ -11,6 +11,7 @@@@ #endif #ifdef __FreeBSD__ +#include #include #endif diff -Naur xmms-1.2.7.orig/xmms/skin.c xmms-1.2.7/xmms/skin.c --- xmms-1.2.7.orig/xmms/skin.c 2003-08-03 18:41:49.234488000 +0200 +++ xmms-1.2.7/xmms/skin.c 2003-08-03 18:43:11.513838000 +0200 @@@@ -562,10 +562,10 @@@@ d17 1 a17 1 @@@@ -581,9 +581,9 @@@@ d19 1 a19 1 tmp = g_strdup_printf("%s >/dev/null -o -j \"%s\" -d %s", unzip, path, tempdir); d21 2 a22 2 - tmp = g_strdup_printf("%s >/dev/null xzf \"%s\" -C %s", tar, path, tempdir); + tmp = g_strdup_printf("@@l_gzip@@ -dc \"%s\" | %s >/dev/null xf - -C %s", path, tar, tempdir); d24 2 a25 2 - tmp = g_strdup_printf("bzip2 -dc \"%s\" | %s >/dev/null xf - -C %s", path, tar, tempdir); + tmp = g_strdup_printf("@@l_bzip2@@ -dc \"%s\" | %s >/dev/null xf - -C %s", path, tar, tempdir); d27 1 a27 1 tmp = g_strdup_printf("%s >/dev/null xf \"%s\" -C %s", tar, path, tempdir); @ 1.3 log @fix building for FreeBSD5 @ text @d1 23 a23 2 --- libxmms/util.c.dist 2003-06-29 15:13:49.000000000 +0200 +++ libxmms/util.c 2003-06-29 15:14:07.000000000 +0200 d31 28 @ 1.2 log @- fix Release date - replace broken xmms.patch with better non-used "gcc -O2" optimization - remove C++ flags, because XMMS is C only - add XML support - explicitly disable support for problematic things @ text @d1 4 a4 5 --- Input/mpg123/fileinfo.c.orig Thu Jan 30 09:30:08 2003 +++ Input/mpg123/fileinfo.c Thu Jan 30 09:30:23 2003 @@@@ -130,9 +130,9 @@@@ va_list args; gchar tempstr[MAX_STR_LEN]; d6 4 a9 6 - va_start(args, str); - g_vsnprintf(tempstr, MAX_STR_LEN, str, args); - va_end(args); + //va_start(args, str); + //g_vsnprintf(tempstr, MAX_STR_LEN, str, args); + //va_end(args); a10 2 gtk_label_set_text(GTK_LABEL(label), tempstr); } @ 1.1 log @Appended xmms package. To work correct a gtk package update is required. @ text @@