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

Update various packages to make X run

Browse Source
This commit is contained in:
Ulf Samuelsson 2007-09-12 04:37:31 +00:00
parent 7521f37372
commit 5f17c052bc
12 changed files with 57 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/Makefile.autotools.in
View File

@ -147,7 +147,8 @@ $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
$(BUILD_DIR)/%/.stamp_patched:
$(call MESSAGE,"Patching")
$(if $($(PKG)_PATCH),toolchain/patch-kernel.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
$(Q)(if test -d package/$($(PKG)_NAME) ; then \
$(Q)(\
if test -d package/$($(PKG)_NAME) ; then \
if test "$(wildcard package/$($(PKG)_NAME)/$(NAMEVER)*.patch)" ; then \
toolchain/patch-kernel.sh $(@D) package/$($(PKG)_NAME) $(NAMEVER)\*.patch || exit 1 ; \
else \
@ -156,7 +157,17 @@ $(BUILD_DIR)/%/.stamp_patched:
toolchain/patch-kernel.sh $(@D) package/$($(PKG)_NAME)/$(NAMEVER) \*.patch || exit 1 ; \
fi; \
fi; \
fi)
else \
if test "$(wildcard package/x11r7/$($(PKG)_NAME)/$(NAMEVER)*.patch)" ; then \
toolchain/patch-kernel.sh $(@D) package/x11r7/$($(PKG)_NAME) $(NAMEVER)\*.patch || exit 1 ; \
else \
toolchain/patch-kernel.sh $(@D) package/x11r7/$($(PKG)_NAME) $($(PKG)_NAME)\*.patch || exit 1 ; \
if test -d package/x11r7/$($(PKG)_NAME)/$(NAMEVER) ; then \
toolchain/patch-kernel.sh $(@D) package/x11r7/$($(PKG)_NAME)/$(NAMEVER) \*.patch || exit 1 ; \
fi; \
fi; \
fi; \
)
ifeq ($(strip $(BR2_UPDATE_CONFIG)),y)
$(Q)(for file in config.guess config.sub; do \
for i in $$(find $(@D) -name $$file); do \

3
package/Makefile.in
View File

@ -237,6 +237,9 @@ endif
ifeq ($(strip $(BR2_PACKAGE_XORG)),y)
XSERVER+=xorg
endif
ifeq ($(strip $(BR2_PACKAGE_XORG7)),y)
XSERVER+=xserver_xorg-server
endif
ifeq ($(strip $(BR2_PACKAGE_XGGI)),y)
XSERVER+=xggi
endif

6
package/atk/atk.mk
View File

@ -82,6 +82,8 @@ $(ATK_DIR)/.configured: $(ATK_DIR)/.unpacked
ac_use_included_regex=no \
gl_cv_c_restrict=no \
ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
ac_cv_prog_F77=no \
ac_cv_prog_CXX=no \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(REAL_GNU_TARGET_NAME) \
@ -101,8 +103,8 @@ $(ATK_DIR)/.configured: $(ATK_DIR)/.unpacked
--enable-shared \
--enable-static \
--with-x \
--x-includes=$(STAGING_DIR)/usr/X11R6/include \
--x-libraries=$(STAGING_DIR)/usr/X11R6/lib \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--disable-glibtest \
--enable-explicit-deps=no \
--disable-debug \

2
package/cairo/Config.in
View File

@ -3,6 +3,8 @@ config BR2_PACKAGE_CAIRO
default n
select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_FONTCONFIG
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
help
Cairo is a 2D graphics library with support for multiple

6
package/cairo/cairo.mk
View File

@ -101,8 +101,8 @@ $(CAIRO_DIR)/.configured: $(CAIRO_DIR)/.unpacked
--enable-shared \
--enable-static \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include \
--x-libraries=$(STAGING_DIR)/lib \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--enable-ps=yes \
--enable-pdf=yes \
--enable-svg=no \
@ -128,7 +128,7 @@ $(TARGET_DIR)/lib/libcairo.so.2.9.3: $(STAGING_DIR)/lib/$(CAIRO_BINARY)
$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libcairo.so.2.*
touch -c $(TARGET_DIR)/lib/libcairo.so.2.9.3
cairo: uclibc gettext libintl pkgconfig libglib2 $(XSERVER) $(TARGET_DIR)/lib/libcairo.so.2.9.3
cairo: uclibc gettext libintl pkgconfig libglib2 zlib png fontconfig $(XSERVER) $(TARGET_DIR)/lib/libcairo.so.2.9.3
cairo-clean:
rm -f $(TARGET_DIR)/lib/$(CAIRO_BINARY)

4
package/gtk2-engines/gtk2-engines.mk
View File

@ -104,8 +104,8 @@ $(GTK2_ENGINES_DIR)/.configured: $(GTK2_ENGINES_DIR)/.unpacked
--mandir=/usr/man \
--infodir=/usr/info \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include \
--x-libraries=$(STAGING_DIR)/lib \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--disable-glibtest \
--enable-explicit-deps=no \
--disable-debug \

2
package/libglib2/libglib2.mk
View File

@ -83,6 +83,8 @@ $(LIBGLIB2_DIR)/.configured: $(LIBGLIB2_DIR)/.unpacked
ac_use_included_regex=no \
gl_cv_c_restrict=no \
ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
ac_cv_prog_F77=no \
ac_cv_prog_CXX=no \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \

4
package/libgtk12/libgtk12.mk
View File

@ -44,8 +44,8 @@ $(LIBGTK12_DIR)/.configured: $(LIBGTK12_DIR)/.unpacked
--mandir=/usr/man \
--infodir=/usr/info \
$(DISABLE_NLS) \
--x-includes=$(STAGING_DIR)/usr/X11R6/include \
--x-libraries=$(STAGING_DIR)/usr/X11R6/lib \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--enable-debug=no \
--disable-glibtest \
--disable-xim \

6
package/libgtk2/libgtk2.mk
View File

@ -70,6 +70,8 @@ LIBGTK2_BUILD_ENV= \
ac_use_included_regex=no \
gl_cv_c_restrict=no \
ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
ac_cv_prog_F77=no \
ac_cv_prog_CXX=no \
ac_cv_path_CUPS_CONFIG=no
@ -111,8 +113,8 @@ $(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked
--enable-shared \
--enable-static \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include \
--x-libraries=$(STAGING_DIR)/lib \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--disable-glibtest \
--enable-explicit-deps=no \
--disable-debug \

36
package/matchbox/matchbox.mk
View File

@ -154,15 +154,15 @@ MATCHBOX_LIB_OPTS:=
MATCHBOX_LIB_DEPS:=
MATCHBOX_WM_OPTS:=
MATCHBOX_WM_DEPS:=x11r7-libxdamage
MATCHBOX_WM_DEPS+=x11r7-libxcursor
MATCHBOX_WM_DEPS:=xlib_libXdamage
MATCHBOX_WM_DEPS+=xlib_libXcursor
ifeq ($(strip $(BR2_PACKAGE_X11R7_LIBXCOMPOSITE)),y)
ifeq ($(strip $(BR2_PACKAGE_X11R7_LIBXPM)),y)
MATCHBOX_WM_OPTS+=--enable-composite
MATCHBOX_WM_DEPS+=x11r7-libxcomposite
MATCHBOX_WM_DEPS+=x11r7-libxpm
MATCHBOX_LIB_DEPS+=x11r7-libxpm
MATCHBOX_WM_DEPS+=xlib_libXcomposite
MATCHBOX_WM_DEPS+=xlib_libXpm
MATCHBOX_LIB_DEPS+=xlib_libXpm
endif
endif
@ -172,7 +172,7 @@ MATCHBOX_PANEL_DEPS:=
ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_SNOTIFY)),y)
MATCHBOX_SNOTIFY_OPTS+=--enable-startup-notification
MATCHBOX_SNOTIFY_DEPS+=x11r7-libxsm
MATCHBOX_SNOTIFY_DEPS+=xlib_libSM
MATCHBOX_SNOTIFY_DEPS+=$(TARGET_DIR)/usr/lib/$(MATCHBOX_SNOTIFY_BIN)
MATCHBOX_PANEL_DEPS+=$(TARGET_DIR)/usr/bin/$(MATCHBOX_SM_BIN)
else
@ -202,9 +202,9 @@ endif
ifeq ($(strip $(BR2_PACKAGE_X11R7_LIBXFT2)),y)
MATCHBOX_LIB_OPTS+=--enable-xft
MATCHBOX_LIB_DEPS+=x11r7-libxft2
MATCHBOX_LIB_DEPS+=xlib_libXft2
#MATCHBOX_WM_OPTS+=--enable-standalone-xft
MATCHBOX_WM_DEPS+=x11r7-libxft2
MATCHBOX_WM_DEPS+=xlib_libXft2
else
MATCHBOX_LIB_OPTS+=--disable-xft
#MATCHBOX_WM_OPTS+=--disable-standalone-xft
@ -232,7 +232,7 @@ $(MATCHBOX_LIB_DIR)/.configured: $(MATCHBOX_LIB_DIR)/.unpacked
--with-expat-includes=$(STAGING_DIR)/usr/include \
--with-expat-lib=$(STAGING_DIR)/usr/lib \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
$(MATCHBOX_LIB_OPTS) \
)
@ -256,7 +256,7 @@ $(MATCHBOX_SNOTIFY_DIR)/.configured: $(MATCHBOX_SNOTIFY_DIR)/.unpacked
--libdir=$(STAGING_DIR)/usr/lib \
--includedir=$(STAGING_DIR)/usr/include \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
)
touch $(MATCHBOX_SNOTIFY_DIR)/.configured
@ -281,7 +281,7 @@ $(MATCHBOX_WM_DIR)/.configured: $(MATCHBOX_WM_DIR)/.unpacked
--with-expat-includes=$(STAGING_DIR)/usr/include \
--with-expat-lib=$(STAGING_DIR)/usr/lib \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
$(MATCHBOX_WM_OPTS) \
$(MATCHBOX_SNOTIFY_OPTS) \
@ -308,7 +308,7 @@ $(MATCHBOX_SM_DIR)/.configured: $(MATCHBOX_SM_DIR)/.unpacked
--with-expat-includes=$(STAGING_DIR)/usr/include \
--with-expat-lib=$(STAGING_DIR)/usr/lib \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
$(MATCHBOX_SNOTIFY_OPTS) \
)
@ -334,7 +334,7 @@ $(MATCHBOX_CN_DIR)/.configured: $(MATCHBOX_CN_DIR)/.unpacked
--with-expat-includes=$(STAGING_DIR)/usr/include \
--with-expat-lib=$(STAGING_DIR)/usr/lib \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
)
touch $(MATCHBOX_CN_DIR)/.configured
@ -359,7 +359,7 @@ $(MATCHBOX_PL_DIR)/.configured: $(MATCHBOX_PL_DIR)/.unpacked
--with-expat-includes=$(STAGING_DIR)/usr/include \
--with-expat-lib=$(STAGING_DIR)/usr/lib \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
$(MATCHBOX_SNOTIFY_OPTS) \
)
@ -385,7 +385,7 @@ $(MATCHBOX_DP_DIR)/.configured: $(MATCHBOX_DP_DIR)/.unpacked
--with-expat-includes=$(STAGING_DIR)/usr/include \
--with-expat-lib=$(STAGING_DIR)/usr/lib \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
$(MATCHBOX_SNOTIFY_OPTS) \
)
@ -411,7 +411,7 @@ $(MATCHBOX_FK_DIR)/.configured: $(MATCHBOX_FK_DIR)/.unpacked
--with-expat-includes=$(STAGING_DIR)/usr/include \
--with-expat-lib=$(STAGING_DIR)/usr/lib \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
)
$(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FK_DIR)/Makefile
@ -437,7 +437,7 @@ $(MATCHBOX_KB_DIR)/.configured: $(MATCHBOX_KB_DIR)/.unpacked
--with-expat-includes=$(STAGING_DIR)/usr/include \
--with-expat-lib=$(STAGING_DIR)/usr/lib \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
)
touch $(MATCHBOX_KB_DIR)/.configured
@ -624,7 +624,7 @@ matchbox-panel: uclibc matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) $(TARGE
matchbox-desktop: uclibc matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_DP_BIN)
matchbox-keyboard: uclibc matchbox x11r7-libxtst $(TARGET_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN)
matchbox-keyboard: uclibc matchbox xlib_libXtst $(TARGET_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN)
matchbox-clean:
rm -f $(TARGET_DIR)/usr/lib/libmb.*

4
package/pango/pango.mk
View File

@ -106,8 +106,8 @@ $(PANGO_DIR)/.configured: $(PANGO_DIR)/.unpacked
--enable-shared \
--enable-static \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include \
--x-libraries=$(STAGING_DIR)/lib \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--disable-glibtest \
--enable-explicit-deps=no \
--disable-debug \

4
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
View File

@ -9,7 +9,7 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
XSERVER_XORG_SERVER_AUTORECONF = YES
XSERVER_XORG_SERVER_INSTALL_STAGING = YES
XSERVER_XORG_SERVER_DEPENDENCIES = xlib_libXfont libdrm xlib_libxkbui xproto_compositeproto xproto_damageproto xproto_fixesproto xproto_glproto xproto_kbproto xproto_randrproto freetype xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm xlib_libXrender xlib_libXres xlib_libXtst xlib_libXxf86misc xlib_libXxf86vm xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto xproto_evieext xproto_fontsproto xproto_inputproto xproto_recordproto xproto_renderproto xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto
XSERVER_XORG_SERVER_CONF_OPT = --disable-xprint --disable-xinerama --disable-xnest --disable-xvfb --disable-dmx --enable-dri --disable-xdmcp --disable-screensaver
XSERVER_XORG_SERVER_DEPENDENCIES = xutil_util-macros xlib_libXfont libdrm xlib_libxkbui xproto_compositeproto xproto_damageproto xproto_fixesproto xproto_glproto xproto_kbproto xproto_randrproto freetype xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm xlib_libXrender xlib_libXres xlib_libXtst xlib_libXft xlib_libXcursor xlib_libXinerama xlib_libXrandr xlib_libXdamage xlib_libXxf86misc xlib_libXxf86vm xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto xproto_evieext xproto_fontsproto xproto_inputproto xproto_recordproto xproto_renderproto xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto
XSERVER_XORG_SERVER_CONF_OPT = --disable-xprint --disable-xinerama --disable-xnest --disable-xvfb --disable-dmx --disable-dri --disable-xdmcp --disable-screensaver
$(eval $(call AUTOTARGETS,xserver_xorg-server))