summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/SDL_gfx/Makefile2
-rw-r--r--package/SDL_ttf/Makefile2
-rw-r--r--package/alsa-lib/Makefile2
-rw-r--r--package/alsa-utils/Makefile2
-rw-r--r--package/firefox/Makefile9
-rwxr-xr-xpackage/firefox/files/firefox2
-rw-r--r--package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc13
-rw-r--r--package/firefox/patches/patch-js_src_Makefile_in11
-rw-r--r--package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc23
-rw-r--r--package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp14
-rw-r--r--package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_cc23
-rw-r--r--package/firefox/patches/patch-tools_profiler_platform-linux_cc11
-rw-r--r--package/firefox/patches/patch-xpcom_ds_nsMathUtils_h11
-rw-r--r--package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp16
-rw-r--r--package/firefox/patches/patch-xpcom_threads_nsThread_cpp17
-rw-r--r--package/madplay/Makefile2
-rw-r--r--package/motion/Makefile2
-rw-r--r--package/mpd/Makefile2
-rw-r--r--package/mpg123/Makefile2
-rw-r--r--package/sdl-image/Makefile2
-rw-r--r--package/sdl/Makefile2
-rw-r--r--package/sox/Makefile2
22 files changed, 167 insertions, 5 deletions
diff --git a/package/SDL_gfx/Makefile b/package/SDL_gfx/Makefile
index 4d6183595..756d9d001 100644
--- a/package/SDL_gfx/Makefile
+++ b/package/SDL_gfx/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= sdl
PKG_URL:= http://www.ferzkopp.net/joomla/content/view/19/14/
PKG_SITES:= http://www.ferzkopp.net/Software/SDL_gfx-2.0/
+PKG_ARCH_DEPENDS:= !m68k
+
PKG_SUBPKGS:= LIBSDL_GFX LIBSDL_GFX_DEV
PKGSD_LIBSDL_GFX_DEV:= development files for SDL_gfx
PKGSC_LIBSDL_GFX_DEV:= devel
diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile
index 68e60aaf9..d6025f2fb 100644
--- a/package/SDL_ttf/Makefile
+++ b/package/SDL_ttf/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= sdl freetype gettext-tiny
PKG_URL:= http://www.libsdl.org/projects/SDL_ttf/
PKG_SITES:= http://www.libsdl.org/projects/SDL_ttf/release/
+PKG_ARCH_DEPENDS:= !m68k
+
PKG_SUBPKGS:= LIBSDL_TTF LIBSDL_TTF_DEV
PKGSD_LIBSDL_TTF_DEV:= development files
PKGSC_LIBSDL_TTF_DEV:= devel
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 3be639ffa..9e1c0bedd 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= libs
PKG_URL:= http://www.alsa-project.org/
PKG_SITES:= ftp://ftp.alsa-project.org/pub/lib/
+PKG_ARCH_DEPENDS:= !m68k
+
PKG_SUBPKGS:= ALSA_LIB ALSA_LIB_DEV
PKGSD_ALSA_LIB_DEV:= development files for ALSA
PKGSC_ALSA_LIB_DEV:= devel
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 8c0f5922e..16520ec54 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= alsa-lib
PKG_URL:= http://www.alsa-project.org/
PKG_SITES:= ftp://ftp.alsa-project.org/pub/utils/
+PKG_ARCH_DEPENDS:= !m68k
+
PKG_FLAVOURS_ALSA_UTILS:=WITH_ALSAMIXER
PKGFS_WITH_ALSAMIXER:= libncurses
PKGFD_WITH_ALSAMIXER:= include alsamixer ncurses applet
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 621f46e45..2e72e0073 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -5,17 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= firefox
PKG_VERSION:= 24.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 06a4c0fe8d3a979aea2fce8d0fdbf328
PKG_DESCR:= graphical webbrowser
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libpthread alsa-lib glib libgtk libpng libtiff libxcursor libffi
PKG_DEPENDS+= nspr nss libjpeg-turbo libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme
PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf librt libgcc
-PKG_DEPENDS+= harfbuzz mesalib libvpx libbz2 ca-certificates
+PKG_DEPENDS+= harfbuzz mesalib libvpx libbz2 ca-certificates libevent
PKG_BUILDDEP:= alsa-lib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
PKG_BUILDDEP+= nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme
-PKG_BUILDDEP+= libvpx pango gettext-tiny bzip2
+PKG_BUILDDEP+= libvpx pango gettext-tiny bzip2 libevent
PKG_URL:= http://www.mozilla.org/
PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
PKG_NOPARALLEL:= 1
@@ -66,6 +66,7 @@ CONFIGURE_ARGS+= --enable-application=browser \
--with-system-nspr \
--with-system-pango \
--with-system-libvpx \
+ --with-system-libevent=${STAGING_TARGET_DIR}/usr \
--enable-system-ffi \
--enable-system-sqlite \
--disable-libnotify \
@@ -115,7 +116,7 @@ firefox-install:
$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib
$(CP) $(WRKINST)/usr/lib/firefox-${PKG_VERSION} \
$(IDIR_FIREFOX)/usr/lib
- $(CP) $(WRKINST)/usr/bin/firefox \
+ $(CP) ./files/firefox \
$(IDIR_FIREFOX)/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/firefox/files/firefox b/package/firefox/files/firefox
new file mode 100755
index 000000000..fd372f5b5
--- /dev/null
+++ b/package/firefox/files/firefox
@@ -0,0 +1,2 @@
+#!/bin/sh
+env LD_LIBRARY_PATH=/usr/lib/firefox-24.0 /usr/lib/firefox-24.0/firefox
diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc
new file mode 100644
index 000000000..53abb7933
--- /dev/null
+++ b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc
@@ -0,0 +1,13 @@
+--- mozilla-release.orig/ipc/chromium/src/base/debug_util_posix.cc 2013-09-11 01:15:04.000000000 +0200
++++ mozilla-release/ipc/chromium/src/base/debug_util_posix.cc 2013-10-14 18:04:28.000000000 +0200
+@@ -5,7 +5,9 @@
+ #include "build/build_config.h"
+ #include "base/debug_util.h"
+
+-#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID))
++#include <features.h>
++
++#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID) && !defined(__UCLIBC__))
+
+ #include <errno.h>
+ #include <fcntl.h>
diff --git a/package/firefox/patches/patch-js_src_Makefile_in b/package/firefox/patches/patch-js_src_Makefile_in
new file mode 100644
index 000000000..cb1b863f9
--- /dev/null
+++ b/package/firefox/patches/patch-js_src_Makefile_in
@@ -0,0 +1,11 @@
+--- mozilla-release.orig/js/src/Makefile.in 2013-09-11 01:15:04.000000000 +0200
++++ mozilla-release/js/src/Makefile.in 2013-10-14 12:36:25.000000000 +0200
+@@ -112,7 +112,7 @@ ifdef JS_HAS_CTYPES
+ VPATH += $(srcdir)/ctypes
+
+ ifdef MOZ_NATIVE_FFI
+-LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
++LOCAL_INCLUDES =
+ else
+ LOCAL_INCLUDES = -Ictypes/libffi/include
+ endif
diff --git a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc
new file mode 100644
index 000000000..6083460c5
--- /dev/null
+++ b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc
@@ -0,0 +1,23 @@
+--- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc 2013-09-11 01:15:18.000000000 +0200
++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc 2013-10-15 12:21:59.000000000 +0200
+@@ -38,11 +38,6 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo
+ WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
+ "Available number of cores:%d", number_of_cores_);
+
+-#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK)
+- number_of_cores_ = get_nprocs();
+- WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
+- "Available number of cores:%d", number_of_cores_);
+-
+ #elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
+ int name[] = {
+ CTL_HW,
+@@ -63,8 +58,6 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo
+ "Failed to get number of cores");
+ number_of_cores_ = 1;
+ }
+-#elif defined(_SC_NPROCESSORS_ONLN)
+- _numberOfCores = sysconf(_SC_NPROCESSORS_ONLN);
+ #else
+ WEBRTC_TRACE(kTraceWarning, kTraceUtility, -1,
+ "No function to get number of cores");
diff --git a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp
new file mode 100644
index 000000000..7c262e5ff
--- /dev/null
+++ b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp
@@ -0,0 +1,14 @@
+--- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp 2013-09-11 01:15:18.000000000 +0200
++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp 2013-10-15 16:05:38.000000000 +0200
+@@ -21,6 +21,11 @@ Scott McMurray
+ #include "constants.hpp"
+ #include <cstring>
+
++#include <features.h>
++#if defined(__UCLIBC__)
++#undef getchar
++#endif
++
+ namespace boost {
+ namespace detail {
+ //This only works on unsigned data types
diff --git a/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_cc b/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_cc
new file mode 100644
index 000000000..2b27e8c72
--- /dev/null
+++ b/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_cc
@@ -0,0 +1,23 @@
+--- mozilla-release.orig/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2013-09-11 01:15:25.000000000 +0200
++++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2013-10-17 10:55:17.000000000 +0200
+@@ -34,7 +34,20 @@
+ #include "common/stabs_reader.h"
+
+ #include <assert.h>
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ #include <stab.h>
++#else
++#define __define_stab(NAME, CODE, STRING) NAME=CODE,
++enum __stab_debug_code
++{
++__define_stab (N_FUN, 0x24, "FUN")
++__define_stab (N_SLINE, 0x44, "SLINE")
++__define_stab (N_SOL, 0x84, "SOL")
++__define_stab (N_SO, 0x64, "SO")
++LAST_UNUSED_STAB_CODE
++};
++#undef __define_stab
++#endif
+ #include <string.h>
+
+ #include <string>
diff --git a/package/firefox/patches/patch-tools_profiler_platform-linux_cc b/package/firefox/patches/patch-tools_profiler_platform-linux_cc
new file mode 100644
index 000000000..10287f11c
--- /dev/null
+++ b/package/firefox/patches/patch-tools_profiler_platform-linux_cc
@@ -0,0 +1,11 @@
+--- mozilla-release.orig/tools/profiler/platform-linux.cc 2013-09-11 01:15:26.000000000 +0200
++++ mozilla-release/tools/profiler/platform-linux.cc 2013-10-16 10:09:54.000000000 +0200
+@@ -53,7 +53,7 @@
+ #include <sys/stat.h> // open
+ #include <fcntl.h> // open
+ #include <unistd.h> // sysconf
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && ! defined(__UCLIBC__)
+ #include <execinfo.h> // backtrace, backtrace_symbols
+ #endif // def __GLIBC__
+ #include <strings.h> // index
diff --git a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h
new file mode 100644
index 000000000..5a1a81c06
--- /dev/null
+++ b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h
@@ -0,0 +1,11 @@
+--- mozilla-release.orig/xpcom/ds/nsMathUtils.h 2013-09-11 01:15:27.000000000 +0200
++++ mozilla-release/xpcom/ds/nsMathUtils.h 2013-10-14 14:05:43.000000000 +0200
+@@ -98,7 +98,7 @@ inline NS_HIDDEN_(bool) NS_finite(double
+ #ifdef WIN32
+ // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
+ return !!_finite(d);
+-#elif defined(XP_DARWIN)
++#elif defined(XP_DARWIN) || defined(__UCLIBC__)
+ // Darwin has deprecated |finite| and recommends |isfinite|. The former is
+ // not present in the iOS SDK.
+ return std::isfinite(d);
diff --git a/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp b/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp
new file mode 100644
index 000000000..e9c2a28ad
--- /dev/null
+++ b/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp
@@ -0,0 +1,16 @@
+--- mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp 2013-09-11 01:15:27.000000000 +0200
++++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp 2013-10-14 14:33:08.000000000 +0200
+@@ -1256,8 +1256,13 @@ nsLocalFile::GetDiskSpaceAvailable(int64
+ && dq.dqb_bhardlimit)
+ {
+ int64_t QuotaSpaceAvailable = 0;
++#if defined(__UCLIBC__)
++ if (dq.dqb_bhardlimit > dq.dqb_curblocks)
++ QuotaSpaceAvailable = PRInt64(fs_buf.f_bsize * (dq.dqb_bhardlimit - dq.dqb_curblocks));
++#else
+ if (dq.dqb_bhardlimit > dq.dqb_curspace)
+ QuotaSpaceAvailable = int64_t(fs_buf.F_BSIZE * (dq.dqb_bhardlimit - dq.dqb_curspace));
++#endif
+ if(QuotaSpaceAvailable < *aDiskSpaceAvailable) {
+ *aDiskSpaceAvailable = QuotaSpaceAvailable;
+ }
diff --git a/package/firefox/patches/patch-xpcom_threads_nsThread_cpp b/package/firefox/patches/patch-xpcom_threads_nsThread_cpp
new file mode 100644
index 000000000..eb7d1f21a
--- /dev/null
+++ b/package/firefox/patches/patch-xpcom_threads_nsThread_cpp
@@ -0,0 +1,17 @@
+--- mozilla-release.orig/xpcom/threads/nsThread.cpp 2013-09-11 01:15:27.000000000 +0200
++++ mozilla-release/xpcom/threads/nsThread.cpp 2013-10-14 15:49:25.000000000 +0200
+@@ -20,11 +20,13 @@
+ _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) && \
+ !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
+
++#include <features.h>
+ #if defined(XP_UNIX) && !defined(ANDROID) && !defined(DEBUG) && HAVE_UALARM \
+ && defined(_GNU_SOURCE)
+-# define MOZ_CANARY
+ # include <unistd.h>
++#if !defined(__UCLIBC__)
+ # include <execinfo.h>
++#endif
+ # include <signal.h>
+ # include <fcntl.h>
+ # include "nsXULAppAPI.h"
diff --git a/package/madplay/Makefile b/package/madplay/Makefile
index d089b8358..614264b2e 100644
--- a/package/madplay/Makefile
+++ b/package/madplay/Makefile
@@ -15,6 +15,8 @@ PKG_URL:= http://www.underbit.com/products/mad
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \
ftp://ftp.mars.org/pub/mpeg/
+PKG_ARCH_DEPENDS:= !m68k
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MADPLAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/motion/Makefile b/package/motion/Makefile
index 08c285497..78bb0b6eb 100644
--- a/package/motion/Makefile
+++ b/package/motion/Makefile
@@ -15,6 +15,8 @@ PKG_BUILDDEP:= jpeg sdl
PKG_URL:= http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=motion/}
+PKG_ARCH_DEPENDS:= !m68k
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MOTION,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index dbc97bf83..2d97f9f0b 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -15,7 +15,7 @@ PKG_BUILDDEP:= glib
PKG_URL:= http://www.musicpd.org/
PKG_SITES:= http://www.musicpd.org/download/mpd/0.17/
-PKG_ARCH_DEPENDS:= !avr32
+PKG_ARCH_DEPENDS:= !avr32 !m68k
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile
index ca6ec0539..f66d17715 100644
--- a/package/mpg123/Makefile
+++ b/package/mpg123/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= alsa-lib
PKG_URL:= http://www.mpg123.de/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mpg123/}
+PKG_ARCH_DEPENDS:= !m68k
+
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile
index a87760694..00f5b5a69 100644
--- a/package/sdl-image/Makefile
+++ b/package/sdl-image/Makefile
@@ -15,6 +15,8 @@ PKG_URL:= http://www.libsdl.org/
PKG_SITES:= http://www.libsdl.org/projects/SDL_image/release/
PKG_NEED_CXX:= 1
+PKG_ARCH_DEPENDS:= !m68k
+
PKG_SUBPKGS:= LIBSDL_IMAGE LIBSDL_IMAGE_DEV
PKGSD_LIBSDL_IMAGE_DEV:=development files for sdlimage
PKGSC_LIBSDL_IMAGE_DEV:=devel
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index f911ee0f7..d08555c60 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= libusb alsa-lib libX11 libXext
PKG_URL:= http://www.libsdl.org/
PKG_SITES:= http://www.libsdl.org/release/
+PKG_ARCH_DEPENDS:= !m68k
+
PKG_FLAVOURS_LIBSDL:= WITH_TSLIB
PKGFD_WITH_TSLIB:= enable touchscreen support
PKGFS_WITH_TSLIB:= tslib
diff --git a/package/sox/Makefile b/package/sox/Makefile
index 2f5436146..d5aca61e7 100644
--- a/package/sox/Makefile
+++ b/package/sox/Makefile
@@ -14,6 +14,8 @@ PKG_DEPENDS:= zlib libmad liblame alsa-lib libid3tag
PKG_URL:= http://sox.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sox/}
+PKG_ARCH_DEPENDS:= !m68k
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,SOX,sox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 11:09:27 +0000