Magellan Linux

  • Back to homepage
    • /[smage]/branches/magellan-next/extras/virtualbox/virtualbox-4.1.6-r1.smage2

    Diff of /branches/magellan-next/extras/virtualbox/virtualbox-4.1.6-r1.smage2

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 9434 by niro, Wed Nov 30 12:07:52 2011 UTC revision 9435 by niro, Wed Nov 30 15:53:37 2011 UTC
    # Line 41  XLIBS_DEPEND=">= x11-libs/libXdmcp-1 Line 41  XLIBS_DEPEND=">= x11-libs/libXdmcp-1
    41  XORG_DEPEND="== x11-base/xorg-server-${XORG_VER}"  XORG_DEPEND="== x11-base/xorg-server-${XORG_VER}"
    42  VIDEO_DEPEND=">= x11-libs/libXcomposite-0.4  VIDEO_DEPEND=">= x11-libs/libXcomposite-0.4
    43   >= x11-libs/libdrm-2.4.26"   >= x11-libs/libdrm-2.4.26"
    44    # vboxmouse_drv only needed with xorg =< 1.10
    45    # for xorg-1.11 upstream suggest the normal mouse driver
    46    if [[ ${XORG_VER//.} < 111 ]]
    47    then
    48     INPUT_DEPEND=""
    49    else
    50     INPUT_DEPEND=">= x11-drivers/xf86-input-mouse-1.7"
    51    fi
    52    
    53  SDEPEND="${VBOX_DEPEND}  SDEPEND="${VBOX_DEPEND}
    54   ${ADDITIONS_DEPEND}   ${ADDITIONS_DEPEND}
    55   ${XLIBS_DEPEND}   ${XLIBS_DEPEND}
    56   ${XORG_DEPEND}   ${XORG_DEPEND}
    57   ${VIDEO_DEPEND}   ${VIDEO_DEPEND}
    58     ${INPUT_DEPEND}
    59   >= dev-lang/bin86-0.16   >= dev-lang/bin86-0.16
    60   >= dev-lang/dev86-0.16   >= dev-lang/dev86-0.16
    61   >= dev-util/iasl-2009   >= dev-util/iasl-2009
    # Line 143  split_info_xf86-input-virtualbox() Line 152  split_info_xf86-input-virtualbox()
    152  {  {
    153   DESCRIPTION="VirtualBox X11 mouse driver."   DESCRIPTION="VirtualBox X11 mouse driver."
    154   PCATEGORIE="x11-drivers"   PCATEGORIE="x11-drivers"
    155   DEPEND="${XORG_DEPEND}"  
    156     # vboxmouse_drv only needed with xorg =< 1.10
    157     # for xorg-1.11 upstream suggest the normal mouse driver
    158     if [[ ${XORG_VER//.} < 111 ]]
    159     then
    160     DEPEND="${XORG_DEPEND}"
    161     else
    162     DEPEND="${XOR_DEPEND}
    163     ${INPUT_DEPEND}"
    164     # virtualize this package!
    165     PKGTYPE="virtual"
    166     NOPKGBUILD="true"
    167     # suppress some annoying warnings
    168     NOSTRIP="true"
    169     fi
    170  }  }
    171    
    172  src_prepare()  src_prepare()
    # Line 416  src_install_xf86-video-virtualbox() Line 439  src_install_xf86-video-virtualbox()
    439   sed -i "s:@@PVER@@:${PVER}:" ${BINDIR}/usr/src/vboxvideo/vboxvideo.sh || die   sed -i "s:@@PVER@@:${PVER}:" ${BINDIR}/usr/src/vboxvideo/vboxvideo.sh || die
    440  }  }
    441    
    442  src_install_xf86-input-virtualbox()  # vboxmouse_drv only needed with xorg =< 1.10
    443  {  # for xorg-1.11 upstream suggest the normal mouse driver
    444   # virtualbox installs binaries in x86 or amd64 out dir  if [[ ${XORG_VER//.} < 111 ]]
    445   local myarch  then
    446   case ${ARCH} in   src_install_xf86-input-virtualbox()
    447   i*86) myarch=x86;;   {
    448   x86_64) myarch=amd64;;   # virtualbox installs binaries in x86 or amd64 out dir
    449   esac   local myarch
    450     case ${ARCH} in
    451   cd ${SRCDIR}/out/linux.${myarch}/release/bin/additions   i*86) myarch=x86;;
    452     x86_64) myarch=amd64;;
    453   # needed directories   esac
    454   minstalldir /usr/$(mlibdir)/xorg/modules/input || die  
    455     cd ${SRCDIR}/out/linux.${myarch}/release/bin/additions
    456   # install xorg server module  
    457   minstallfile vboxmouse_drv_${XORG_VER//.}.so /usr/$(mlibdir)/xorg/modules/input/vboxmouse_drv.so || die   # needed directories
    458     minstalldir /usr/$(mlibdir)/xorg/modules/input || die
    459   # install xorg conf  
    460   minstalldir /etc/X11/xorg.conf.d || die   # install xorg server module
    461   minstallfile ${SRCDIR}/src/VBox/Additions/x11/Installer/50-vboxmouse.conf /etc/X11/xorg.conf.d || die   minstallfile vboxmouse_drv_${XORG_VER//.}.so /usr/$(mlibdir)/xorg/modules/input/vboxmouse_drv.so || die
    462    
    463   # install udev rules   # install xorg conf
    464   minstalludevrule ${SRCDIR}/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules || die   minstalldir /etc/X11/xorg.conf.d || die
    465  }   minstallfile ${SRCDIR}/src/VBox/Additions/x11/Installer/50-vboxmouse.conf /etc/X11/xorg.conf.d || die
    466    
    467     # install udev rules
    468     minstalludevrule ${SRCDIR}/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules || die
    469     }
    470    fi
    471    
    472  preinstall_virtualbox()  preinstall_virtualbox()
    473  {  {
    Legend:
    Removed from v.9434  
    changed lines
      Added in v.9435