[paketler-commits] r36013 - in devel/desktop/freedesktop/zorg: . files

[paketler-commits at pardus.org.tr]

Author: fatih
Date: Tue Dec  4 22:32:43 2007
New Revision: 36013

Modified:
   devel/desktop/freedesktop/zorg/files/zorg
   devel/desktop/freedesktop/zorg/pspec.xml
Log:
composite support

Modified: devel/desktop/freedesktop/zorg/files/zorg
=================================================================
--- devel/desktop/freedesktop/zorg/files/zorg	(original)
+++ devel/desktop/freedesktop/zorg/files/zorg	Tue Dec  4 22:32:43 2007
@@ -48,6 +48,7 @@
     VendorName "%(VENDORNAME)s"
     BoardName  "%(BOARDNAME)s"
     %(BUSID)s
+    %(AIGLX_OPTS)s
 EndSection
 """
 
@@ -117,6 +118,13 @@
 EndSection
 """
 
+composite_option = 'Option "Composite" "Enable"'
+
+template_nvidia_aiglx = """
+    Option "AddARGBGLXVisuals" "true"
+    Option "AllowGLXWithComposite" "true"
+"""
+
 template_screen = """
 Section "Screen"
     Identifier "Screen%(N)s"
@@ -183,7 +191,7 @@
 EndSection
 
 Section "Extensions"
-#    Option "Composite" "Enable"
+    %(COMPOSITE)s
 EndSection
 
 Section "dri"
@@ -248,6 +256,7 @@
     # Screen      1  "Screen1" RightOf "Screen0"
     Option      "Xinerama" "off"
     Option      "Clone" "off"
+    %(AIGLX_OPTS)s
 EndSection
 """
 
@@ -894,6 +903,16 @@
         keys_vc["VENDORNAME"] = cards[i].VendorName
         keys_vc["BOARDNAME"] = cards[i].BoardName
         keys_vc["BUSID"] = cards[i].BusId 
+
+        keys_vc["AIGLX_OPTS"] = ""
+
+        if "composite" in getKernelOpt("xorg"):
+            if cards[i].Driver in ("ati", "intel"):
+                keys_vc["AIGLX_OPTS"] = 'Option "XAANoOffscreenPixmaps" "true"'
+
+            elif cards[i].Driver == "nvidia":
+                keys_vc["AIGLX_OPTS"] = template_nvidia_aiglx
+
         sec += template_videocard % keys_vc
     return sec
 
@@ -927,6 +946,9 @@
         else:
             keys_mon["DEPTH"] = "16"
 
+        if cards[i].Driver == "ati" and "composite" in getKernelOpt("xorg"):
+            keys_mon["DEPTH"] = "24"
+
         sec_monitor += template_monitor % keys_mon
         sec_screen += template_screen % keys_mon
 
@@ -1035,6 +1057,18 @@
     keysTouchpad(keys_main)
     keys_main["KEYMAP"] = queryKeymap()
 
+    # Enable composite extension if requested
+    keys_main["AIGLX_OPTS"] = ""
+
+    if "composite" in getKernelOpt("xorg"):
+        keys_main["COMPOSITE"] = composite_option
+
+        if cards[0].Driver in ("ati", "intel"):
+            keys_main["AIGLX_OPTS"] = 'Option "AIGLX" "true"'
+
+    else:
+        keys_main["COMPOSITE"] = '#%s' % composite_option
+
     write_tmpl(keys_main)
 
 def safeConfigure(_driver = "vesa"):
@@ -1079,6 +1113,9 @@
     keys_main["SEC_SYNAPTICS"] = ""
     keys_main["SYNAPTICS_LAY"] = ""
 
+    keys_main["AIGLX_OPTS"] = ""
+    keys_main["COMPOSITE"] = '#%s' % composite_option
+
     write_tmpl(keys_main)
 
 def activeCardChanged(cards):

Modified: devel/desktop/freedesktop/zorg/pspec.xml
=================================================================
--- devel/desktop/freedesktop/zorg/pspec.xml	(original)
+++ devel/desktop/freedesktop/zorg/pspec.xml	Tue Dec  4 22:32:43 2007
@@ -36,6 +36,13 @@
     </Package>
 
     <History>
+        <Update release="31">
+            <Date>2007-12-04</Date>
+            <Version>0.5</Version>
+            <Comment>Enable composite extension if xorg=composite is provided in kernel options</Comment>
+            <Name>Fatih Aşıcı</Name>
+            <Email>fatih at pardus.org.tr</Email>
+        </Update>
         <Update release="30">
             <Date>2007-11-30</Date>
             <Version>0.5</Version>