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

add optional support for freetype #372 by pnoffke

Browse Source
This commit is contained in:
Mike Frysinger 2005-09-08 00:25:27 +00:00
parent bf37dc9c2e
commit c652397883
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/xorg/xorg-config.patch
View File

@ -5,10 +5,11 @@
+#define TinyXServer YES +#define TinyXServer YES
+#define XfbdevServer YES +#define XfbdevServer YES
+#define CrossCompiling YES +#define CrossCompiling YES
+#define ProjectRoot /usr/X11R6 +#define ProjectRoot /usr/X11R6
+#define NothingOutsideProjectRoot YES +#define NothingOutsideProjectRoot YES
+ +
+#define HasFreetype2 NO +#define HasFreetype2 REPLACE_HAS_FREETYPE2
+#define Freetype2Dir REPLACE_STAGING_DIR/usr
+#define HasFontconfig NO +#define HasFontconfig NO
+#define HasLibpng YES +#define HasLibpng YES
+#define HasZlib YES +#define HasZlib YES

10
package/xorg/xorg.mk
View File

@ -32,18 +32,28 @@ TARGET_LIBX:=/usr/X11R6/lib/
XORG_BINX:=$(TARGET_DIR)$(TARGET_BINX) XORG_BINX:=$(TARGET_DIR)$(TARGET_BINX)
XORG_LIBX:=$(TARGET_DIR)$(TARGET_LIBX) XORG_LIBX:=$(TARGET_DIR)$(TARGET_LIBX)
XORG_CF:=$(XORG_DIR)/config/cf/cross.def XORG_CF:=$(XORG_DIR)/config/cf/cross.def
XORG_HOST_DEF:=$(XORG_DIR)/config/cf/host.def
# Install Xorg xserver # Install Xorg xserver
XSERVER:=Xorg XSERVER:=Xorg
XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER) XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER)
TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER) TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER)
# Check if we should use FreeType2.
ifeq ($(BR2_PACKAGE_FREETYPE),y)
HAS_FREETYPE2=YES
else
HAS_FREETYPE2=NO
endif
$(DL_DIR)/$(XORG_SOURCE): $(DL_DIR)/$(XORG_SOURCE):
$(WGET) -P $(DL_DIR) $(XORG_SITE)/$(XORG_SOURCE) $(WGET) -P $(DL_DIR) $(XORG_SITE)/$(XORG_SOURCE)
$(XORG_DIR)/.configure: $(DL_DIR)/$(XORG_SOURCE) $(XORG_DIR)/.configure: $(DL_DIR)/$(XORG_SOURCE)
$(XORG_CAT) $(DL_DIR)/$(XORG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(XORG_CAT) $(DL_DIR)/$(XORG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(XORG_DIR) package/xorg/ xorg\*.patch toolchain/patch-kernel.sh $(XORG_DIR) package/xorg/ xorg\*.patch
$(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_HOST_DEF)
$(SED) 's:REPLACE_HAS_FREETYPE2:$(HAS_FREETYPE2):g' $(XORG_HOST_DEF)
$(SED) 's:REPLACE_GCCINC_DIR:$(shell $(TARGET_CROSS)gcc -print-file-name=include):g' $(XORG_CF) $(SED) 's:REPLACE_GCCINC_DIR:$(shell $(TARGET_CROSS)gcc -print-file-name=include):g' $(XORG_CF)
$(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_CF) $(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_CF)
$(SED) 's:REPLACE_ARCH:$(ARCH):g' $(XORG_CF) $(SED) 's:REPLACE_ARCH:$(ARCH):g' $(XORG_CF)