jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'other-build-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot

Browse Source
This commit is contained in:
Peter Korsgaard 2010-07-18 23:39:03 +02:00
commit b70653609b
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CHANGES
View File

@ -14,16 +14,16 @@
New packages: cgilua, copas, coxpcall, ffmpeg, libsvgtiny, New packages: cgilua, copas, coxpcall, ffmpeg, libsvgtiny,
luafilesystem, luasocket, rings, wsapi, xavante, xterm luafilesystem, luasocket, rings, wsapi, xavante, xterm
Updated/fixed packages: berkeleydb, bash, blackbox, busybox, Updated/fixed packages: alsa-lib, berkeleydb, bash, blackbox,
bzip2, cdrkit, cmake, dash, dhcp, dialog, diffutils, distcc, busybox, bzip2, cdrkit, cmake, dash, dhcp, dialog, diffutils,
dmalloc, dnsmasq, dropbear, e2fsprogs, fbv, file, fontconfig, distcc, dmalloc, dnsmasq, dropbear, e2fsprogs, fbv, file,
gawk, gstreamer, gzip, intltool, ipsec-tools, iptables, fontconfig, gawk, gstreamer, gzip, intltool, ipsec-tools,
libart, libcgi, libfuse, libgpg-error, libidn, liblockfile, iptables, libart, libcgi, libfuse, libgpg-error, libidn,
libpng, links, linux-fusion, lmbench, lrzsz, make, liblockfile, libpng, links, linux-fusion, lmbench, lrzsz,
module-init-tools, mysql_client, nbd, ncurses, netperf, make, module-init-tools, mysql_client, nbd, ncurses, neon,
ntfsprogs, openssl, php, qt, quagga, sqlite, sdl, sdl_mixer, netperf, ntfsprogs, openssl, php, qt, quagga, sqlite, sdl,
sdl_sound, sdl_ttf, squashfs, tn5250, tremor, usbutils, sdl_mixer, sdl_sound, sdl_ttf, squashfs, tn5250, tremor,
xkeyboard-config, xserver_xorg-server, xvkbd usbutils, xkeyboard-config, xserver_xorg-server, xvkbd
Removed packages: modutils, portage, rxvt Removed packages: modutils, portage, rxvt

4
package/multimedia/alsa-lib/alsa-lib.mk
View File

@ -54,7 +54,9 @@ ALSA_LIB_CFLAGS+=-DAVR32_INLINE_BUG
endif endif
ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y) ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
ALSA_LIB_CONF_OPT += --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) ALSA_LIB_CONF_OPT += \
--with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \
--with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
ALSA_LIB_CFLAGS+=-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) ALSA_LIB_CFLAGS+=-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
ALSA_LIB_DEPENDENCIES = libpython ALSA_LIB_DEPENDENCIES = libpython
else else

1
package/neon/neon.mk
View File

@ -14,6 +14,7 @@ NEON_DEPENDENCIES:=host-pkg-config
ifeq ($(BR2_PACKAGE_NEON_LIBXML2),y) ifeq ($(BR2_PACKAGE_NEON_LIBXML2),y)
NEON_CONF_OPT+=--with-libxml2=yes NEON_CONF_OPT+=--with-libxml2=yes
NEON_CONF_OPT+=--with-expat=no NEON_CONF_OPT+=--with-expat=no
NEON_CONF_ENV+=ac_cv_prog_XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config
NEON_DEPENDENCIES+=libxml2 NEON_DEPENDENCIES+=libxml2
endif endif
ifeq ($(BR2_PACKAGE_NEON_ZLIB),y) ifeq ($(BR2_PACKAGE_NEON_ZLIB),y)