xpra icon
Bug tracker and wiki

This bug tracker and wiki are being discontinued
please use https://github.com/Xpra-org/xpra instead.


Ticket #56: dummy-remove-functions.patch

File dummy-remove-functions.patch, 3.5 KB (added by Antoine Martin, 5 years ago)

for testing the latest upstream patches for dummy

  • ../rpmbuild/0007-remove-pointless-functions.patch

     
     1diff --git a/src/dummy_driver.c b/src/dummy_driver.c
     2index cf150539e10b..265660280549 100644
     3--- a/src/dummy_driver.c
     4+++ b/src/dummy_driver.c
     5@@ -74,9 +74,6 @@
     6 static Bool    DUMMYSaveScreen(ScreenPtr pScreen, int mode);
     7 
     8 /* Internally used functions */
     9-static Bool     dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
     10-static void    dummySave(ScrnInfoPtr pScrn);
     11-static void    dummyRestore(ScrnInfoPtr pScrn, Bool restoreText);
     12 static Bool    dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
     13                                pointer ptr);
     14 
     15@@ -476,14 +473,6 @@
     16 static Bool
     17 DUMMYEnterVT(VT_FUNC_ARGS_DECL)
     18 {
     19-    SCRN_INFO_PTR(arg);
     20-   
     21-    /* Should we re-save the text mode on each VT enter? */
     22-    if(!dummyModeInit(pScrn, pScrn->currentMode))
     23-      return FALSE;
     24-
     25-    DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
     26-
     27     return TRUE;
     28 }
     29 
     30@@ -491,8 +480,6 @@
     31 static void
     32 DUMMYLeaveVT(VT_FUNC_ARGS_DECL)
     33 {
     34-    SCRN_INFO_PTR(arg);
     35-    dummyRestore(pScrn, TRUE);
     36 }
     37 
     38 static void
     39@@ -550,15 +537,6 @@
     40 
     41     if (!(dPtr->FBBase = malloc(pScrn->videoRam * 1024)))
     42        return FALSE;
     43-   
     44-    /*
     45-     * next we save the current state and setup the first mode
     46-     */
     47-    dummySave(pScrn);
     48-   
     49-    if (!dummyModeInit(pScrn,pScrn->currentMode))
     50-       return FALSE;
     51-    DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
     52 
     53     /*
     54      * Reset visual list.
     55@@ -702,8 +680,6 @@
     56 DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL)
     57 {
     58     SCRN_INFO_PTR(arg);
     59-    if (!dummyModeInit(pScrn, mode))
     60-        return FALSE;
     61 #ifdef RANDR
     62     DUMMYPtr dPtr = DUMMYPTR(pScrn);
     63     if (dPtr->constantDPI) {
     64@@ -754,7 +730,6 @@
     65     DUMMYPtr dPtr = DUMMYPTR(pScrn);
     66 
     67     if(pScrn->vtSema){
     68-       dummyRestore(pScrn, TRUE);
     69        free(dPtr->FBBase);
     70     }
     71 
     72@@ -796,24 +771,6 @@
     73     return(MODE_OK);
     74 }
     75 
     76-static void
     77-dummySave(ScrnInfoPtr pScrn)
     78-{
     79-}
     80-
     81-static void
     82-dummyRestore(ScrnInfoPtr pScrn, Bool restoreText)
     83-{
     84-}
     85-   
     86-static Bool
     87-dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
     88-{
     89-    dummyRestore(pScrn, FALSE);
     90-   
     91-    return(TRUE);
     92-}
     93-
     94 Atom VFB_PROP  = 0;
     95 #define  VFB_PROP_NAME  "VFB_IDENT"
     96 
  • ../rpmbuild/xorg-x11-drv-dummy.fc24.spec

     
    77Summary:   Xorg X11 dummy video driver
    88Name:      xorg-x11-drv-dummy
    99Version:   0.3.6
    10 Release:   25.xpra3%{?dist}
     10Release:   25.xpra4%{?dist}
    1111URL:       http://www.x.org
    1212License:   MIT
    1313Group:     User Interface/X Hardware Support
     
    1919Patch3:    0004-honour-dac.patch
    2020Patch4:    0005-support-for-30-bit-depth-in-dummy-driver.patch
    2121Patch5:    0006-remove-dead-code-in-dummy-driver.patch
     22Patch6:    0007-remove-pointless-functions.patch
    2223
    2324ExcludeArch: s390 s390x
    2425
     
    3940%patch3 -p1
    4041%patch4 -p1
    4142%patch5 -p1
     43%patch6 -p1
    4244
    4345%build
    4446autoreconf -vif
     
    6264%{driverdir}/dummy_drv.so
    6365
    6466%changelog
     67* Fri Sep 23 2016 Antoine Martin <antoine@nagafix.co.uk> - 0.3.6-25.xpra4
     68- remove more dead code
     69
    6570* Tue Sep 20 2016 Antoine Martin <antoine@nagafix.co.uk> - 0.3.6-25.xpra3
    6671- updated 30 bit patch
    6772