jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-05 09:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

update DejaVu fonts to the latest

Browse Source 
Fix broken keyboard handling
This commit is contained in:
Eric Andersen 2007-01-25 20:34:10 +00:00
parent c78e178f37
commit dcfcfe5d57
3 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/xorg/Xsession
View File

@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
export GDK_USE_XFT=1 export GDK_USE_XFT=1
export LANG="en_US.UTF-8" export LANG="en_US.UTF-8"
export LC_ALL="en_US.UTF-8"
/usr/bin/X11/rxvt -bg black -fg gray90 /usr/bin/X11/rxvt -bg black -fg gray90

27
package/xorg/xorg.conf
View File

@ -23,17 +23,17 @@ Section "Module"
Load "bitmap" Load "bitmap"
Load "dbe" Load "dbe"
Load "ddc" Load "ddc"
Load "extmod"
Load "freetype" Load "freetype"
Load "int10" Load "int10"
Load "vbe"
EndSection EndSection
Section "InputDevice" Section "InputDevice"
Identifier "Generic Keyboard" Identifier "Generic Keyboard"
Driver "keyboard" Driver "kbd"
Option "XkbRules" "xfree86" Option "CoreKeyboard"
Option "XkbModel" "pc104" Option "XkbLayout" "en_US"
Option "XkbLayout" "us"
Option "XkbOptions" "altwin:meta_win"
EndSection EndSection
Section "InputDevice" Section "InputDevice"
@ -56,9 +56,10 @@ EndSection
Section "Device" Section "Device"
Identifier "Generic VGA Card" Identifier "Generic VGA Card"
Driver "vesa" #Driver "vesa"
#Driver "vga" #Driver "vga"
#Driver "fbdev" Driver "fbdev"
Option "UseFBDev" "True"
EndSection EndSection
Section "Monitor" Section "Monitor"
@ -72,26 +73,26 @@ Section "Screen"
Identifier "Default Screen" Identifier "Default Screen"
Device "Generic VGA Card" Device "Generic VGA Card"
Monitor "Generic Monitor" Monitor "Generic Monitor"
DefaultDepth 8 #DefaultDepth 8
SubSectionSub "Display" SubSectionSub "Display"
Viewport 0 0 Viewport 0 0
Depth 4 Depth 4
Modes "640x480" #Modes "640x480"
EndSubSection EndSubSection
SubSectionSub "Display" SubSectionSub "Display"
Viewport 0 0 Viewport 0 0
Depth 8 Depth 8
Modes "640x480" #Modes "640x480"
EndSubSection EndSubSection
SubSectionSub "Display" SubSectionSub "Display"
Viewport 0 0 Viewport 0 0
Depth 16 Depth 16
Modes "640x480" #Modes "640x480"
EndSubSection EndSubSection
SubSectionSub "Display" SubSectionSub "Display"
Viewport 0 0 Viewport 0 0
Depth 24 Depth 24
Modes "640x480" #Modes "640x480"
EndSubSection EndSubSection
EndSection EndSection

25
package/xorg/xorg.mk
View File

@ -10,10 +10,10 @@ ifeq ($(strip $(BR2_PACKAGE_XORG)),y)
XORG_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap xinit/startx \ XORG_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap xinit/startx \
xauth/xauth xinit/xinit xsetroot/xsetroot xset/xset \ xauth/xauth xinit/xinit xsetroot/xsetroot xset/xset \
mkfontscale/mkfontscale mkfontdir/mkfontdir \ mkfontscale/mkfontscale mkfontdir/mkfontdir \
#xterm/xterm setxkbmap/setxkbmap #xterm/xterm
XORG_LIBS:= Xft Xrender Xaw Xmu Xt Xcursor Xrandr Xi Xinerama Xfixes \ XORG_LIBS:= Xft Xrender Xaw Xmu Xt Xcursor Xrandr Xi Xinerama Xfixes \
SM ICE Xpm Xp Xext X11 Xmuu Xxf86misc fontenc SM ICE Xpm Xp Xext X11 Xmuu Xxf86misc fontenc xkbfile
############################################################# #############################################################
@ -37,7 +37,7 @@ XORG_CF:=$(XORG_DIR)/config/cf/cross.def
XORG_HOST_DEF:=$(XORG_DIR)/config/cf/host.def XORG_HOST_DEF:=$(XORG_DIR)/config/cf/host.def
DEJAVU_VERSION=2.13 DEJAVU_VERSION=2.14
DEJAVU_SOURCE=dejavu-ttf-$(DEJAVU_VERSION).tar.bz2 DEJAVU_SOURCE=dejavu-ttf-$(DEJAVU_VERSION).tar.bz2
DEJAVU_CAT:=$(BZCAT) DEJAVU_CAT:=$(BZCAT)
DEJAVU_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/dejavu DEJAVU_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/dejavu
@ -140,9 +140,22 @@ $(TARGET_XSERVER): $(XORG_XSERVER)
cp -LRf $(XORG_DIR)/fonts/bdf/misc/cursor.bdf $(XORG_LIBX)/X11/fonts/misc/ cp -LRf $(XORG_DIR)/fonts/bdf/misc/cursor.bdf $(XORG_LIBX)/X11/fonts/misc/
cp -f package/xorg/fonts.alias $(XORG_LIBX)/X11/fonts/misc/ cp -f package/xorg/fonts.alias $(XORG_LIBX)/X11/fonts/misc/
( cd $(XORG_LIBX)/X11/fonts/misc/; mkfontdir ) ( cd $(XORG_LIBX)/X11/fonts/misc/; mkfontdir )
rm -rf $(XORG_LIBX)/X11/fonts/100dpi
rm -rf $(XORG_LIBX)/X11/fonts/75dpi
rm -rf $(XORG_LIBX)/X11/fonts/cyrillic
rm -rf $(XORG_LIBX)/X11/fonts/local
(cd $(TARGET_DIR)/usr/bin; ln -snf $(TARGET_BINX) X11) (cd $(TARGET_DIR)/usr/bin; ln -snf $(TARGET_BINX) X11)
cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/xkb $(XORG_LIBX)/X11/
mv $(XORG_LIBX)/X11/xkb/xkbcomp $(XORG_BINX)/
(cd $(XORG_LIBX)/X11/xkb; ln -s ../../../bin/xkbcomp)
rm -rf $(XORG_LIBX)/X11/xkb/compiled
(cd $(XORG_LIBX)/X11/xkb; ln -s /tmp compiled)
cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/icons $(XORG_LIBX)/X11/
-cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/locale $(XORG_LIBX)/X11/
cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/rgb.txt $(XORG_LIBX)/X11/
cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/XKeysymDB $(XORG_LIBX)/X11/
cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/XErrorDB $(XORG_LIBX)/X11/
mkdir -p $(TARGET_DIR)/etc/X11/ mkdir -p $(TARGET_DIR)/etc/X11/
cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/rgb* $(XORG_LIBX)/X11/
$(SED) "s,^sysclientrc=.*,sysclientrc=/etc/X11/Xsession,g" $(XORG_BINX)/startx $(SED) "s,^sysclientrc=.*,sysclientrc=/etc/X11/Xsession,g" $(XORG_BINX)/startx
$(SED) "s,^sysserverrc=.*,sysserverrc=/etc/X11/Xserver,g" $(XORG_BINX)/startx $(SED) "s,^sysserverrc=.*,sysserverrc=/etc/X11/Xserver,g" $(XORG_BINX)/startx
cp -LRf package/xorg/xorg.conf $(TARGET_DIR)/etc/X11/ cp -LRf package/xorg/xorg.conf $(TARGET_DIR)/etc/X11/
@ -159,8 +172,8 @@ $(DEJAVU_DIR)/.unpacked: $(DL_DIR)/$(DEJAVU_SOURCE)
$(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf: $(DEJAVU_DIR)/.unpacked $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf: $(DEJAVU_DIR)/.unpacked
mkdir -p $(XORG_LIBX)/X11/fonts/ttf-dejavu mkdir -p $(XORG_LIBX)/X11/fonts/ttf-dejavu
rm $(DEJAVU_DIR)/*Condensed*.ttf rm -f $(DEJAVU_DIR)/*Condensed*.ttf
rm $(DEJAVU_DIR)/*ExtraLight*.ttf rm -f $(DEJAVU_DIR)/*ExtraLight*.ttf
cp -LRf $(DEJAVU_DIR)/DejaVu*-Bold.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/ cp -LRf $(DEJAVU_DIR)/DejaVu*-Bold.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
cp -LRf $(DEJAVU_DIR)/DejaVu*-BoldOblique.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/ cp -LRf $(DEJAVU_DIR)/DejaVu*-BoldOblique.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/
cp -LRf $(DEJAVU_DIR)/DejaVu*-Oblique.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/ cp -LRf $(DEJAVU_DIR)/DejaVu*-Oblique.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/