diff options
750 files changed, 20898 insertions, 11373 deletions
diff --git a/abs/core/Kernel_rebuild_list b/abs/core/Kernel_rebuild_list index 346c2ba..2a1ae79 100644 --- a/abs/core/Kernel_rebuild_list +++ b/abs/core/Kernel_rebuild_list @@ -1,6 +1,7 @@ -As of 3.13.7 +As of 3.18.4 linux lirc -nvidia-utils nvidia +nvidia-340xx +nvidia-304xx ceton_infinitv diff --git a/abs/core/LinHES-config/LinHES-release b/abs/core/LinHES-config/LinHES-release index d5029cc..1a4fd80 100644 --- a/abs/core/LinHES-config/LinHES-release +++ b/abs/core/LinHES-config/LinHES-release @@ -1 +1 @@ -LinHES R8.2 (Paid the iron price) +LinHES R8.3 (Lorne Malvo) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 1f7d048..e35f4a4 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,12 +1,12 @@ pkgname=LinHES-config -pkgver=8.2 -pkgrel=17 +pkgver=8.3 +pkgrel=12 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' 'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python-parted' 'python2-pexpect' 'python-netifaces' 'xcursor-vanilla-dmz-aa' - 'python-iplib' 'sudo' 'setserial' 'udevil' 'balance' ) + 'python-iplib' 'sudo' 'setserial' 'udevil' 'balance' 'runit-scripts>=8.3-4' ) arch=('i686' 'x86_64') source=(mv_install.py 09_mythvantge_runit_grub @@ -20,6 +20,7 @@ source=(mv_install.py 09_mythvantge_runit_grub restore_default_settings.sh myth_settings_wrapper.sh xconfig.sh + xconfig.cron timezip.py soundconfig.sh LinHES-release @@ -76,6 +77,7 @@ package() { install -m 0755 install_functions.sh $MVDIR/bin/install_functions.sh install -m 0755 systemconfig.sh $MVDIR/bin/systemconfig.sh install -m 0755 xconfig.sh $MVDIR/bin/xconfig.sh + install -m 0644 xconfig.cron $MVDIR/bin/xconfig.cron install -m 0755 install_db_chroot.sh $MVDIR/bin/install_db_chroot.sh install -m 0755 restore_km_db_chroot.sh $MVDIR/bin/restore_km_db_chroot.sh # install -m 0755 restore_default_settings.sh $MVDIR/bin/restore_default_settings.sh @@ -144,10 +146,11 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' 'b8becf69d4309b938ceba3178c799270' '2a7f3b34e522acfd08283b86c8926aba' 'b596d2e3779a434435bc0f0277b1ba3e' - '9b3d200e101d2ba814de00318a41db8f' + '6e5639fff82fa2ba76113ac1ab8f2016' + 'f0376c98a7986897406d393186c0365e' '157e73d0f90d7b306aba8f5921aeedd3' 'f8f803cb5738ce0021cd37c1ab514c45' - '879c692ebfd86cdd60d93278f1df8041' + 'eef9b882ecb70648a8f253f85b73a274' '5f890ea9bda6aef652d2560ca19dac07' 'ab2aa42c2947148c2b1cac0ade6d1d55' 'd429b59d3cfb37b0624c6a4a71a7c2c0' @@ -157,18 +160,18 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' 'e959df98947eb0d2ea64ff616b61aab5' '2506860a416e1988934225d80d501c2c' 'c0549457750c4f8e8038d904a0f3012a' - '1224a6a51cfe3283b562e3c250688b53' + 'cb7abd558b6540bc5e2232866a2a42f8' 'b845de3e05c1734cce4b9ac5e8f1baaf' - '885fcb99a0179d9704385e14aefd7af6' + '077ebce663edba30ba7f93e4d245d125' '8b7dce4a3a0a281fa6656aa8781a648e' '4b10fff21a0274f950f97f2b61e92463' '824e49d9b01fed295c704ab68908b464' 'fe5e31b833cc6707209e9d656b6eb53c' - '36dc1ae5fae0bbf99cb2bf5ae9419e67' + '24ef3ad4be1bf367cca40469173f19af' '087a0ef743bc8af915503f8773536ce4' '38665330aeb3a8bdf7be24857fe035bb' '80685e047993b00161be29e3580f3a40' - '299c24c0820fc9c483c820db2595e3cb' + 'b79fe6ef82b0b5e71d62806e773ed556' '595663a2cb0b43c4ea3fb3dac915a3c8' '781f161a79c3188a31c8615b8258b241' '888a6c57f272d9fa3e77e216a421562b' @@ -180,5 +183,5 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' '3866086e6af5e3528a66eff492f2f4dd' 'c9279fa095af624ee3d9bc75d3328360' '02cf69074d2bbacef05fa3e451af9af3' - '85d15efc55074a94c58d44542ea1dd13' + '10354854c29d894d3598639eaa1df72c' '7acbd2064db905e76372a0618b24a6d9') diff --git a/abs/core/LinHES-config/config.install b/abs/core/LinHES-config/config.install index 0b7060e..50c66c7 100644 --- a/abs/core/LinHES-config/config.install +++ b/abs/core/LinHES-config/config.install @@ -40,7 +40,8 @@ post_upgrade() { /usr/MythVantage/bin/systemconfig.py -m hostype fi - /usr/MythVantage/bin/systemconfig.py -m locale + /usr/MythVantage/bin/systemconfig.py -m locale,vnc,ir + echo " Removing pts and shm from fstab..." cp -a /etc/fstab /etc/fstab.backup.pre_pts_shm sed -i '/\/dev\/pts/d' /etc/fstab diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py index 3160989..a009d72 100755 --- a/abs/core/LinHES-config/mv_common.py +++ b/abs/core/LinHES-config/mv_common.py @@ -216,13 +216,17 @@ def pacinstall(pkg): elif pkg == "fuppes": pacinstall("fuppes-svn") elif pkg == "mupen64": - pacinstall("mupen64plus-svn") + pacinstall("mupen64plus") elif pkg == "dolphinemu": pacinstall("dolphin-emu") elif pkg == "webonlinhes": pacinstall("web-on-linhes") elif pkg == "xbmc": pacinstall("xbmc-pvr-addons") + elif pkg == "kodi": + pacinstall("kodi-pvr-addons") + elif pkg == "plexhometheater": + pacinstall("plex-home-theater") elif pkg == "mame": pacinstall("sdlmame") elif pkg == "foldingathome": @@ -254,13 +258,17 @@ def pacremove(pkg): elif pkg == "fuppes": pacremove("fuppes-svn") elif pkg == "mupen64": - pacremove("mupen64plus-svn") + pacremove("mupen64plus") elif pkg == "dolphinemu": pacremove("dolphin-emu") elif pkg == "webonlinhes": pacremove("web-on-linhes") elif pkg == "xbmc": pacremove("xbmc-pvr-addons") + elif pkg == "kodi": + pacremove("kodi-pvr-addons") + elif pkg == "plexhometheater": + pacremove("plex-home-theater") elif pkg == "mame": pacremove("sdlmame") elif pkg == "foldingathome": diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py index c4386cc..8eab7b0 100755 --- a/abs/core/LinHES-config/mv_ir.py +++ b/abs/core/LinHES-config/mv_ir.py @@ -46,6 +46,16 @@ def setup_lirc_links(mythhome): else: logging.debug(" /etc/lircrc does not exist, can not link it") + if os.path.exists("/etc/wol-lircrc"): + if not os.path.exists(mythhome+"/.wol-lircrc"): + logging.debug(" Creating symlink for .wol-lircrc") + os.symlink("/etc/wol-lircrc",mythhome+"/.wol-lircrc") + else: + logging.debug(" %s/.wol-lircrc already present",mythhome) + else: + logging.debug(" /etc/wol-lircrc does not exist, can not link it") + + def scrub_modules(filename,module): logging.debug(" scrubbing %s from %s",module,filename) cmd = '''sed -i -e '/.*#%s/d' %s''' %(module,filename) @@ -91,6 +101,7 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): HostBlasterType_values=["None",""] if Remotetype == "no_remote" and (HostBlasterType in HostBlasterType_values) : mv_common.remove_service("remotes") + mv_common.remove_service("irexec") elif Remotetype == "tinker": pass #do nothing else: @@ -99,6 +110,8 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): mv_common.runcmd(cmd) cmd = "mv /etc/lircrc /etc/lircrc-%s" %currenttime mv_common.runcmd(cmd) + cmd = "mv /etc/wol-lircrc /etc/wol-lircrc-%s" %currenttime + mv_common.runcmd(cmd) cmd = "mv /etc/remote.run /etc/remote.run-%s" %currenttime mv_common.runcmd(cmd) if remotebucket == "user": @@ -108,16 +121,16 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): files = remote_path + "/lircd*" logging.debug(" Using %s",files) - # /etc/lircd.conf include + # /etc/lircd.conf symlink for filename in glob.glob(files): # Ignore subfolders if os.path.isdir (filename): logging.debug(" %s is a dir, skipping",filename) continue - include_file("/etc/lircd.conf",filename) + os.symlink(filename,"/etc/lircd.conf") #files = templates + "/remotes/" + Remotetype + "/lircrc*" - # inluce lircrc + # include lircrc files = remote_path + "/lircrc*" logging.debug(" Using %s",files) for filename in glob.glob(files): @@ -127,7 +140,17 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): continue include_file("/etc/lircrc",filename) - #if remote has a special run file use it. + # include wol-lircrc + files = remote_path + "/wol-lircrc*" + logging.debug(" Using %s",files) + for filename in glob.glob(files): + # Ignore subfolders + if os.path.isdir (filename): + logging.debug(" %s is a dir, skipping",filename) + continue + include_file("/etc/wol-lircrc",filename) + + #if remote has a special run file use it. files = remote_path + "/remote.run*" logging.debug(" Using %s",files) for filename in glob.glob(files): @@ -138,46 +161,55 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): cmd = "cp %s /etc/remote.run" %filename mv_common.runcmd(cmd) - #if remote has a special xbmc file, use it. - xbmcfile= remote_path + "/xbmc.xml" - userxmbcfile = mythhome+"/.xbmc/userdata/Lircmap.xml" - - if os.path.exists(xbmcfile): - logging.debug(" XBMC lirc file present") - logging.info(" Setting up lirc for xbmc") - if not os.path.exists(mythhome+"/.xbmc/userdata"): - logging.debug(" Creating %s/.xbmc",mythhome) - try: - os.mkdir(mythhome+"/.xbmc") - except: - logging.debug(" Couldn't create .xbmc/ ") + #if remote has a Lircmap.xml file, use it for kodi and plexht. + kodifile= remote_path + "/Lircmap.xml" + + for app in ['Kodi', 'PlexHT']: + if app == 'Kodi': + userLircmap = mythhome+"/.kodi/userdata/Lircmap.xml" + userdirname = ".kodi" + elif app == 'PlexHT': + userLircmap = mythhome+"/.plexht/userdata/Lircmap.xml" + userdirname = ".plexht" + + if os.path.exists(kodifile): + logging.debug(" %s lirc file present at %s", app, kodifile) + logging.info(" Setting up lirc for %s",app) + if not os.path.exists(mythhome+"/"+userdirname+"/userdata"): + logging.debug(" Creating %s/%s", mythhome, userdirname) + try: + os.mkdir(mythhome+"/"+userdirname) + except: + logging.debug(" Couldn't create %s/ ",userdirname) + try: + os.mkdir(mythhome+"/"+userdirname+"/userdata/") + except: + logging.debug(" Couldn't create %s/userdata",userdirname) + + try: + cmd = ''' chown -R mythtv %s/%s''' %(mythhome,userdirname) + mv_common.runcmd(cmd) + cmd = ''' chgrp -R mythtv %s/%s/userdata''' %(mythhome,userdirname) + mv_common.runcmd(cmd) + except: + logging.debug(" Couldn't change permissions for %s",userdirname) + pass try: - os.mkdir(mythhome+"/.xbmc/userdata/") + cmd = ''' rm -f %s''' %(userLircmap) + mv_common.runcmd(cmd) + logging.debug(" Creating symlink for %s Lircmap.xml",app) + os.symlink(kodifile, mythhome+"/"+userdirname+"/userdata/Lircmap.xml") except: - logging.debug(" Couldn't create .xbmc/userdata ") - - try: - cmd = ''' chown -R mythtv %s/.xbmc''' %mythhome - mv_common.runcmd(cmd) - cmd = ''' chgrp -R mythtv %s/.xbmc/userdata''' %mythhome - mv_common.runcmd(cmd) - except: - logging.debug(" Couldn't change permissions for .xbmc") pass - try: - cmd = ''' rm -f %s''' %(userxmbcfile) + else: + logging.debug(" %s Lircmap file %s not present", userdirname, kodifile) + logging.debug(" Checking if %s is a symlink", userLircmap) + if os.path.islink(userLircmap): + logging.info(" Removing symlink %s", userLircmap) + cmd = ''' rm -f %s''' %(userLircmap) mv_common.runcmd(cmd) - logging.debug(" Creating symlink for xmbc lircrc") - os.symlink(xbmcfile, mythhome+"/.xbmc/userdata/Lircmap.xml") - except: - pass - else: - logging.debug(" XBMC lirc file %s not present" %xbmcfile) - - - - - + else: + logging.debug(" Not a symlink %s", userLircmap) #remote has it's own modprobe.d/conf filename @@ -195,9 +227,10 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): #cleanup - cmd = "chmod 755 /etc/lircrc /etc/remote.run" + cmd = "chmod 755 /etc/lircrc /etc/wol-lircrc /etc/remote.run" mv_common.runcmd(cmd) mv_common.add_service("remotes") + mv_common.add_service("irexec") def setup_ir_receiver(ReceiverType,TEMPLATES,HDHRlirc_device,myip): diff --git a/abs/core/LinHES-config/mv_software.py b/abs/core/LinHES-config/mv_software.py index 13f0f2f..102fa96 100755 --- a/abs/core/LinHES-config/mv_software.py +++ b/abs/core/LinHES-config/mv_software.py @@ -72,7 +72,8 @@ def setup_software(systemconfig, data_config): "webmin", "webonlinhes", "huludesktop", - "xbmc", + "plexhometheater", + "kodi", "dvdcss", "foldingathome") diff --git a/abs/core/LinHES-config/mv_vnc.py b/abs/core/LinHES-config/mv_vnc.py index 0260494..1a028d2 100755 --- a/abs/core/LinHES-config/mv_vnc.py +++ b/abs/core/LinHES-config/mv_vnc.py @@ -79,23 +79,6 @@ exec wmaker logging.info("__End of vnc \n") -def start_xvnc(xvncpasswd): - logging.info(" Checking if x11vnc needs to be started") - if mv_common.check_service("frontend"): - logging.info(" Frontend is running, starting x11vnc") - line='''su mythtv -c "DISPLAY=localhost:0 x11vnc -rfbport 5902 --passwd %s 2>&1 > /dev/null &" \n''' %xvncpasswd - #line='''su mythtv -c "DISPLAY=localhost:0 xscreensaver -no-splash \&" ''' - try: - fout = open("/tmp/cmd.sh", "w") - fout.write(line) - fout.close() - os.chmod("/tmp/cmd.sh",0755) - cmd="/tmp/cmd.sh" - os.system(cmd) - os.remove("/tmp/cmd.sh") - except: - logging.info(" Couldn't start x11vnc") - def setupvnc(systemconfig,data_config): logging.info("____Start of vnc config ____") @@ -114,6 +97,7 @@ def setupvnc(systemconfig,data_config): mv_common.add_service("vnc") else: mv_common.remove_service("vnc") + mv_common.pacremove("tigervnc") #x11vnc try: xvnc=systemconfig.get("xvncenable") @@ -125,9 +109,10 @@ def setupvnc(systemconfig,data_config): if xvnc == "1": logging.info(" Installing x11vnc system\n") mv_common.pacinstall("x11vnc") - start_xvnc(xvncpasswd) + mv_common.add_service("xvnc") else: - mv_common.pacinstall("x11vnc") + mv_common.remove_service("xvnc") + mv_common.pacremove("x11vnc") - logging.info("__End of vnc\n")
\ No newline at end of file + logging.info("__End of vnc\n") diff --git a/abs/core/LinHES-config/plymouth_config.py b/abs/core/LinHES-config/plymouth_config.py index 7c7546d..bb60722 100755 --- a/abs/core/LinHES-config/plymouth_config.py +++ b/abs/core/LinHES-config/plymouth_config.py @@ -5,7 +5,7 @@ __author__ = "James Meyer" __date__ = "Dec 11th 2012" -import subprocess +import subprocess, sys class plymouth_driver(): @@ -180,7 +180,7 @@ def go(): #print p.get_old_modules() #print p.get_new_modules() - if p.create_newmkinitcpio() == True: + if p.create_newmkinitcpio() == True or "--mkinitcpio" in sys.argv: p.run_mkinitcpio() diff --git a/abs/core/LinHES-config/xconfig.cron b/abs/core/LinHES-config/xconfig.cron new file mode 100755 index 0000000..ec44803 --- /dev/null +++ b/abs/core/LinHES-config/xconfig.cron @@ -0,0 +1,7 @@ +#!/bin/bash + +/usr/MythVantage/bin/xconfig.sh >> /dev/null 2>&1 & +#remove xconfig.cron from root crontab +grep -v "* * * * * /usr/bin/bash /usr/MythVantage/bin/xconfig.cron" /var/spool/cron/root > /var/spool/cron/root2 +mv /var/spool/cron/root2 /var/spool/cron/root +echo "root" >> /var/spool/cron/cron.update diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh index 52dc952..acc949c 100755 --- a/abs/core/LinHES-config/xconfig.sh +++ b/abs/core/LinHES-config/xconfig.sh @@ -8,23 +8,25 @@ for i in ati intel mga savage sis unichrome do templist=`echo $i-dri xf86-video-$i` NVPKGS=`echo $NVPKGS $templist` - done + BASE="" MYTH_RUN_STATUS="1" . /etc/profile -#MYTHHOME=$BASE/home/mythtv +NVIDIA_304xx="$TEMPLATES/xorg/304xx_supported.txt" +NVIDIA_340xx="$TEMPLATES/xorg/340xx_supported.txt" +NVIDIA_SUPPORTED="$TEMPLATES/xorg/nvidia_supported.txt" . /usr/MythVantage/bin/install_functions.sh home_check - function Xvalues { - echo $VGACARDTYPE + #echo $VGACARDTYPE + VGAFORCED=0 if [ "x$VGACARDTYPE" = "x" ] then - CMDLINE=$(cat /proc/cmdline) + CMDLINE=$(cat /proc/cmdline) echo "$CMDLINE" | grep -q forceXvesa if [ $? = 0 ] then @@ -36,17 +38,20 @@ function Xvalues { VGAPCIID=`lspci | grep -i vga |grep -vi non-vga| sort -r | head -n 1 | cut -d" " -f1` CARDID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f2` VENDORID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f1` + echo "Detected $VGACARDTYPE as the video card type" fi else - echo "VGACARDTYPE already set" + echo "Video card type forced to $VGACARDTYPE" + VGAFORCED=1 + CARDID="NOT_DETECTED" fi - echo "Detected $VGACARDTYPE as the video card type" + VGACARDTYPE=${VGACARDTYPE,,} #make lowercase } function presetupX { if [ "$XIgnoreConfig" = 1 ] then - echo "Using User supplied X" + echo "Using User Supplied X" if [ -f "$MYTHHOME/templates/xorg.user" ] then cp -f "$MYTHHOME/templates/xorg.user" "$XORG_CONF" @@ -60,14 +65,14 @@ function presetupX { } function nvidia_prepare { - for i in mesa-libgl nvidia nvidia-utils nvidia-libgl nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils + for i in mesa-libgl nvidia nvidia-utils nvidia-libgl opencl-nvidia nvidia-304xx nvidia-304xx-utils nvidia-304xx-libgl opencl-nvidia-304xx nvidia-340xx nvidia-340xx-utils nvidia-340xx-libgl opencl-nvidia-340xx do pacman --noconfirm -Rdd $i >> $LOGFILE 2>&1 done for i in `echo ${NVPKGS}` do - pacman --noconfirm -Rc $i >> $LOGFILE 2>&1 + pacman --noconfirm -Rc $i >> $LOGFILE 2>&1 done } @@ -84,32 +89,113 @@ function pkg_check () { } function nvidia_driver_install { - echo "Installing Nvidia driver" cp "$TEMPLATES/xorg/xorg.nvidia" $BASE/etc/X11/xorg.conf.d/20-automv.conf - #install latest drivers - LIST="nvidia nvidia-libgl nvidia-utils" - for i in `echo ${LIST}` - do - pkg_check $i - done - #this is used to remove nvidia - nvidia_prepare - for i in `echo ${LIST}` - do - pacman -S --noconfirm $i >> $LOGFILE 2>&1 - done - installed=1 + + INSTALLED=0 + + grep -qi "$CARDID" "$NVIDIA_SUPPORTED" + if [[ $? = 0 || $VGAFORCED -eq 1 && $VGACARDTYPE == "nvidia" ]] + then + LIST="nvidia nvidia-libgl nvidia-utils opencl-nvidia" + for i in `echo ${LIST}` + do + pkg_check $i + done + echo "Installing current nvidia driver" + echo "Installing current nvidia driver" >> $LOGFILE 2>&1 + nvidia_prepare + pacman --noconfirm -S ${LIST} >> $LOGFILE 2>&1 + if [[ $? != 0 ]] + then + echo "ERROR: Unable to install current nvidia driver" + echo "ERROR: Unable to install current nvidia driver" >> $LOGFILE 2>&1 + else + INSTALLED=1 + fi + fi + + if [ $INSTALLED -eq 0 ] + then + grep -qi "$CARDID" "$NVIDIA_340xx" + if [[ $? = 0 || $VGAFORCED -eq 1 && $VGACARDTYPE == "nvidia-340xx" ]] + then + LIST="nvidia-340xx nvidia-340xx-libgl nvidia-340xx-utils opencl-nvidia-340xx" + for i in `echo ${LIST}` + do + pkg_check $i + done + echo "Installing nvidia-340xx driver" + echo "Installing nvidia-340xx driver" >> $LOGFILE 2>&1 + nvidia_prepare + pacman --noconfirm -S ${LIST} >> $LOGFILE 2>&1 + if [[ $? != 0 ]] + then + echo "ERROR: Unable to install nvidia-340xx driver" + echo "ERROR: Unable to install nvidia-340xx driver" >> $LOGFILE 2>&1 + else + INSTALLED=1 + fi + fi + fi + + if [ $INSTALLED -eq 0 ] + then + grep -qi "$CARDID" "$NVIDIA_304xx" + if [[ $? = 0 || $VGAFORCED -eq 1 && $VGACARDTYPE == "nvidia-304xx" ]] + then + LIST="nvidia-304xx nvidia-304xx-libgl nvidia-304xx-utils opencl-nvidia-304xx" + for i in `echo ${LIST}` + do + pkg_check $i + done + echo "Installing nvidia-304xx driver" + echo "Installing nvidia-304xx driver" >> $LOGFILE 2>&1 + nvidia_prepare + pacman --noconfirm -S ${LIST} >> $LOGFILE 2>&1 + if [[ $? != 0 ]] + then + echo "ERROR: Unable to install nvidia-304xx driver" + echo "ERROR: Unable to install nvidia-304xx driver" >> $LOGFILE 2>&1 + else + INSTALLED=1 + fi + fi + fi + + if [ $INSTALLED -eq 0 ] + then + #this is a failsafe, can't find the right driver, then use the latest' + echo " Couldn't find the card id in any list" + echo " Couldn't find the card id in any list" >> $LOGFILE 2>&1 + LIST="nvidia nvidia-libgl nvidia-utils opencl-nvidia" + for i in `echo ${LIST}` + do + pkg_check $i + done + echo "Installing current nvidia driver" + echo "Installing current nvidia driver" >> $LOGFILE 2>&1 + nvidia_prepare + pacman --noconfirm -S ${LIST} >> $LOGFILE 2>&1 + if [[ $? != 0 ]] + then + echo "ERROR: Unable to install current nvidia driver" + echo "ERROR: Unable to install current nvidia driver" >> $LOGFILE 2>&1 + else + INSTALLED=1 + fi + fi + echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG" } function vmware_driver_install { - echo "Installing VMware driver" - echo "Installing VMware driver" >> $LOGFILE 2>&1 LIST="xf86-input-vmmouse xf86-video-vmware xf86-video-vesa svga-dri mesa-libgl" for i in `echo ${LIST}` do pkg_check $i done + echo "Installing VMware driver" + echo "Installing VMware driver" >> $LOGFILE 2>&1 #this is used to remove nvidia nvidia_prepare for i in `echo ${LIST}` @@ -119,46 +205,26 @@ function vmware_driver_install { } function vesa_driver_install { - echo "Installing Vesa driver" - echo "Installing Vesa driver" >> $LOGFILE 2>&1 pkg_check xf86-video-vesa pkg_check mesa-libgl + echo "Installing Vesa driver" + echo "Installing Vesa driver" >> $LOGFILE 2>&1 #this is used to remove nvidia nvidia_prepare pacman -S --noconfirm xf86-video-vesa mesa-libgl >> $LOGFILE 2>&1 } function intel_driver_install { - echo "Installing Intel driver" - echo "Installing Intel driver" >> $LOGFILE 2>&1 pkg_check xf86-video-intel pkg_check mesa-libgl + echo "Installing Intel driver" + echo "Installing Intel driver" >> $LOGFILE 2>&1 #this is used to remove nvidia nvidia_prepare pacman -S --noconfirm xf86-video-intel mesa-libgl >> $LOGFILE 2>&1 echo "/usr/lib/libIntelXvMC.so.1" > "$XVMC_CONFIG" } -# if [ "$Xcategory" = "Nvidia" ] -# then -# #Xres="" -# if [ "$XnVidia1080p" = "1" ] -# then -# Xres="${Xres} 1920x1080_60" -# fi -# if [ "$XnVidia1080i" = "1" ] -# then -# Xres="${Xres} 1920x1080_60i" -# fi -# if [ "$XnVidia720p" = "1" ] -# then -# Xres="${Xres} 1280x720_60" -# fi -# if [ "$XnVidia480p" = "1" ] -# then -# Xres="${Xres} 720x480_60" -# fi - function set_res { echo " Setting modeline to ${Xres}" echo " Setting modeline to ${Xres}" >> $LOGFILE 2>&1 @@ -176,13 +242,12 @@ function set_res { EOF } - function setupX { Xvalues if [ x = x ] then case $VGACARDTYPE in - NVIDIA|nVidia|nvidia) + nvidia|nvidia-340xx|nvidia-304xx) nvidia_driver_install if [ \"$Xres\" = "Auto" ] then @@ -197,7 +262,7 @@ function setupX { fi ;; - VMware) + vmware) vmware_driver_install cp $TEMPLATES/xorg/xorg.vmware /etc/X11/xorg.conf.d/20-automv.conf echo "copy in autostart functions" >> $LOGFILE 2>&1 @@ -211,9 +276,9 @@ function setupX { else rm -f /etc/X11/xorg.conf.d/30-screen.conf fi - ;; + ;; - Intel|intel) + intel) intel_driver_install cp $TEMPLATES/xorg/xorg.intel /etc/X11/xorg.conf.d/20-automv.conf if [ ${Xres} != "Auto" ] @@ -222,9 +287,13 @@ function setupX { else rm -f /etc/X11/xorg.conf.d/30-screen.conf fi - ;; + ;; - vesa|InnoTek|*) #leaving this as * and vesa for no real reason other then it's explicit to catch vesa + vesa|innotek|*) #leaving this as * and vesa for no real reason other then it's explicit to catch vesa + if [[ $VGACARDTYPE != "vesa" && $VGACARDTYPE != "innotek" ]] + then + echo "Unknown card type, using Vesa." + fi vesa_driver_install cp $TEMPLATES/xorg/xorg.vesa /etc/X11/xorg.conf.d/20-automv.conf if [ ${Xres} != "Auto" ] @@ -247,7 +316,17 @@ function setupX { } - +function pacman_wait { + if [ -f /var/lib/pacman/db.lck ] + then + echo "Pacman is running and must quit before xconfig.sh can continue." + echo " Waiting for pacman to quit..." + while [ -f /var/lib/pacman/db.lck ] + do + sleep 5 + done + fi +} #--------------------------------------------------------------------------------- #MAIN @@ -267,7 +346,6 @@ then fi - if [ -f /etc/systemconfig ] then . /etc/systemconfig @@ -291,8 +369,9 @@ then fi - XORG_CONF="/etc/X11/xorg.conf" XVMC_CONFIG="/etc/X11/XvMCConfig" + +pacman_wait presetupX diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session index ae702cf..4563078 100755 --- a/abs/core/LinHES-system/LinHES-session +++ b/abs/core/LinHES-system/LinHES-session @@ -67,20 +67,6 @@ function keylaunch(){ } -function start_x11vnc(){ - if [ x$xvncenable = "x1" ] - then - if [ -e /etc/x11vnc.cfg ] - then - . /etc/x11vnc.cfg - x11vnc $x11vnc_options - else - x11vnc -forever -rfbport 5902 --passwd $xvncpassword - fi - fi -} - - function fluxbox_settings(){ if [ ! -e $HOME/.fluxbox ] then @@ -365,9 +351,6 @@ function run_myth(){ mv gdb.txt gdb.txt.mythfrontend sleep 5 else - killall -9 irexec - /usr/bin/irexec -d - if [ ! x$STARTUP_STYLE = xlegacy ] then run_wmctrl & @@ -421,7 +404,6 @@ $WM & pid=$! mouse_move keylaunch -start_x11vnc & unclutter load_nvidia_settings run_tilda diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index ad23218..d6b4bac 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system -pkgver=8.2 -pkgrel=3 +pkgver=8.3 +pkgrel=9 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -28,7 +28,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py mythwelcome-config.py mythwelcome-set-alarm.sh mythwelcome-test-wakeup.sh" source=(LinHES-session LinHES-profile.sh $binfiles - alsa-base cacheclean.cron myth_mtc.cron xfs_defrag.cron + alsa-base cacheclean.cron fstrim.cron myth_mtc.cron xfs_defrag.cron etc_care.cron readme_is_xml readme_light add_storage.readme system-sudo.rules msg.cfg) @@ -62,6 +62,8 @@ package() { #install -m755 -D $srcdir/smolt.cron $pkgdir/etc/cron.weekly/smolt.cron install -m755 -D $srcdir/cacheclean.cron $pkgdir/etc/cron.weekly/cacheclean install -m755 -D $srcdir/xfs_defrag.cron $pkgdir/etc/cron.weekly/xfs_defrag + install -m755 -D $srcdir/fstrim.cron $pkgdir/etc/cron.weekly/fstrim + install -m755 -D $srcdir/etc_care.cron $pkgdir/etc/cron.weekly/etc_care install -m755 -D $srcdir/myth_mtc.cron $pkgdir/etc/cron.hourly/myth_mtc #sudo rules @@ -75,11 +77,11 @@ package() { } -md5sums=('a10cb96850951ae835c46f41f92463b2' +md5sums=('8415c4b2587a8a1e6a312484c1edafcb' 'de32a1c50101265dd7f6ca5037f7a26a' '301884fb60521627fffd1160b2cf5181' '76b2637cac0452b3acdbeeb4e8a5474b' - '0149e77a12d30f1050dd3990f6f1f123' + 'd02ddadeb2181f90954e435842cd7f0a' 'dc3eef2a624754e16805d72bbe488b67' '617af86b901538817ebdcaf646248dc5' '542e670e78d117657f93141e9689f54d' @@ -91,22 +93,22 @@ md5sums=('a10cb96850951ae835c46f41f92463b2' '33fbebbd546672cedd3c5e7350ab414e' 'c773d8caacba8fbd4968e8afe5137bc6' '3edef50a49a47694bf8add39cc160add' - 'b376c30f95892b8682fad84f81685f75' + '8336874ee9e527f9799c3dec9fb770b5' 'bc69a520add58ede9b060c73e67ace13' '74e17d6f7453c52d56fecaed5c3f6ad5' '47e093e8cfe4b5b96602358e1f540832' '63bbc62240f46a9997eaae4a84b09b76' '2c005d95312018bef80092136f80f254' - '6519d209e151cdc39ae7e1091d189c3e' + 'c8db6a83ecc089ea37ab7fcb0f7a01cf' 'ca63946920ba33de1f15abda83e74e40' '84c0ea62550b0bf9d84ab48eddc08276' '3e60b17892e5b8214d47dcfddf5215a4' '57ec994cc3964a10c00580e89ebcae35' - '7ba5e774bfebc3ec2469c9fe9a76e2ce' + '1da933fd2f4436c1ecaf3d6d0c7c0d68' '0c3509b48f11af0dc1bf989721fe9ca7' - 'ac61cc460d9e97ba1f5ef69e92cdfbe5' + '9249313ae171abd5405f60625020da63' 'f3502bb7c665750da0ecdf6918f7c838' - 'b7febd04f64fe21e8cfbb888219b0b31' + 'fd3b08fc13b273f0ee3a5de775d63eb6' '06a628469051237943b7c874f2e29b8a' '8fe86aa9109a285aedce3c8658952bbb' '3300ea8b02e4fb8bd3409df348de6e16' @@ -117,7 +119,7 @@ md5sums=('a10cb96850951ae835c46f41f92463b2' 'bacc813b48bafcc6fe906e5969930501' '8e02efe1ad0df9a179075147eebb05b9' '8b0298f70f97cc1dc2a58b9a73c64bd3' - '911b0fbc8d9178dac1a193346c9decaf' + '716710e0db42147b079c9ec1c7080efa' '34fc1f58ad1eabf4eff4979d420760c0' '69ecfe682f1b61c2c4c95d890b9f523c' 'a94fe6d980f4b810f2e2ae5352084b39' @@ -131,8 +133,10 @@ md5sums=('a10cb96850951ae835c46f41f92463b2' '410795ef9039e4c6c0484e706ecfd567' 'eb879fee9603a05d5420d4ce8ed9e450' '02c810c2f47b7c4495fdacaf54189473' - 'fae4162988de9525ba3f9341e17f9c52' - '474d5c6883fcfffae4f199aceb3b1356' + '1aac1872bf9569ea58ceb2f6f766a654' + 'dc48a53d4e5fe27b218657ccc318d07f' + '4d7164800122243be6513b29c8fc498e' + 'd14fdc38878c70011754317b0f2ea59e' '36bdfa8d877cea20ca3870faf08e08d5' '59d0602bac7e06f11abba1894acc8bb0' 'b12bbf3e028f51b08acef2799a5708bc' diff --git a/abs/core/LinHES-system/cacheclean b/abs/core/LinHES-system/cacheclean index cfc8d58..24032c9 100755 --- a/abs/core/LinHES-system/cacheclean +++ b/abs/core/LinHES-system/cacheclean @@ -1,5 +1,5 @@ #!/usr/bin/env python2 -"""cacheclean - a simple python script to clean up the /data/var/cache/pacman/pkg directory. +"""cacheclean - a simple python script to clean up the /data/storage/disk0/pacman/pkg directory. More versatile than 'pacman -Sc' in that you can select how many old versions to keep. Usage: cacheclean {-p} {-v} <# of copies to keep> @@ -78,7 +78,7 @@ except getopt.GetoptError as msg: sys.exit(1) # change to the pkg directory & get a sorted list of its contents -os.chdir('/data/var/cache/pacman/pkg') +os.chdir('/data/storage/disk0/pacman/pkg') pkg_fns = os.listdir('.') pkg_fns.sort() diff --git a/abs/core/LinHES-system/checkXFSfrag.sh b/abs/core/LinHES-system/checkXFSfrag.sh index 99b833c..74b73c4 100755 --- a/abs/core/LinHES-system/checkXFSfrag.sh +++ b/abs/core/LinHES-system/checkXFSfrag.sh @@ -28,24 +28,32 @@ # DO NOT ALTER HEADER FROM THIS LINE UP. # e='/bin/echo -e' # Use the echo command, not built-in. -xfsfsr=/usr/sbin/xfs_fsr # Set variable with the path to xfs_fsr. -xfsdb=/usr/sbin/xfs_db # Set variable with the path to xfs_db. +xfsfsr=/usr/bin/xfs_fsr # Set variable with the path to xfs_fsr. +xfsdb=/usr/bin/xfs_db # Set variable with the path to xfs_db. pctmax=15 # Set maxiumum frag percent needed for defrag. # This is zero here for testing purposes only # a higher number should be used in production. array=`df -T|grep xfs|cut -f 1 --delim=" "` # Array of all XFS file systems. for i in ${array[@]}; do - percentage=`$xfsdb -c frag -r ${i}|cut -f 7 --delim=" "` - percent2=`$e $percentage|cut -f 1 --delim=.` - if [ "$percent2" -gt "$pctmax" ] + #check that the device is SATA and skip defrag on SSDs + device=`echo ${i} | cut -f 3 --delim="/" | sed 's/[0-9]//g'` + isSATA=`cat /sys/block/${device}/queue/rotational` + if [[ $isSATA -eq 1 ]] then - $e "${i} is $percentage fragmented. Running defragment on ${i}." + percentage=`$xfsdb -c frag -r ${i}|cut -f 7 --delim=" "` + percent2=`$e $percentage|cut -f 1 --delim=.` + if [ "$percent2" -gt "$pctmax" ] + then + $e "${i} is $percentage% fragmented. Running defragment on ${i}." # Only uncomment one of the following two lines. #$xfsfsr -v ${i} # Uncomment for verbose defrag. $xfsfsr ${i} # Uncomment for quiet defrag. + else + $e "${i} is $percent2% fragmented and is below the fragmentation threshold of $pctmax%. Skipping." + fi else - $e "${i}\t$percent2 is not above fragmentation threshold of $pctmax." + echo "${i} is an SSD. Skipping." fi done exit 0 diff --git a/abs/core/LinHES-system/etc_care.cron b/abs/core/LinHES-system/etc_care.cron new file mode 100755 index 0000000..97e0283 --- /dev/null +++ b/abs/core/LinHES-system/etc_care.cron @@ -0,0 +1,16 @@ +#!/bin/bash +MYTH_RUN_STATUS=1 +. /etc/profile + +KeepBackups=4 + +for f in "/etc/lircd.conf" "/etc/lircrc" "/etc/wol-lircrc" "/etc/remote.run" "/etc/asound.conf" +do + NumBackups=`ls -d $f-* | wc -l` + if [[ $NumBackups -gt $KeepBackups ]] + then + echo "Deleting old $f-* files..." + numdel=$(($NumBackups-$KeepBackups)) + rm -rf `ls -t $f-* | tail -$numdel` + fi +done diff --git a/abs/core/LinHES-system/fstrim.cron b/abs/core/LinHES-system/fstrim.cron new file mode 100755 index 0000000..ad0b4aa --- /dev/null +++ b/abs/core/LinHES-system/fstrim.cron @@ -0,0 +1,4 @@ +#!/bin/bash +#. /etc/profile +/usr/bin/fstrim -av | /usr/bin/logger -t fstrim + diff --git a/abs/core/LinHES-system/gen_game_xml.py b/abs/core/LinHES-system/gen_game_xml.py index e5d9afe..611bed5 100644 --- a/abs/core/LinHES-system/gen_game_xml.py +++ b/abs/core/LinHES-system/gen_game_xml.py @@ -24,6 +24,7 @@ class Gen_lib_xml: def read_snippets(self): xml_snippets="" + lines=[] try: os.chdir(self.snippit_dir) except: @@ -35,12 +36,13 @@ class Gen_lib_xml: try: print " gen_game_xml: reading in %s" %conf_file f=open(conf_file,'r') - lines=f.readlines() + line=f.readlines() f.close() except: print " gen_game_xml: Couldn't open %s for reading" %conf_file print " Exiting" sys.exit(0) + lines.extend(line) if len(file_list) == 0: print " gen_game_xml: no conf files found" @@ -114,4 +116,4 @@ def main(): write_xml(new_xml,filename) if __name__ == "__main__": - main()
\ No newline at end of file + main() diff --git a/abs/core/LinHES-system/gen_lib_xml.py b/abs/core/LinHES-system/gen_lib_xml.py index 320a84d..1cc4516 100644 --- a/abs/core/LinHES-system/gen_lib_xml.py +++ b/abs/core/LinHES-system/gen_lib_xml.py @@ -24,6 +24,7 @@ class Gen_lib_xml: def read_snippets(self): xml_snippets="" + lines=[] try: os.chdir(self.snippit_dir) except: @@ -35,12 +36,13 @@ class Gen_lib_xml: try: print " gen_lib_xml: reading in %s" %conf_file f=open(conf_file,'r') - lines=f.readlines() + line=f.readlines() f.close() except: print " gen_lib_xml: Couldn't open %s for reading" %conf_file print " Exiting" sys.exit(0) + lines.extend(line) if len(file_list) == 0: print " gen_lib_xml: no conf files found" @@ -114,4 +116,4 @@ def main(): write_xml(new_xml,filename) if __name__ == "__main__": - main()
\ No newline at end of file + main() diff --git a/abs/core/LinHES-system/lh_system_backup_job b/abs/core/LinHES-system/lh_system_backup_job index 3ac9de0..ca6800a 100644 --- a/abs/core/LinHES-system/lh_system_backup_job +++ b/abs/core/LinHES-system/lh_system_backup_job @@ -33,12 +33,15 @@ function backup_status_check(){ function backup(){ + echo echo "Starting Backup" mkdir -p $BACKUPDIR/$DATE #backup database if [ $SystemType = Master_backend -o $SystemType = Standalone ] then + echo + echo "Backup mysql databases" pacman -Q mysql 2>/dev/null if [ $? = 0 ] then @@ -57,20 +60,17 @@ function backup(){ echo " All databases in one file" mysqldump -x --all-databases > $BACKUPDIR/$DATE/all_databases backup_status_check $? - - - fi fi - #backup saved settings + echo "Backup saved settings" if [ -e /usr/MythVantage/templates/settings ] then cp -rp /usr/MythVantage/templates/settings $BACKUPDIR/$DATE/settings backup_status_check $? fi - #backup etc + echo "Backup etc" cp -rp /etc $BACKUPDIR/$DATE/etc if [ -e /var/lib/oss ] then @@ -78,30 +78,40 @@ function backup(){ backup_status_check $? fi - #backup func keys + echo "Backup func keys" cp -rp /etc/pki $BACKUPDIR/$DATE/pki if [ ! -f $MYTHHOME/backup_config/backup_exclude.txt ] then mkdir -p $MYTHHOME/backup_config/ - echo ".mythtv/themecache" > $MYTHHOME/backup_config/backup_exclude.txt - echo "tmp" >> $MYTHHOME/backup_config/backup_exclude.txt - echo ".vnc/*log" >> $MYTHHOME/backup_config/backup_exclude.txt - echo ".vnc/*pid" >> $MYTHHOME/backup_config/backup_exclude.txt + touch $MYTHHOME/backup_config/backup_exclude.txt chmod 777 $MYTHHOME/backup_config/backup_exclude.txt fi + for i in ".mythtv/themecache" ".mythtv/remotecache" ".mythtv/Cache-myth*" ".cache" "tmp" ".vnc/*log" ".vnc/*pid" + do + grep -qF "$i" $MYTHHOME/backup_config/backup_exclude.txt + rc=$? + if [ $rc != 0 ] + then + echo "$i" >> $MYTHHOME/backup_config/backup_exclude.txt + fi + done + + echo "Backup home dirs" tar -zcf $BACKUPDIR/$DATE/home_dir.tar.gz -X $MYTHHOME/backup_config/backup_exclude.txt $MYTHHOME /home/vncsvc /home/xymon if [ -f $MYTHHOME/backup_config/backup_include.txt ] then + echo + echo "Backup items from $MYTHHOME/backup_config/backup_include.txt" tar -zcf $BACKUPDIR/$DATE/other.tar.gz -T $MYTHHOME/backup_config/backup_include.txt backup_status_check $? fi - #make_zip file + echo "Compress backup file" cd $BACKUPDIR - tar -zcvf $BACKUPDIR/backup.$DATE.tgz $DATE + tar -zcf $BACKUPDIR/backup.$DATE.tgz $DATE backup_status_check $? if [ -d $BACKUPDIR/$DATE ] then @@ -114,7 +124,7 @@ function backup(){ chown nobody:nobody /data/srv/httpd/htdocs/hobbit/notes/* 2> /dev/null >/dev/null fi echo - echo "Created file:" + echo "Created backup file:" echo " $BACKUPDIR/backup.$DATE.tgz" } diff --git a/abs/core/LinHES-system/myth_mtc.cron b/abs/core/LinHES-system/myth_mtc.cron index 4f63dec..d3dc50a 100755 --- a/abs/core/LinHES-system/myth_mtc.cron +++ b/abs/core/LinHES-system/myth_mtc.cron @@ -4,20 +4,56 @@ MYTH_RUN_STATUS=1 date=`date +%Y-%m-%d` timestamp=`date +'%Y-%m-%d %H:%M'` -logFile="/var/log/$date/myth_mtc.log" +hostname=`hostname` +logFile="/var/log/${date}/${hostname}_myth_mtc.log" +log="logger -t myth_mtc -p local6.info" if [ ! -f $logFile ]; then touch $logFile + echo "" | $log fi #check logfile for Finished and if not run myth_mtc.py -if ! grep -q "Finished" $logFile +if ! grep -q "Finished Maintenance" $logFile then - MYTHCONFDIR=/usr/share/mythtv unbuffer myth_mtc.py >> $logFile 2>&1 - if [ $? = 0 ] + if ! grep -q "Finished Optimize" $logFile then - echo "Finished $timestamp" >> $logFile - else - echo "Time Exceeded $timestamp" >> $logFile + MYTHCONFDIR=/usr/share/mythtv unbuffer myth_mtc.py --optimize | $log + if [ $? = 0 ] + then + echo "" | $log + else + echo "Time Exceeded" | $log + exit + fi + fi + + if ! grep -q "Finished Backup" $logFile && grep -q "Finished Optimize" $logFile + then + MYTHCONFDIR=/usr/share/mythtv unbuffer myth_mtc.py --backup | $log + if [ $? = 0 ] + then + echo "" | $log + else + echo "Time Exceeded" | $log + exit + fi + fi + + if ! grep -q "Finished Update" $logFile + then + MYTHCONFDIR=/usr/share/mythtv unbuffer myth_mtc.py --update | $log + if [ $? = 0 ] + then + echo "" | $log + else + echo "Time Exceeded" | $log + exit + fi + fi + + if grep -q "Finished Optimize" $logFile && grep -q "Finished Backup" $logFile && grep -q "Finished Update" $logFile + then + echo "Finished Maintenance" | $log fi fi diff --git a/abs/core/LinHES-system/myth_mtc.py b/abs/core/LinHES-system/myth_mtc.py index b1ec75d..8a08c05 100755 --- a/abs/core/LinHES-system/myth_mtc.py +++ b/abs/core/LinHES-system/myth_mtc.py @@ -1,13 +1,11 @@ #!/usr/bin/python2 import sys, subprocess -import optparse import re import socket import os import datetime,time import shlex sys.dont_write_bytecode = True -import idle try: from MythTV import MythBE @@ -30,7 +28,7 @@ def optimize(): result = cursor.fetchall() except: print "\n%s Problem getting tables from the database" %(get_timestamp()) - return + return 1 ops=["REPAIR","OPTIMIZE","ANALYZE"] for row in result: ctable=row[0] @@ -38,6 +36,7 @@ def optimize(): print " %s %s" %(op,ctable) cmd= "%s table %s" %(op,ctable) cursor.execute(cmd) + return 0 def cleanup_inuseprograms(): fourHoursAgo=datetime.datetime.today() - datetime.timedelta(hours=4) @@ -60,18 +59,26 @@ def bail_if_another_is_running(): def run_stuff(): print "\n%s" %get_timestamp() - if idle.main(): - print "\n#######################################" - print "\n%s Running Optimize" %(get_timestamp()) - optimize() + if not subprocess.call(["/usr/bin/python2", "/usr/LH/bin/idle.py"]): + if ("--optimize" in sys.argv) or (len(sys.argv) == 1): + print "\n#######################################" + print "\n%s Running Optimize" %(get_timestamp()) + if not optimize(): + print "\nFinished Optimize" + else: + return True - print "\n#######################################" - print "\n%s Running Backup" %(get_timestamp()) - os.system('/usr/LH/bin/lh_system_backup_job') + if ("--backup" in sys.argv) or (len(sys.argv) == 1): + print "\n#######################################" + print "\n%s Running Backup" %(get_timestamp()) + if not os.system('/usr/LH/bin/lh_system_backup_job'): + print "\nFinished Backup" - print "\n#######################################" - print "\n%s Running System Update" %(get_timestamp()) - os.system('/usr/LH/bin/lh_system_host_update') + if ("--update" in sys.argv) or (len(sys.argv) == 1): + print "\n#######################################" + print "\n%s Running System Update" %(get_timestamp()) + if not os.system('/usr/LH/bin/lh_system_host_update'): + print "\nFinished Update" print "\n#######################################" continue_loop=False @@ -86,7 +93,7 @@ ctin=True while ctin: cleanup_inuseprograms() ctin=run_stuff() - if ctin: + if ctin: print "\n%s Waiting 10 minutes before trying again." %(get_timestamp()) time.sleep(600) diff --git a/abs/core/LinHES-system/mythvidexport.py b/abs/core/LinHES-system/mythvidexport.py index 5fdfb6d..9160f1d 100755 --- a/abs/core/LinHES-system/mythvidexport.py +++ b/abs/core/LinHES-system/mythvidexport.py @@ -5,14 +5,12 @@ # Python Script # Author: Raymond Wagner # Purpose -# This python script is intended to function as a user job, run through -# mythjobqueue, capable of exporting recordings into MythVideo. -# https://github.com/wagnerrp/mythtv-scripts/blob/master/python/mythvidexport.py -# http://www.mythtv.org/wiki/Mythvidexport.py +# This python script is intended to function as a user job, run through +# mythjobqueue, capable of exporting recordings into MythVideo. #--------------------------- -__title__ = "MythVidExport" +__title__ = "MythVidExport" __author__ = "Raymond Wagner" -__version__= "v0.7.5" +__version__= "v0.7.6" from MythTV import MythDB, Job, Recorded, Video, VideoGrabber,\ MythLog, MythError, static, MythBE @@ -58,8 +56,10 @@ class VIDEO: # prep objects self.rec = Recorded((self.chanid,self.starttime), db=self.db) + if "_" in self.rec.inetref: + self.rec.inetref = self.rec.inetref.split("_")[1] self.log(MythLog.GENERAL, MythLog.INFO, 'Using recording', - '%s - %s' % (self.rec.title.encode('utf-8'), + '%s - %s' % (self.rec.title.encode('utf-8'), self.rec.subtitle.encode('utf-8'))) self.vid = Video(db=self.db).create({'title':'', 'filename':'', 'host':gethostname()}) @@ -151,7 +151,7 @@ class VIDEO: 'Attempting TV export.') grab = VideoGrabber(self.type) match = grab.sortedSearch(self.rec.title, self.rec.subtitle) - else: # assume movie + else: # assume movie self.type = 'MOVIE' self.log(self.log.GENERAL, self.log.INFO, 'Attempting Movie export.') @@ -189,10 +189,10 @@ class VIDEO: # replace fields from viddata #print self.vid.data ext = '.'+self.rec.basename.rsplit('.',1)[1] - rep = ( ('%TITLE%','title','%s'), ('%SUBTITLE%','subtitle','%s'), - ('%SEASON%','season','%d'), ('%SEASONPAD%','season','%02d'), - ('%EPISODE%','episode','%d'), ('%EPISODEPAD%','episode','%02d'), - ('%YEAR%','year','%s'), ('%DIRECTOR%','director','%s')) + rep = ( ('%TITLE%','title','%s'), ('%SUBTITLE%','subtitle','%s'), + ('%SEASON%','season','%d'), ('%SEASONPAD%','season','%02d'), + ('%EPISODE%','episode','%d'), ('%EPISODEPAD%','episode','%02d'), + ('%YEAR%','year','%s'), ('%DIRECTOR%','director','%s')) for tag, data, format in rep: if self.vid[data]: fmt = fmt.replace(tag,format % self.vid[data]) @@ -200,27 +200,27 @@ class VIDEO: fmt = fmt.replace(tag,'') # replace fields from program data - rep = ( ('%HOSTNAME%', 'hostname', '%s'), + rep = ( ('%HOSTNAME%', 'hostname', '%s'), ('%STORAGEGROUP%','storagegroup','%s')) for tag, data, format in rep: data = getattr(self.rec, data) fmt = fmt.replace(tag,format % data) -# fmt = fmt.replace('%CARDID%',self.rec.cardid) -# fmt = fmt.replace('%CARDNAME%',self.rec.cardid) -# fmt = fmt.replace('%SOURCEID%',self.rec.cardid) -# fmt = fmt.replace('%SOURCENAME%',self.rec.cardid) -# fmt = fmt.replace('%CHANNUM%',self.rec.channum) -# fmt = fmt.replace('%CHANNAME%',self.rec.cardid) +# fmt = fmt.replace('%CARDID%',self.rec.cardid) +# fmt = fmt.replace('%CARDNAME%',self.rec.cardid) +# fmt = fmt.replace('%SOURCEID%',self.rec.cardid) +# fmt = fmt.replace('%SOURCENAME%',self.rec.cardid) +# fmt = fmt.replace('%CHANNUM%',self.rec.channum) +# fmt = fmt.replace('%CHANNAME%',self.rec.cardid) if len(self.vid.genre): fmt = fmt.replace('%GENRE%',self.vid.genre[0].genre) else: fmt = fmt.replace('%GENRE%','') -# if len(self.country): -# fmt = fmt.replace('%COUNTRY%',self.country[0]) -# else: -# fmt = fmt.replace('%COUNTRY%','') +# if len(self.country): +# fmt = fmt.replace('%COUNTRY%',self.country[0]) +# else: +# fmt = fmt.replace('%COUNTRY%','') return fmt+ext def copy(self): @@ -235,7 +235,6 @@ class VIDEO: srcfp = self.rec.open('r') dstfp = self.vid.open('w', nooverwrite=True) - if self.job: self.job.setStatus(Job.RUNNING) tsize = 2**24 @@ -261,7 +260,7 @@ class VIDEO: self.job.setComment("Checking file hashes") self.log(MythLog.GENERAL|MythLog.FILE, MythLog.INFO, "Checking file hashes.") srchash = hashfile(self.rec.open('r')) - dsthash = hashfile(self.vid.open('r')) + dsthash = hashfile(self.rec.open('r')) if srchash != dsthash: raise MythError('Source hash (%s) does not match destination hash (%s)' \ % (srchash, dsthash)) @@ -294,30 +293,30 @@ class VIDEO: def usage_format(): usagestr = """The default strings are: - Television: Television/%TITLE%/Season %SEASON%/%TITLE% - S%SEASON%E%EPISODEPAD% - %SUBTITLE% - Movie: Movies/%TITLE% - Generic: Videos/%TITLE% +Television: Television/%TITLE%/Season %SEASON%/%TITLE% - S%SEASON%E%EPISODEPAD% - %SUBTITLE% +Movie: Movies/%TITLE% +Generic: Videos/%TITLE% Available strings: - %TITLE%: series title - %SUBTITLE%: episode title - %SEASON%: season number - %SEASONPAD%: season number, padded to 2 digits - %EPISODE%: episode number - %EPISODEPAD%: episode number, padded to 2 digits - %YEAR%: year - %DIRECTOR%: director - %HOSTNAME%: backend used to record show - %STORAGEGROUP%: storage group containing recorded show - %GENRE%: first genre listed for recording +%TITLE%: series title +%SUBTITLE%: episode title +%SEASON%: season number +%SEASONPAD%: season number, padded to 2 digits +%EPISODE%: episode number +%EPISODEPAD%: episode number, padded to 2 digits +%YEAR%: year +%DIRECTOR%: director +%HOSTNAME%: backend used to record show +%STORAGEGROUP%: storage group containing recorded show +%GENRE%: first genre listed for recording """ -# %CARDID%: ID of tuner card used to record show -# %CARDNAME%: name of tuner card used to record show -# %SOURCEID%: ID of video source used to record show -# %SOURCENAME%: name of video source used to record show -# %CHANNUM%: ID of channel used to record show -# %CHANNAME%: name of channel used to record show -# %COUNTRY%: first country listed for recording +# %CARDID%: ID of tuner card used to record show +# %CARDNAME%: name of tuner card used to record show +# %SOURCEID%: ID of video source used to record show +# %SOURCENAME%: name of video source used to record show +# %CHANNUM%: ID of channel used to record show +# %CHANNAME%: name of channel used to record show +# %COUNTRY%: first country listed for recording print usagestr def print_format(): @@ -333,9 +332,9 @@ def print_format(): if not gfmt: gfmt = 'Videos/%TITLE%' print "Current output formats:" - print " TV: "+tfmt - print " Movies: "+mfmt - print " Generic: "+gfmt + print " TV: "+tfmt + print " Movies: "+mfmt + print " Generic: "+gfmt def main(): parser = OptionParser(usage="usage: %prog [options] [jobid]") @@ -361,7 +360,7 @@ def main(): "in place of the job id.") sourcegroup.add_option("--chanid", action="store", type="int", dest="chanid", help="Use chanid for manual operation") - sourcegroup.add_option("--starttime", action="store", type="string", dest="starttime", + sourcegroup.add_option("--starttime", action="store", type="int", dest="starttime", help="Use starttime for manual operation") parser.add_option_group(sourcegroup) @@ -436,4 +435,3 @@ def main(): if __name__ == "__main__": main() - diff --git a/abs/core/LinHES-system/xfs_defrag.cron b/abs/core/LinHES-system/xfs_defrag.cron index 4d35507..e47176b 100755 --- a/abs/core/LinHES-system/xfs_defrag.cron +++ b/abs/core/LinHES-system/xfs_defrag.cron @@ -1,3 +1,3 @@ #!/bin/bash #. /etc/profile -/usr/LH/bin/checkXFSfrag.sh > /var/log/xfs_defrag.log +/usr/LH/bin/checkXFSfrag.sh | /usr/bin/logger -t xfs_defrag diff --git a/abs/core/acl/PKGBUILD b/abs/core/acl/PKGBUILD index b6e38ec..0ea2843 100644 --- a/abs/core/acl/PKGBUILD +++ b/abs/core/acl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 158574 2012-05-05 00:02:35Z allan $ +# $Id$ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=acl -pkgver=2.2.51 +pkgver=2.2.52 pkgrel=2 pkgdesc="Access control list utilities, libraries and headers" arch=('i686' 'x86_64') @@ -12,10 +12,9 @@ depends=('attr>=2.4.46') replaces=('xfsacl') provides=('xfsacl') conflicts=('xfsacl') -options=('!libtool') source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) -sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225' - '10893e2a044905acc88e2d98291e739b7b858b36c836ff66a3532909964067ce') +sha256sums=('179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23' + 'SKIP') build() { cd "$pkgname-$pkgver" @@ -27,8 +26,4 @@ build() { package() { make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev - - # tidy up - rm -f "$pkgdir"/usr/lib/libacl.a - chmod 0755 "$pkgdir"/usr/lib/libacl.so.*.*.* } diff --git a/abs/core/alsa-lib/PKGBUILD b/abs/core/alsa-lib/PKGBUILD index 072433d..d502947 100644 --- a/abs/core/alsa-lib/PKGBUILD +++ b/abs/core/alsa-lib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197852 2013-10-30 11:15:49Z allan $ +# $Id$ # Maintainer: judd <jvinet@zeroflux.org> pkgname=alsa-lib -pkgver=1.0.27.2 +pkgver=1.0.28 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') @@ -23,4 +23,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('69129a7c37697f81ac092335e9fa452b') +md5sums=('c9e21b88a2b3e6e12ea7ba0f3b271fc3') diff --git a/abs/core/alsa-utils/PKGBUILD b/abs/core/alsa-utils/PKGBUILD index 0ee6995..55a36a3 100644 --- a/abs/core/alsa-utils/PKGBUILD +++ b/abs/core/alsa-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191710 2013-07-29 10:16:55Z tpowa $ +# $Id$ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils -pkgver=1.0.27.2 +pkgver=1.0.28 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') @@ -38,5 +38,5 @@ package() { # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('b65e9a04181bd7c9db7667a4566f8dc3' +md5sums=('361552d5b1cacd0a1e7ba09e69990211' '529216f6a46e61a546640e08ea7a0879') diff --git a/abs/core/aspell/PKGBUILD b/abs/core/aspell/PKGBUILD index 1b88938..50c9264 100644 --- a/abs/core/aspell/PKGBUILD +++ b/abs/core/aspell/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 131851 2011-07-16 03:59:19Z eric $ +# $Id$ +# Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Jochem Kossen <j.kossen@home.nl> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aspell pkgver=0.60.6.1 _pkgmajorver=0.60 -pkgrel=1 +pkgrel=2 pkgdesc="A spell checker designed to eventually replace Ispell" arch=('i686' 'x86_64') url="http://aspell.net/" license=('LGPL') depends=('gcc-libs' 'ncurses') optdepends=('perl: to import old dictionaries') -options=('!libtool') install=aspell.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('e66a9c9af6a60dc46134fdacf6ce97d7') diff --git a/abs/core/atk/PKGBUILD b/abs/core/atk/PKGBUILD index 626785f..3714a1f 100644 --- a/abs/core/atk/PKGBUILD +++ b/abs/core/atk/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 156707 2012-04-23 09:03:35Z ibiru $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=atk -pkgver=2.4.0 +pkgver=2.14.0 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility" arch=(i686 x86_64) license=('LGPL') depends=('glib2') -makedepends=('gobject-introspection') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +makedepends=('gobject-introspection' 'python2') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) url='http://www.gtk.org/' -sha256sums=('091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d') +sha256sums=('2875cc0b32bfb173c066c22a337f79793e0c99d2cc5e81c4dac0d5a523b8fbad') build() { cd "$pkgname-$pkgver" diff --git a/abs/core/attr/PKGBUILD b/abs/core/attr/PKGBUILD index 5fb0a8e..ae9b4f2 100644 --- a/abs/core/attr/PKGBUILD +++ b/abs/core/attr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158576 2012-05-05 00:02:37Z allan $ +# $Id$ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=attr -pkgver=2.4.46 -pkgrel=2 +pkgver=2.4.47 +pkgrel=1 pkgdesc="Extended attribute support library for ACL support" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/attr" @@ -13,10 +13,9 @@ makedepends=('gettext') replaces=('xfsattr') provides=('xfsattr') conflicts=('xfsattr') -options=('!libtool') source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) -sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f' - 'a8ee37a0d02c0365049b8a06dc6963e6698a448ff2c0a54ed040f0c60f27bca3') +sha256sums=('25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859' + 'SKIP') build() { cd "$pkgname-$pkgver" @@ -30,7 +29,7 @@ package() { make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev # tidy up - rm -f "$pkgdir"/usrlib/libattr.a + rm -f "$pkgdir"/usr/lib/libattr.a chmod 0755 "$pkgdir"/usr/lib/libattr.so.*.*.* # remove conflicting manpages diff --git a/abs/core/automake/PKGBUILD b/abs/core/automake/PKGBUILD index 20550c6..bd5603e 100644 --- a/abs/core/automake/PKGBUILD +++ b/abs/core/automake/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171527 2012-11-18 11:37:53Z allan $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=automake -pkgver=1.12.5 +pkgver=1.14.1 pkgrel=1 pkgdesc="A GNU tool for automatically creating Makefiles" arch=('any') @@ -12,10 +12,18 @@ url="http://www.gnu.org/software/automake" groups=('base-devel') depends=('perl' 'bash') makedepends=('autoconf') +checkdepends=('dejagnu' 'python2' 'gcc-fortran' 'java-environment' 'vala' 'emacs' 'cscope') install=automake.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('2bc1aef898712c7e56320f264040972d' - '2b5cf11401c4a6d9ebe8f3a979b626c9') +md5sums=('7fc29854c520f56b07aa232a0f880292' + 'SKIP') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # skip failing test... + sed -i "/instmany-python.sh/d" Makefile.in +} build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/abs/core/avahi/PKGBUILD b/abs/core/avahi/PKGBUILD index 7b247cb..d98069b 100644 --- a/abs/core/avahi/PKGBUILD +++ b/abs/core/avahi/PKGBUILD @@ -1,59 +1,60 @@ -# $Id: PKGBUILD 156451 2012-04-18 12:14:05Z bisson $ -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# $Id$ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=4 +pkgrel=14 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') arch=('i686' 'x86_64') -options=('!libtool' '!emptydirs') -depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm') +options=('!emptydirs') +depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus') optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' 'gtk2: gtk2 bindings' - 'qt3: qt3 bindings' - 'qt: qt bindings' + 'qt4: qt4 bindings' 'pygtk: avahi-bookmarks, avahi-discover' - 'twisted: avahi-bookmarks' + 'python2-twisted: avahi-bookmarks' 'mono: mono bindings' - 'dbus-python: avahi-discover' + 'python2-dbus: avahi-discover' 'nss-mdns: NSS support for mDNS') -makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' - 'gtk-sharp-2' 'gobject-introspection' 'gtk3') +makedepends=('qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus' + 'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman') backup=('etc/avahi/hosts' 'etc/avahi/avahi-daemon.conf' 'etc/avahi/services/ssh.service' - 'etc/avahi/services/sftp-ssh.service') -source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" - 'gnome-nettool.png' - 'rc.d.patch') -sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684' - 'cf56387c88aed246b9f435efc182ef44de4d52f3' - '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') + 'etc/avahi/services/sftp-ssh.service' + 'usr/lib/avahi/service-types.db' + 'usr/share/avahi/service-types') +source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz") +sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684') conflicts=('howl' 'mdnsresponder') provides=('howl' 'mdnsresponder') install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in + sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf + sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action + sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.* +} - sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf - patch -p1 -i ../rc.d.patch +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export MOC_QT4=/usr/bin/moc-qt4 + export PYTHON=/usr/bin/python2 - # pygtk requires python2; make it explicit in case other python are installed: FS#21865 - PYTHON=python2 \ - PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-static \ - --disable-monodoc \ --sbindir=/usr/bin \ + --disable-monodoc \ + --disable-qt3 \ --enable-compat-libdns_sd \ --enable-compat-howl \ --with-distro=archlinux \ @@ -68,12 +69,12 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png - - cd "${pkgdir}" - sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} + rm -fr "${pkgdir}"/etc/rc.d # howl and mdnsresponder compatability - (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) - (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) + cd "${pkgdir}"/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl + cd "${pkgdir}"/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc + + # see FS#42638 + ln avahi-daemon.service -s "${pkgdir}"/usr/lib/systemd/system/dbus-org.freedesktop.Avahi.service } diff --git a/abs/core/avahi/install b/abs/core/avahi/install index 7c75c3d..d4ae23e 100644 --- a/abs/core/avahi/install +++ b/abs/core/avahi/install @@ -1,21 +1,11 @@ post_install() { - getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null - getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null - - cat <<EOF -==> The following daemons may be added to DAEMONS in /etc/rc.conf: -==> avahi-daemon: the mdns responder, you probably want this. -==> dbus needs to be running when you start it. -==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns -==> configuration on dhcp-less networks. - -==> To use some of the client applications you will have to install python. -==> In addition, pygtk is required for the graphical ones and -==> twisted for avahi-bookmarks. -EOF + getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null + getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null + true } post_remove() { - getent passwd avahi &>/dev/null && userdel avahi >/dev/null - getent group avahi &>/dev/null && groupdel avahi >/dev/null + getent passwd avahi &>/dev/null && userdel avahi >/dev/null + getent group avahi &>/dev/null && groupdel avahi >/dev/null + true } diff --git a/abs/core/bc/PKGBUILD b/abs/core/bc/PKGBUILD index 1ecefa1..faf854f 100644 --- a/abs/core/bc/PKGBUILD +++ b/abs/core/bc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 58247 2009-11-06 14:41:31Z eric $ +# $Id$ # Maintainer: dorphell <dorphell@archlinux.org> pkgname=bc -pkgver=1.06 -pkgrel=7 +pkgver=1.06.95 +pkgrel=1 pkgdesc="An arbitrary precision calculator language" arch=('i686' 'x86_64') url="http://www.gnu.org/software/bc/" @@ -12,20 +12,32 @@ depends=('readline') replaces=('bc-readline') conflicts=('bc-readline') install=bc.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz - build-fix.patch bc-1.06-info-dir-entry.patch) -md5sums=('d44b5dddebd8a7a7309aea6c36fda117' 'fc7ecbd9e55ef04c6d3a495692626116'\ - 'b6fe9869830aca0d34badf810fe0cfb3') -sha1sums=('c8f258a7355b40a485007c40865480349c157292' '3af67c59e2232b9329ff0c1cf49d1a8a1cf87cd7'\ - 'c15c2a301ba80cf4d3c03a6e164f4e57fa86e4a2') +source=(ftp://alpha.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} + bc-1.06.95-void_uninitialized.patch) +md5sums=('5126a721b73f97d715bb72c13c889035' + 'SKIP' + 'fe85d42dd4151801e9b8c2d2c4d990bf') + +prepare() { + cd "${pkgname}-${pkgver}" + + # https://bugs.gentoo.org/show_bug.cgi?id=349339 + patch -Np0 -i ${srcdir}/bc-1.06.95-void_uninitialized.patch +} build() { - CFLAGS="$CFLAGS -O3" - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/build-fix.patch" || return 1 - patch -p1 -i "${srcdir}/bc-1.06-info-dir-entry.patch" || return 1 + cd "${pkgname}-${pkgver}" ./configure --prefix=/usr --mandir=/usr/share/man \ - --infodir=/usr/share/info --with-readline || return 1 - make LEX="flex -I" || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --infodir=/usr/share/info --with-readline + make +} + +check () { + cd "${pkgname}-${pkgver}" + echo "quit" | ./bc/bc -l Test/checklib.b # 10 failures +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/bc/bc-1.06-info-dir-entry.patch b/abs/core/bc/bc-1.06-info-dir-entry.patch deleted file mode 100644 index 8c1344c..0000000 --- a/abs/core/bc/bc-1.06-info-dir-entry.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bc-1.06/doc/bc.info.info-dir-entry 2000-10-03 20:36:31.000000000 +0200 -+++ bc-1.06/doc/bc.info 2003-01-06 14:07:40.000000000 +0100 -@@ -1,5 +1,8 @@ - This is bc.info, produced by makeinfo version 4.0 from bc.texi. - -+START-INFO-DIR-ENTRY -+* bc: (bc). Arbritrary precision calculator language. -+END-INFO-DIR-ENTRY - - File: bc.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) - diff --git a/abs/core/bc/bc-1.06.95-void_uninitialized.patch b/abs/core/bc/bc-1.06.95-void_uninitialized.patch new file mode 100644 index 0000000..c60290c --- /dev/null +++ b/abs/core/bc/bc-1.06.95-void_uninitialized.patch @@ -0,0 +1,14 @@ +http://www.pixelbeat.org/programming/oss_bug_flow.html +https://bugs.gentoo.org/349339 + +--- bc/storage.c ++++ bc/storage.c +@@ -99,6 +99,7 @@ + { + f = &functions[indx]; + f->f_defined = FALSE; ++ f->f_void = FALSE; + f->f_body = (char *) bc_malloc (BC_START_SIZE); + f->f_body_size = BC_START_SIZE; + f->f_code_size = 0; + diff --git a/abs/core/bc/build-fix.patch b/abs/core/bc/build-fix.patch deleted file mode 100644 index 98a4082..0000000 --- a/abs/core/bc/build-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -wbBur bc-1.06/bc/scan.l bc-1.06.my/bc/scan.l ---- bc-1.06/bc/scan.l 2000-09-13 22:25:47 +0400 -+++ bc-1.06.my/bc/scan.l 2006-12-25 12:39:34 +0300 -@@ -143,7 +143,9 @@ - - /* Definitions for readline access. */ - extern FILE *rl_instream; -+#if 0 - _PROTOTYPE(char *readline, (char *)); -+#endif - - /* rl_input puts upto MAX characters into BUF with the number put in - BUF placed in *RESULT. If the yy input file is the same as diff --git a/abs/core/binutils/PKGBUILD b/abs/core/binutils/PKGBUILD index a4d2839..26ba4f9 100644 --- a/abs/core/binutils/PKGBUILD +++ b/abs/core/binutils/PKGBUILD @@ -1,87 +1,83 @@ -# $Id: PKGBUILD 171025 2012-11-15 12:26:41Z allan $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils -pkgver=2.23.1 -pkgrel=1 +pkgver=2.24 +pkgrel=7 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/binutils/" license=('GPL') groups=('base-devel') -depends=('glibc>=2.16' 'zlib') +depends=('glibc>=2.20' 'zlib') checkdepends=('dejagnu' 'bc') -options=('!libtool' '!distcc' '!ccache') +conflicts=('binutils-multilib') +replaces=('binutils-multilib') +options=('staticlibs' '!distcc' '!ccache') install=binutils.install -source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}) -md5sums=('33adb18c3048d057ac58d07a3f1adb38' - '1869b37216e7d7eff7e335a69e0882fd') +source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig} + binutils-2.24-lto-testsuite.patch + binutils-2.24-gold-testsuite-plugin.patch + binutils-2.24-shared-pie.patch) +md5sums=('e0f71a7b2ddab0f8612336ac81d9636b' + 'SKIP' + 'e68a1f221545f082baa5bd417cd077af' + 'e46bbb03abaa5db58c12247644dc4857' + 'ec59461c4febab9cfe1c1ef33326bc50') +validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93') + +prepare() { + cd ${srcdir}/binutils-${pkgver} + + # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure + + # fix lto testsuite with gcc-4.9 - commits b35d44f1 and 37a6ac44 + patch -p1 -i $srcdir/binutils-2.24-lto-testsuite.patch + + # fix gold testsuite with gcc-4.9 - commit ae447ddd + patch -p1 -i $srcdir/binutils-2.24-gold-testsuite-plugin.patch + + # fix issues with -static -fPIE -pie - commit 4199e3b8 + patch -p1 -i $srcdir/binutils-2.24-shared-pie.patch + + mkdir ${srcdir}/binutils-build +} build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build + cd ${srcdir}/binutils-build ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \ --with-lib-path=/usr/lib:/usr/local/lib \ --with-bugurl=https://bugs.archlinux.org/ \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads --enable-shared \ - --disable-werror --disable-multilib + --enable-threads --enable-shared --with-pic \ + --enable-ld=default --enable-gold --enable-plugins \ + --disable-werror # check the host environment and makes sure all the necessary tools are available make configure-host - make tooldir=${pkgdir}/usr - - # Rebuild libiberty.a with -fPIC - cp -a libiberty libiberty-pic - make -C libiberty-pic clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic - - # Rebuild libbfd.a with -fPIC - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - cp -a bfd bfd-pic - make -C bfd-pic clean - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic - - # Rebuild libopcodes.a with -fPIC - cp -a opcodes opcodes-pic - make -C opcodes-pic clean - make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic + make tooldir=/usr } check() { cd ${srcdir}/binutils-build # unset LDFLAGS as testsuite makes assumptions about which ones are active - # do not abort on errors - manually check log files - make LDFLAGS="" -k check || true + # ignore failures in gold testsuite... + make -k LDFLAGS="" check || true } package() { cd ${srcdir}/binutils-build make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}/usr/include - - # install libraries rebuilt with -fPIC - install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib - install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib - install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib - # Remove Windows/Novell specific man pages + # Remove unwanted files rm ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # why are these distributed with binutils? rm ${pkgdir}/usr/share/info/{configure,standards}.info - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. + # No shared linking to these files outside binutils rm ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so } diff --git a/abs/core/binutils/binutils-2.24-gold-testsuite-plugin.patch b/abs/core/binutils/binutils-2.24-gold-testsuite-plugin.patch new file mode 100644 index 0000000..9f5acad --- /dev/null +++ b/abs/core/binutils/binutils-2.24-gold-testsuite-plugin.patch @@ -0,0 +1,229 @@ +diff --git a/gold/configure b/gold/configure +index 2257324..f61307b 100755 +--- a/gold/configure ++++ b/gold/configure +@@ -594,10 +594,12 @@ LTLIBOBJS + MAINT + MAINTAINER_MODE_FALSE + MAINTAINER_MODE_TRUE +-HAVE_PUBNAMES_FALSE +-HAVE_PUBNAMES_TRUE + DLOPEN_LIBS + CXXCPP ++HAVE_NO_USE_LINKER_PLUGIN_FALSE ++HAVE_NO_USE_LINKER_PLUGIN_TRUE ++HAVE_PUBNAMES_FALSE ++HAVE_PUBNAMES_TRUE + HAVE_ZLIB_FALSE + HAVE_ZLIB_TRUE + LIBOBJS +@@ -6991,6 +6993,50 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + + ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -Werror -gpubnames" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++int i; ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ have_pubnames=yes ++else ++ have_pubnames=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++CFLAGS="$save_CFLAGS" ++ if test "$have_pubnames" = "yes"; then ++ HAVE_PUBNAMES_TRUE= ++ HAVE_PUBNAMES_FALSE='#' ++else ++ HAVE_PUBNAMES_TRUE='#' ++ HAVE_PUBNAMES_FALSE= ++fi ++ ++ ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -Werror -fno-use-linker-plugin" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++int i; ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ have_no_use_linker_plugin=yes ++else ++ have_no_use_linker_plugin=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++CFLAGS="$save_CFLAGS" ++ if test "$have_no_use_linker_plugin" = "yes"; then ++ HAVE_NO_USE_LINKER_PLUGIN_TRUE= ++ HAVE_NO_USE_LINKER_PLUGIN_FALSE='#' ++else ++ HAVE_NO_USE_LINKER_PLUGIN_TRUE='#' ++ HAVE_NO_USE_LINKER_PLUGIN_FALSE= ++fi ++ ++ + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -7515,28 +7561,6 @@ $as_echo "#define HAVE_STAT_ST_MTIM 1" >>confdefs.h + + fi + +-save_CXXFLAGS="$CXXFLAGS" +-CXXFLAGS="$CXXFLAGS -Werror -gpubnames" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-int i; +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- have_pubnames=yes +-else +- have_pubnames=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-CXXFLAGS="$save_CXXFLAGS" +- if test "$have_pubnames" = "yes"; then +- HAVE_PUBNAMES_TRUE= +- HAVE_PUBNAMES_FALSE='#' +-else +- HAVE_PUBNAMES_TRUE='#' +- HAVE_PUBNAMES_FALSE= +-fi +- +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -7837,6 +7861,10 @@ if test -z "${HAVE_PUBNAMES_TRUE}" && test -z "${HAVE_PUBNAMES_FALSE}"; then + as_fn_error "conditional \"HAVE_PUBNAMES\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${HAVE_NO_USE_LINKER_PLUGIN_TRUE}" && test -z "${HAVE_NO_USE_LINKER_PLUGIN_FALSE}"; then ++ as_fn_error "conditional \"HAVE_NO_USE_LINKER_PLUGIN\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +diff --git a/gold/configure.ac b/gold/configure.ac +index 803cf46..7ad7302 100644 +--- a/gold/configure.ac ++++ b/gold/configure.ac +@@ -520,6 +520,25 @@ dnl multiple declarations of functions like basename when compiling + dnl with C++. + AC_CHECK_DECLS([basename, ffs, asprintf, vasprintf, snprintf, vsnprintf, strverscmp]) + ++dnl Check if gcc supports the -gpubnames option. ++dnl Use -Werror in case of compilers that make unknown -g options warnings. ++dnl They would pass the test here, but fail in actual use when $WARN_CFLAGS ++dnl gets set later by default Autoconf magic to include -Werror. (We are ++dnl assuming here that there is no compiler that groks -gpubnames ++dnl but does not grok -Werror.) ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -Werror -gpubnames" ++AC_COMPILE_IFELSE([int i;], [have_pubnames=yes], [have_pubnames=no]) ++CFLAGS="$save_CFLAGS" ++AM_CONDITIONAL(HAVE_PUBNAMES, test "$have_pubnames" = "yes") ++ ++dnl Check if gcc supports the -fno-use-linker-plugin option. ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -Werror -fno-use-linker-plugin" ++AC_COMPILE_IFELSE([int i;], [have_no_use_linker_plugin=yes], [have_no_use_linker_plugin=no]) ++CFLAGS="$save_CFLAGS" ++AM_CONDITIONAL(HAVE_NO_USE_LINKER_PLUGIN, test "$have_no_use_linker_plugin" = "yes") ++ + AC_LANG_PUSH(C++) + + AC_CHECK_HEADERS(unordered_set unordered_map) +@@ -601,18 +620,6 @@ if test "$gold_cv_stat_st_mtim" = "yes"; then + [Define if struct stat has a field st_mtim with timespec for mtime]) + fi + +-dnl Check if gcc supports the -gpubnames option. +-dnl Use -Werror in case of compilers that make unknown -g options warnings. +-dnl They would pass the test here, but fail in actual use when $WARN_CFLAGS +-dnl gets set later by default Autoconf magic to include -Werror. (We are +-dnl assuming here that there is no compiler that groks -gpubnames +-dnl but does not grok -Werror.) +-save_CXXFLAGS="$CXXFLAGS" +-CXXFLAGS="$CXXFLAGS -Werror -gpubnames" +-AC_COMPILE_IFELSE([int i;], [have_pubnames=yes], [have_pubnames=no]) +-CXXFLAGS="$save_CXXFLAGS" +-AM_CONDITIONAL(HAVE_PUBNAMES, test "$have_pubnames" = "yes") +- + AC_LANG_POP(C++) + + AC_CHECK_HEADERS(locale.h) +diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am +index aa41290..52cc05e 100644 +--- a/gold/testsuite/Makefile.am ++++ b/gold/testsuite/Makefile.am +@@ -19,18 +19,25 @@ AM_CPPFLAGS = \ + -DLOCALEDIR="\"$(datadir)/locale\"" \ + @INCINTL@ + ++# Some versions of GCC now automatically enable linker plugins, ++# but we want to run our tests without GCC's plugins. ++if HAVE_NO_USE_LINKER_PLUGIN ++OPT_NO_PLUGINS = -fno-use-linker-plugin ++endif ++ + # COMPILE1, LINK1, CXXCOMPILE1, CXXLINK1 are renamed from COMPILE, LINK, + # CXXCOMPILE and CXXLINK generated by automake 1.11.1. FIXME: they should + # be updated if they are different from automake used by gold. + COMPILE1 = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXCOMPILE1 = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +-CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ +- -o $@ ++CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPT_NO_PLUGINS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ + +-# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant for the gold ++# Strip out -Wp,-D_FORTIFY_SOURCE=, which is irrelevant for the gold + # testsuite and incompatible with -O0 used in gold tests, from + # COMPILE, LINK, CXXCOMPILE and CXXLINK. + COMPILE = `echo $(COMPILE1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9[0-9]]*//'` +diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in +index 60c2c10..da0a338 100644 +--- a/gold/testsuite/Makefile.in ++++ b/gold/testsuite/Makefile.in +@@ -2096,21 +2096,27 @@ AM_CPPFLAGS = \ + @INCINTL@ + + ++# Some versions of GCC now automatically enable linker plugins, ++# but we want to run our tests without GCC's plugins. ++@HAVE_NO_USE_LINKER_PLUGIN_TRUE@OPT_NO_PLUGINS = -fno-use-linker-plugin ++ + # COMPILE1, LINK1, CXXCOMPILE1, CXXLINK1 are renamed from COMPILE, LINK, + # CXXCOMPILE and CXXLINK generated by automake 1.11.1. FIXME: they should + # be updated if they are different from automake used by gold. + COMPILE1 = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + +-LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ + CXXCOMPILE1 = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + +-CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ +- -o $@ ++CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPT_NO_PLUGINS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ + + +-# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant for the gold ++# Strip out -Wp,-D_FORTIFY_SOURCE=, which is irrelevant for the gold + # testsuite and incompatible with -O0 used in gold tests, from + # COMPILE, LINK, CXXCOMPILE and CXXLINK. + COMPILE = `echo $(COMPILE1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9[0-9]]*//'` diff --git a/abs/core/binutils/binutils-2.24-lto-testsuite.patch b/abs/core/binutils/binutils-2.24-lto-testsuite.patch new file mode 100644 index 0000000..0f34726 --- /dev/null +++ b/abs/core/binutils/binutils-2.24-lto-testsuite.patch @@ -0,0 +1,78 @@ +index c5249f0..69946de 100644 +--- a/ld/testsuite/ld-plugin/lto.exp ++++ b/ld/testsuite/ld-plugin/lto.exp +@@ -57,7 +57,7 @@ set lto_link_tests { + "" "-O2" + {lto-3c.c} {} "libdummy.a"} + {"Build liblto-3.a" +- "" "-flto" ++ "" "-flto -ffat-lto-objects" + {lto-3b.c} {} "liblto-3.a"} + {"Build libdummy.a 5a" + "" "-flto" +@@ -111,7 +111,7 @@ set lto_link_tests { + "" "" + {pr12758a.s} {} "libdummy.a"} + {"Build libpr12758.a" +- "" "-flto -O2" ++ "" "-flto -O2 -ffat-lto-objects" + {pr12758b.c} {} "libpr12758.a"} + {"PR ld/12758" + "-O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12758a.o -Wl,--start-group tmpdir/libpr12758.a -Wl,--end-group" "" +@@ -120,13 +120,13 @@ set lto_link_tests { + "" "" + {pr12760a.c} {} "libdummy.a"} + {"Build libpr12760.a" +- "" "-flto -O2" ++ "" "-flto -O2 -ffat-lto-objects" + {pr12760b.c} {} "libpr12760.a"} + {"PR ld/12760" + "-O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12760a.o -Wl,--start-group tmpdir/libpr12760.a -Wl,--end-group" "" + {dummy.c} {} "pr12760.exe" "c" "warning: Bad bar"} + {"Build libpr13183.a" +- "-T" "-flto -O2" ++ "-T" "-flto -O2 -ffat-lto-objects" + {pr13183a.c} {} "libpr13183.a"} + {"Build libdummy.a PR ld/13183" + "" "-flto -O2" +diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp +index 8df42ae..175449a 100644 +--- a/ld/testsuite/lib/ld-lib.exp ++++ b/ld/testsuite/lib/ld-lib.exp +@@ -1643,7 +1643,7 @@ proc check_lto_available { } { + set f [open $src "w"] + puts $f "" + close $f +- set status [remote_exec host $CC "-shared -B[pwd]/tmpdir/ld/ -flto -fuse-linker-plugin $src -o $output"] ++ set status [remote_exec host $CC "-shared -B[pwd]/tmpdir/ld/ -flto -ffat-lto-objects -fuse-linker-plugin $src -o $output"] + if { [lindex $status 0] == 0 } { + set lto_available_saved 1 + } else { +diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp +index b14f13c..765d85f 100644 +--- a/ld/testsuite/ld-plugin/lto.exp ++++ b/ld/testsuite/ld-plugin/lto.exp +@@ -324,7 +324,20 @@ if { [is_elf_format] && [check_lto_shared_available] } { + + set testname "Build liblto-11.a" + remote_file host delete "tmpdir/liblto-11.a" +-set catch_output [run_host_cmd "$ar" "rc tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] ++set plugin_names { ++ liblto_plugin.so ++ liblto_plugin-0.dll ++ cyglto_plugin-0.dll ++} ++set plug_opt "" ++foreach plug $plugin_names { ++ set plug_so [run_host_cmd $CC "--print-prog-name $plug"] ++ if { $plug_so ne $plug } then { ++ set plug_opt "--plugin $plug_so" ++ break ++ } ++} ++set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] + if {![string match "" $catch_output]} { + unresolved $testname + restore_notify + + diff --git a/abs/core/binutils/binutils-2.24-shared-pie.patch b/abs/core/binutils/binutils-2.24-shared-pie.patch new file mode 100644 index 0000000..d40aa47 --- /dev/null +++ b/abs/core/binutils/binutils-2.24-shared-pie.patch @@ -0,0 +1,99 @@ +diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em +index 9a2fe89..13f86f0 100644 +--- a/ld/emultempl/elf32.em ++++ b/ld/emultempl/elf32.em +@@ -1480,6 +1480,8 @@ gld${EMULATION_NAME}_before_allocation (void) + const char *rpath; + asection *sinterp; + bfd *abfd; ++ struct elf_link_hash_entry *ehdr_start = NULL; ++ struct bfd_link_hash_entry ehdr_start_save; + + if (is_elf_hash_table (link_info.hash)) + { +@@ -1504,6 +1506,16 @@ gld${EMULATION_NAME}_before_allocation (void) + _bfd_elf_link_hash_hide_symbol (&link_info, h, TRUE); + if (ELF_ST_VISIBILITY (h->other) != STV_INTERNAL) + h->other = (h->other & ~ELF_ST_VISIBILITY (-1)) | STV_HIDDEN; ++ /* Don't leave the symbol undefined. Undefined hidden ++ symbols typically won't have dynamic relocations, but ++ we most likely will need dynamic relocations for ++ __ehdr_start if we are building a PIE or shared ++ library. */ ++ ehdr_start = h; ++ ehdr_start_save = h->root; ++ h->root.type = bfd_link_hash_defined; ++ h->root.u.def.section = bfd_abs_section_ptr; ++ h->root.u.def.value = 0; + } + } + +@@ -1620,6 +1632,14 @@ ${ELF_INTERPRETER_SET_DEFAULT} + + if (!bfd_elf_size_dynsym_hash_dynstr (link_info.output_bfd, &link_info)) + einfo ("%P%F: failed to set dynamic section sizes: %E\n"); ++ ++ if (ehdr_start != NULL) ++ { ++ /* If we twiddled __ehdr_start to defined earlier, put it back ++ as it was. */ ++ ehdr_start->root.type = ehdr_start_save.type; ++ ehdr_start->root.u = ehdr_start_save.u; ++ } + } + + EOF +diff --git a/ld/testsuite/ld-elf/ehdr_start-shared.d b/ld/testsuite/ld-elf/ehdr_start-shared.d +new file mode 100644 +index 0000000..c17516a +--- /dev/null ++++ b/ld/testsuite/ld-elf/ehdr_start-shared.d +@@ -0,0 +1,9 @@ ++#source: ehdr_start.s ++#ld: -e _start -shared ++#nm: -n ++#target: *-*-linux* *-*-gnu* *-*-nacl* ++#xfail: cris*-*-* frv-*-* ++ ++#... ++[0-9a-f]*000 [Adrt] __ehdr_start ++#pass +diff --git a/ld/testsuite/ld-elf/ehdr_start-userdef.d b/ld/testsuite/ld-elf/ehdr_start-userdef.d +index 2a88e98..b58ae3f 100644 +--- a/ld/testsuite/ld-elf/ehdr_start-userdef.d ++++ b/ld/testsuite/ld-elf/ehdr_start-userdef.d +@@ -2,6 +2,7 @@ + #ld: -e _start -T ehdr_start-userdef.t + #readelf: -Ws + #target: *-*-linux* *-*-gnu* *-*-nacl* ++#xfail: frv-*-* + + #... + Symbol table '\.symtab' contains [0-9]+ entries: +diff --git a/ld/testsuite/ld-elf/ehdr_start-weak.d b/ld/testsuite/ld-elf/ehdr_start-weak.d +index 8bd9035..24ae34c 100644 +--- a/ld/testsuite/ld-elf/ehdr_start-weak.d ++++ b/ld/testsuite/ld-elf/ehdr_start-weak.d +@@ -2,6 +2,7 @@ + #ld: -e _start -T ehdr_start-missing.t + #nm: -n + #target: *-*-linux* *-*-gnu* *-*-nacl* ++#xfail: frv-*-* + + #... + \s+[wU] __ehdr_start +diff --git a/ld/testsuite/ld-elf/ehdr_start.d b/ld/testsuite/ld-elf/ehdr_start.d +index 52e5b54..d538b66 100644 +--- a/ld/testsuite/ld-elf/ehdr_start.d ++++ b/ld/testsuite/ld-elf/ehdr_start.d +@@ -2,6 +2,7 @@ + #ld: -e _start + #nm: -n + #target: *-*-linux* *-*-gnu* *-*-nacl* ++#xfail: frv-*-* + + #... + [0-9a-f]*000 [Adrt] __ehdr_start +-- +1.7.1 + diff --git a/abs/core/bison/PKGBUILD b/abs/core/bison/PKGBUILD index 7e10464..02d1d91 100644 --- a/abs/core/bison/PKGBUILD +++ b/abs/core/bison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163856 2012-07-21 11:24:29Z allan $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison -pkgver=2.6 +pkgver=3.0.2 pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') @@ -11,10 +11,11 @@ license=('GPL3') url="http://www.gnu.org/software/bison/bison.html" depends=('glibc' 'm4' 'sh') groups=('base-devel') +options=('staticlibs') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('f96a16e79daaef71c797ed88f52e59d1' - 'd67a1a075ab0cccfb53ab23692be1a02') +md5sums=('146be9ff9fbd27497f0bf2286a5a2082' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/abs/core/bootlogd/PKGBUILD b/abs/core/bootlogd/PKGBUILD new file mode 100644 index 0000000..a1d5a6f --- /dev/null +++ b/abs/core/bootlogd/PKGBUILD @@ -0,0 +1,20 @@ +pkgname=bootlogd +pkgver=2.88 +pkgrel=1 +pkgdesc="bootlogd from sysvinit" +arch=('i686' 'x86_64') +conflicts=('sysvinit') +url="http://savannah.nongnu.org/projects/sysvinit" +license=('GPL') +source=(http://download.savannah.gnu.org/releases/sysvinit/sysvinit-${pkgver}dsf.tar.bz2) + +build() { + cd "${srcdir}/sysvinit-${pkgver}dsf/src" + make bootlogd +} + +package() { + install -d "${pkgdir}/usr/bin/" + install -Dm0755 "${srcdir}/sysvinit-${pkgver}dsf/src/bootlogd" "${pkgdir}/usr/bin/" +} +md5sums=('6eda8a97b86e0a6f59dabbf25202aa6f') diff --git a/abs/core/bzip2/PKGBUILD b/abs/core/bzip2/PKGBUILD index 3e4ea23..4cdb178 100644 --- a/abs/core/bzip2/PKGBUILD +++ b/abs/core/bzip2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158054 2012-05-02 01:12:57Z allan $ +# $Id$ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd <jvinet@zeroflux.org> pkgname=bzip2 pkgver=1.0.6 -pkgrel=4 +pkgrel=5 pkgdesc="A high-quality data compression program" arch=('i686' 'x86_64') license=('custom') @@ -29,7 +29,7 @@ build() { patch -Np1 < ../bzip2-1.0.4-bzip2recover.patch make -f Makefile-libbz2_so - make bzip2 bzip2recover libbz2.a + make bzip2 bzip2recover } check() { @@ -51,7 +51,6 @@ package() { ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1 ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1.0 - install -m644 libbz2.a ${pkgdir}/usr/lib/libbz2.a install -m644 bzlib.h $pkgdir/usr/include/ diff --git a/abs/core/cairo/PKGBUILD b/abs/core/cairo/PKGBUILD index 1fca76e..94177ea 100644 --- a/abs/core/cairo/PKGBUILD +++ b/abs/core/cairo/PKGBUILD @@ -1,42 +1,67 @@ -# $Id: PKGBUILD 170782 2012-11-11 10:23:13Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo -pkgver=1.12.8 +pkgver=1.14.0 pkgrel=2 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') url="http://cairographics.org/" -depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'sh') -makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind') # 'libdrm') -optdepends=('xcb-util: for XCB backend') # really needed? +depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa' 'libgl' 'lzo') +makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind' 'git') + # for the test suite: + #'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm') +#optdepends=('xcb-util: for XCB backend') # really needed? provides=('cairo-xcb') replaces=('cairo-xcb') -options=('!libtool') -source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('56a10bf3b804367c97734d655c23a9f652d5c297') +source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz + git_fixes.diff) +sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae' + '0ebac538dfa510e8e3f07ba71a49dabc627b08ff') + +prepare() { + cd $pkgname-$pkgver + # fix some segfaults: https://bugs.freedesktop.org/show_bug.cgi?id=85151 + # https://bugs.archlinux.org/task/42596 + patch -Np1 -i ${srcdir}/git_fixes.diff +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --disable-static \ + --disable-lto \ --enable-tee \ - --disable-xlib-xcb \ - # --enable-test-surfaces \ takes ages + --enable-gl \ + --enable-egl \ + --enable-svg \ + --enable-ps \ + --enable-pdf \ + --enable-gobject \ + --enable-gtk-doc + + #--disable-xlib-xcb \ + #--enable-test-surfaces \ takes ages #--enable-drm # breaks build + make } -#check() { -# cd "$srcdir/$pkgname-$pkgver" -# make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped -#} +check() { + cd $pkgname-$pkgver + #make -j1 -k test || /bin/true + + # results: + # 1.12.8-1 # 162 Passed, 328 Failed [ 8 crashed, 10 expected], 26 Skipped + # 1.12.12-2: # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped + # 1.12.16-1: # 144 Passed, 364 Failed [ 6 crashed, 12 expected], 27 Skipped +} package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/abs/core/cairo/git_fixes.diff b/abs/core/cairo/git_fixes.diff new file mode 100644 index 0000000..8f751ce --- /dev/null +++ b/abs/core/cairo/git_fixes.diff @@ -0,0 +1,34 @@ +From 2de69581c28bf115852037ca41eba13cb7335976 Mon Sep 17 00:00:00 2001 +From: Massimo Valentini <mvalentini@src.gnome.org> +Date: Sun, 19 Oct 2014 09:19:10 +0200 +Subject: tor-scan-converter: can't do_fullrow when intersection in row + + 0.5subrow + +the active edges list must be left sorted at the next possible use +and since full_row does not deal with intersections it is not usable +when there is an intersection in the top half of the next row first +subrow + +Reported-and-tested-by: Matthew Leach +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85151 +Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> + +diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c +index 4adcafb..14922d0 100644 +--- a/src/cairo-tor-scan-converter.c ++++ b/src/cairo-tor-scan-converter.c +@@ -1167,8 +1167,8 @@ can_do_full_row (struct active_list *active) + + if (e->dy) { + struct quorem x = e->x; +- x.quo += e->dxdy_full.quo - e->dxdy.quo/2; +- x.rem += e->dxdy_full.rem - e->dxdy.rem/2; ++ x.quo += e->dxdy_full.quo; ++ x.rem += e->dxdy_full.rem; + if (x.rem < 0) { + x.quo--; + x.rem += e->dy; +-- +cgit v0.10.2 + + diff --git a/abs/core/cdparanoia/PKGBUILD b/abs/core/cdparanoia/PKGBUILD index 05bf098..58e41f2 100644 --- a/abs/core/cdparanoia/PKGBUILD +++ b/abs/core/cdparanoia/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 149332 2012-02-06 20:43:48Z stephane $ -# Maintainer: -# Contributor: Alexander Fehr <pizzapunk gmail com> +# $Id$ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=cdparanoia pkgver=10.2 -pkgrel=4 +pkgrel=5 pkgdesc="Compact Disc Digital Audio extraction tool" arch=('i686' 'x86_64') url="http://www.xiph.org/paranoia/" license=('GPL') depends=('glibc') -options=('!makeflags') -source=("http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz" - 'gcc.patch') -md5sums=('b304bbe8ab63373924a744eac9ebc652' - '12da14958d2b84c6719fe69890436445') +options=('!makeflags' '!staticlibs') +source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz + gcc.patch) +sha1sums=('1901e20d3a370ca6afa4c76a9ef30d3f03044320' + '67faaf0e3eed2e3de6f66d8168604bc6c7295921') -build() { +prepare() { cd "${srcdir}/${pkgname}-III-${pkgver}" patch -p0 -i ${srcdir}/gcc.patch +} + +build() { + cd "${srcdir}/${pkgname}-III-${pkgver}" ./configure --prefix=/usr --mandir=/usr/share/man make } diff --git a/abs/core/ceton_infinitv/PKGBUILD b/abs/core/ceton_infinitv/PKGBUILD index 98b8a92..ee86b84 100755 --- a/abs/core/ceton_infinitv/PKGBUILD +++ b/abs/core/ceton_infinitv/PKGBUILD @@ -1,15 +1,16 @@ # Maintainer: Cecil Watson<knoppmyth@gmail.com> pkgname=ceton_infinitv -_kernver=3.13.7-2-ARCH +_kernver=3.18.4-1-ARCH +_extramods="extramodules-3.18-ARCH" pkgver=2013_0326_2226 -pkgrel=4 +pkgrel=8 usb_pkgver=0.1.0 pkgdesc="Drivers for Ceton InfiniTV4 - pci/usb " arch=('i686' 'x86_64') license=('GPL2') -url="http://linuxtv.org/" -depends=('linux' 'libgusb' 'libnl1' 'ctntad') +url="http://cetoncorp.com/infinitv_support/linux_drivers" +depends=('linux>=3.18' 'linux<3.19' 'libgusb' 'libnl1' 'ctntad') makedepends=(linux-headers) install=ceton.install source=("http://cetoncorp.com/downloads/ceton_infinitv_linux_driver_$pkgver.tar.gz" @@ -17,11 +18,13 @@ source=("http://cetoncorp.com/downloads/ceton_infinitv_linux_driver_$pkgver.tar. "http://cetoncorp.com/downloads/infinitv-usbd-$usb_pkgver.tar.gz" "ceton_usb_init.sh" "ifctn.sh" "ceton_usb_udev.rules" - "http://cetoncorp.com/downloads/reset_network.py" ) + "http://cetoncorp.com/downloads/reset_network.py" + "no-date-time-warn.patch") build() { - cd $startdir/src/ceton_infinitv_linux_driver - make KERNEL_VERSION=$_kernver + cd $srcdir/ceton_infinitv_linux_driver + patch -p1 -i $srcdir/no-date-time-warn.patch + make KERNEL_VERSION=$_kernver cd $startdir/src/infinitv-usbd-$usb_pkgver LDFLAGS="/usr/lib/libgthread-2.0.so" ./configure --prefix=/usr @@ -30,8 +33,9 @@ build() { } package() { - install -Dm755 ${srcdir}/ceton_infinitv_linux_driver/ctn91xx.ko ${pkgdir}/lib/modules/$_kernver/extra/ctn91xx.ko - install -Dm755 ${srcdir}/98-ctn91xx.rules ${pkgdir}/etc/udev/rules.d/98-ctn91xx.rules + install -Dm644 ${srcdir}/ceton_infinitv_linux_driver/ctn91xx.ko ${pkgdir}/usr/lib/modules/$_extramods/ctn91xx.ko + gzip -9 ${pkgdir}/usr/lib/modules/$_extramods/ctn91xx.ko + install -Dm644 ${srcdir}/98-ctn91xx.rules ${pkgdir}/etc/udev/rules.d/98-ctn91xx.rules #usb support cp ${srcdir}/ceton_usb_udev.rules ${pkgdir}/etc/udev/rules.d/ @@ -40,10 +44,11 @@ package() { install -Dm755 ${srcdir}/ifctn.sh ${pkgdir}/usr/LH/bin/ install -m755 ${srcdir}/reset_network.py ${pkgdir}/usr/bin/infinitv_reset_network.py } -md5sums=('de329d7c9477a22fa8cb18f3a74b2ff5' +md5sums=('7ae02309e86ee642b13aeb2f446462bb' '554f2c1bcc5d7169659f0ad3d8a513a5' 'b5db78e2b9cccd65d6ea4c88dd028ace' '9f95a08bdd8c2a9e8d62e7daf52a90f6' '3fc4c4981d2dab54b297f17564b7729f' '8da7dd477d7d47f03e85be4d6476e183' - 'e48d82ff70b05a74aaace9cdcb6875db') + 'e48d82ff70b05a74aaace9cdcb6875db' + 'c90f09bb099d403dceeef5b09af32526') diff --git a/abs/core/ceton_infinitv/ceton.install b/abs/core/ceton_infinitv/ceton.install index f37a5fd..9e4a744 100644 --- a/abs/core/ceton_infinitv/ceton.install +++ b/abs/core/ceton_infinitv/ceton.install @@ -1,5 +1,5 @@ # arg 1: the new package version -KERNEL_VERSION=3.12.6-1-ARCH +KERNEL_VERSION=3.18.4-1-ARCH post_install() { depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 } diff --git a/abs/core/ceton_infinitv/no-date-time-warn.patch b/abs/core/ceton_infinitv/no-date-time-warn.patch new file mode 100644 index 0000000..3f7d9b4 --- /dev/null +++ b/abs/core/ceton_infinitv/no-date-time-warn.patch @@ -0,0 +1,11 @@ +diff -aur ceton_infinitv_linux_driver-orig/Makefile ceton_infinitv_linux_driver/Makefile +--- ceton_infinitv_linux_driver-orig/Makefile 2014-11-11 21:38:27.990742939 -0500 ++++ ceton_infinitv_linux_driver/Makefile 2014-11-11 21:41:41.181569523 -0500 +@@ -23,6 +23,7 @@ + EXTRA_CFLAGS := -DLINUX -DUSE_PCI=1 -DUSE_LEON=0 -DHAS_MPEG_DMA=1 -DUSE_INTERNAL=0 + SOURCES += ctn91xx_pci.o ctn91xx_rtp.o + endif ++EXTRA_CFLAGS += -Wno-date-time + + ctn91xx_builtin-objs := $(SOURCES) + diff --git a/abs/core/coreutils/0001-cp-don-t-reserve-a-device-number.patch b/abs/core/coreutils/0001-cp-don-t-reserve-a-device-number.patch new file mode 100644 index 0000000..1f276b4 --- /dev/null +++ b/abs/core/coreutils/0001-cp-don-t-reserve-a-device-number.patch @@ -0,0 +1,77 @@ +From d0294ff3b90430750a631556277c75f1a555dd44 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Thu, 3 Apr 2014 09:48:22 -0700 +Subject: [PATCH] cp: don't reserve a device number + +* src/copy.c (copy_internal): Replace dev_t arg DEVICE with struct +stat pointer arg PARENT. All callers changed. This removes an +unwarranted assumption that dev_t values of 0 cannot occur in file +systems. See: http://bugs.gnu.org/17179 +--- + src/copy.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/src/copy.c b/src/copy.c +index 781cc1e..d471a77 100644 +--- a/src/copy.c ++++ b/src/copy.c +@@ -117,7 +117,7 @@ struct dir_list + #define DEST_INFO_INITIAL_CAPACITY 61 + + static bool copy_internal (char const *src_name, char const *dst_name, +- bool new_dst, dev_t device, ++ bool new_dst, struct stat const *parent, + struct dir_list *ancestors, + const struct cp_options *x, + bool command_line_arg, +@@ -621,7 +621,7 @@ copy_dir (char const *src_name_in, char const *dst_name_in, bool new_dst, + char *dst_name = file_name_concat (dst_name_in, namep, NULL); + bool first_dir_created = *first_dir_created_per_command_line_arg; + +- ok &= copy_internal (src_name, dst_name, new_dst, src_sb->st_dev, ++ ok &= copy_internal (src_name, dst_name, new_dst, src_sb, + ancestors, &non_command_line_options, false, + &first_dir_created, + &local_copy_into_self, NULL); +@@ -1725,9 +1725,8 @@ should_dereference (const struct cp_options *x, bool command_line_arg) + /* Copy the file SRC_NAME to the file DST_NAME. The files may be of + any type. NEW_DST should be true if the file DST_NAME cannot + exist because its parent directory was just created; NEW_DST should +- be false if DST_NAME might already exist. DEVICE is the device +- number of the parent directory, or 0 if the parent of this file is +- not known. ANCESTORS points to a linked, null terminated list of ++ be false if DST_NAME might already exist. A nonnull PARENT describes the ++ parent directory. ANCESTORS points to a linked, null terminated list of + devices and inodes of parent directories of SRC_NAME. COMMAND_LINE_ARG + is true iff SRC_NAME was specified on the command line. + FIRST_DIR_CREATED_PER_COMMAND_LINE_ARG is both input and output. +@@ -1737,7 +1736,7 @@ should_dereference (const struct cp_options *x, bool command_line_arg) + static bool + copy_internal (char const *src_name, char const *dst_name, + bool new_dst, +- dev_t device, ++ struct stat const *parent, + struct dir_list *ancestors, + const struct cp_options *x, + bool command_line_arg, +@@ -2434,7 +2433,7 @@ copy_internal (char const *src_name, char const *dst_name, + } + + /* Decide whether to copy the contents of the directory. */ +- if (x->one_file_system && device != 0 && device != src_sb.st_dev) ++ if (x->one_file_system && parent && parent->st_dev != src_sb.st_dev) + { + /* Here, we are crossing a file system boundary and cp's -x option + is in effect: so don't copy the contents of this directory. */ +@@ -2827,7 +2826,7 @@ copy (char const *src_name, char const *dst_name, + top_level_dst_name = dst_name; + + bool first_dir_created_per_command_line_arg = false; +- return copy_internal (src_name, dst_name, nonexistent_dst, 0, NULL, ++ return copy_internal (src_name, dst_name, nonexistent_dst, NULL, NULL, + options, true, + &first_dir_created_per_command_line_arg, + copy_into_self, rename_succeeded); +-- +1.9.1 + diff --git a/abs/core/coreutils/PKGBUILD b/abs/core/coreutils/PKGBUILD index d38de6e..f10a12e 100644 --- a/abs/core/coreutils/PKGBUILD +++ b/abs/core/coreutils/PKGBUILD @@ -1,34 +1,47 @@ -# $Id: PKGBUILD 201684 2013-12-18 05:22:31Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id$ +# Maintainer: Sébastien "Seblu" Luttringer +# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils -pkgver=8.22 -pkgrel=2 -pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" +pkgver=8.23 +pkgrel=1 +pkgdesc='The basic file, shell and text manipulation utilities of the GNU operating system' arch=('i686' 'x86_64') license=('GPL3') -url="http://www.gnu.org/software/coreutils" +url='http://www.gnu.org/software/coreutils' groups=('base') depends=('glibc' 'pam' 'acl' 'gmp' 'libcap' 'openssl') -install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +install=$pkgname.install +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +md5sums=('abed135279f87ad6762ce57ff6d89c41' + 'SKIP') + +#prepare() { +# cd $pkgname-$pkgver +#} build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --libexecdir=/usr/lib --with-openssl \ - --enable-no-install-program=groups,hostname,kill,uptime + cd $pkgname-$pkgver + FORCE_UNSAFE_CONFIGURE=1 + export FORCE_UNSAFE_CONFIGURE + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --with-openssl \ + --enable-no-install-program=groups,hostname,kill,uptime make } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $pkgname-$pkgver make RUN_EXPENSIVE_TESTS=yes check } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } -md5sums=('8fb0ae2267aa6e728958adc38f8163a2' - 'SKIP') + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/curl/PKGBUILD b/abs/core/curl/PKGBUILD index d2f7f52..29d6892 100644 --- a/abs/core/curl/PKGBUILD +++ b/abs/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203041 2014-01-02 14:43:46Z dreisner $ +# $Id$ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,24 +6,21 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.34.0 -pkgrel=2 +pkgver=7.39.0 +pkgrel=1 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" license=('MIT') -depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') +depends=('ca-certificates' 'krb5' 'libssh2' 'libidn' 'openssl' 'zlib') provides=('libcurl.so') options=('strip' 'debug') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - 0001-connect-Try-all-addresses-in-first-connection-attemp.patch curlbuild.h) - -prepare() { - cd "$pkgname-$pkgver" - - patch -Np1 <"$srcdir"/0001-connect-Try-all-addresses-in-first-connection-attemp.patch -} +md5sums=('88c5650122873712296d4b1db3f12e6c' + 'SKIP' + '751bd433ede935c8fae727377625a8ae') +validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg build() { cd "$pkgname-$pkgver" @@ -37,7 +34,8 @@ build() { --enable-manual \ --enable-versioned-symbols \ --enable-threaded-resolver \ - --without-libidn \ + --with-gssapi \ + --with-libidn \ --with-random=/dev/urandom \ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt @@ -65,7 +63,3 @@ package() { mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" } -md5sums=('d5b7edccbd1793e3549842e01331da20' - 'SKIP' - 'ee755b0e886207fc1e8154e426c46ca7' - '751bd433ede935c8fae727377625a8ae') diff --git a/abs/core/dbus-glib/PKGBUILD b/abs/core/dbus-glib/PKGBUILD index 9ba5e1e..29d30c5 100644 --- a/abs/core/dbus-glib/PKGBUILD +++ b/abs/core/dbus-glib/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 162401 2012-06-26 20:15:42Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=dbus-glib -pkgver=0.100 -pkgrel=1 +pkgver=0.102 +pkgrel=2 pkgdesc="GLib bindings for DBUS" arch=(i686 x86_64) license=('GPL') url="http://www.freedesktop.org/wiki/Software/DBusBindings" -depends=('dbus-core' 'glib2') -makedepends=('pkgconfig') -options=('!libtool' '!emptydirs') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('d33959a9c0c6a158f5ac6d640316e89e') +depends=('dbus' 'glib2') +options=('!emptydirs') +source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) +md5sums=('f76b8558fd575d0106c3a556eaa49184' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-static=no --enable-bash-completion=no make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/abs/core/dbus-python/PKGBUILD b/abs/core/dbus-python/PKGBUILD index 2ab6eea..2e7116d 100644 --- a/abs/core/dbus-python/PKGBUILD +++ b/abs/core/dbus-python/PKGBUILD @@ -1,63 +1,66 @@ -# $Id: PKGBUILD 162393 2012-06-26 18:57:06Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=dbus-python pkgname=('python2-dbus' 'python-dbus-common') -pkgver=1.1.1 -pkgrel=1 +pkgver=1.2.0 +pkgrel=4 pkgdesc="Python bindings for DBUS" arch=('i686' 'x86_64') license=('GPL' 'LGPL') url="http://www.freedesktop.org/wiki/Software/DBusBindings" makedepends=('docutils' 'dbus-glib' 'python2') -options=('!libtool') -source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz) -md5sums=('742c7432ad0f7c3f98291d58fa2e35dc') +source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz{,.asc}) +md5sums=('b09cd2d1a057cc432ce944de3fc06bf7' + 'SKIP') + +prepare() { + mkdir build-python2 + cd $pkgbase-$pkgver + autoreconf -fi +} build() { - cd "${srcdir}" - mkdir build-python2 build-python3 - cd "${srcdir}/build-python2" + cd build-python2 PYTHON=python2 ../${pkgbase}-${pkgver}/configure --prefix=/usr make - - #cd "${srcdir}/build-python3" - #../${pkgbase}-${pkgver}/configure --prefix=/usr - #make +# cd ../build-python3 +# ../${pkgbase}-${pkgver}/configure --prefix=/usr +# make } package_python-dbus-common() { pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus" conflicts=('dbus-python<1.1.0') - cd "${srcdir}/build-python2" + cd build-python2 make DESTDIR="${pkgdir}" install-data rm -rf "${pkgdir}"/usr/lib/python* } -package_python-dbus1() { - depends=('python-dbus-common' 'python' 'dbus-core') - optdepends=('dbus-glib: glib mainloop support') - pkgdesc="Python 3.2 bindings for DBUS" +#package_python-dbus() { +# depends=('python-dbus-common' 'python' 'dbus') +# optdepends=('dbus-glib: glib mainloop support') +# pkgdesc="Python 3.3 bindings for DBUS" - cd "${srcdir}/build-python3" - make DESTDIR="${pkgdir}" install +# cd build-python3 +# make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}/usr/share" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/lib/pkgconfig" -} +# rm -rf "${pkgdir}/usr/share" +# rm -rf "${pkgdir}/usr/include" +# rm -rf "${pkgdir}/usr/lib/pkgconfig" +#} package_python2-dbus() { - depends=('python-dbus-common' 'python2' 'dbus-core') + depends=('python-dbus-common' 'python2' 'dbus') optdepends=('dbus-glib: glib mainloop support') pkgdesc="Python 2.7 bindings for DBUS" replaces=('dbus-python') conflicts=('dbus-python') provides=("dbus-python=$pkgver") - cd "${srcdir}/build-python2" + cd build-python2 make DESTDIR="${pkgdir}" install rm -rf "${pkgdir}/usr/share" diff --git a/abs/core/dbus/PKGBUILD b/abs/core/dbus/PKGBUILD index ca11c98..e554405 100644 --- a/abs/core/dbus/PKGBUILD +++ b/abs/core/dbus/PKGBUILD @@ -2,24 +2,22 @@ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> -# + pkgbase=dbus pkgname=('dbus' 'libdbus') -pkgver=1.8.0 -pkgrel=1 +pkgver=1.8.12 +pkgrel=2 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64) license=('GPL' 'custom') makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl') -source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz +source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc} 30-dbus) -md5sums=('059fbe84e39fc99c67a14f15b1f39dff' +md5sums=('0ca23fc84c09cb3d29b9c27811ff4475' + 'SKIP' '3314d727fa57fc443fce25b5cbeebbcc') - -prepare() { - cd dbus-$pkgver -} +validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') build() { cd dbus-$pkgver @@ -44,28 +42,25 @@ package_dbus(){ replaces=('dbus-core') cd dbus-$pkgver + + # Disable installation of libdbus + sed -i -e 's/^SUBDIRS = dbus/SUBDIRS =/' Makefile + make DESTDIR="$pkgdir" install - rm -rf "$pkgdir/var/run" + rm -rf "${pkgdir}/var/run" + rm -rf "${pkgdir}/usr/lib/pkgconfig" install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus" - install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING" - - # split out libdbus-1 - rm -rf "$srcdir/_libdbus" - install -dm755 "$srcdir"/_libdbus/usr/lib/dbus-1.0 - mv "$pkgdir"/usr/include "$srcdir"/_libdbus/usr/ - mv "$pkgdir"/usr/lib/pkgconfig "$srcdir"/_libdbus/usr/lib/ - mv "$pkgdir"/usr/lib/libdbus* "$srcdir"/_libdbus/usr/lib/ - mv "$pkgdir"/usr/lib/dbus-1.0/include "$srcdir"/_libdbus/usr/lib/dbus-1.0/ - install -Dm644 COPYING "$srcdir"/_libdbus/usr/share/licenses/libdbus/COPYING } package_libdbus(){ pkgdesc="DBus library" depends=('glibc') - - mv "$srcdir"/_libdbus/* "$pkgdir" + cd dbus-$pkgver + make DESTDIR="$pkgdir" -C dbus install + make DESTDIR="$pkgdir" install-data-am + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/libdbus/COPYING" } diff --git a/abs/core/dbus/memleak.patch b/abs/core/dbus/memleak.patch deleted file mode 100644 index 7dea794..0000000 --- a/abs/core/dbus/memleak.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 03aeaccbffa97c9237b57ca067e3da7388862129 Mon Sep 17 00:00:00 2001 -From: Radoslaw Pajak <r.pajak@samsung.com> -Date: Fri, 08 Nov 2013 12:51:32 +0000 -Subject: fixed memory freeing if error during listing services - -Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com> -Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71526 ---- -diff --git a/bus/activation.c b/bus/activation.c -index fcb7133..ea48a26 100644 ---- a/bus/activation.c -+++ b/bus/activation.c -@@ -2179,7 +2179,7 @@ bus_activation_list_services (BusActivation *activation, - - error: - for (j = 0; j < i; j++) -- dbus_free (retval[i]); -+ dbus_free (retval[j]); - dbus_free (retval); - - return FALSE; -diff --git a/bus/services.c b/bus/services.c -index 6f380fa..01a720e 100644 ---- a/bus/services.c -+++ b/bus/services.c -@@ -368,7 +368,7 @@ bus_registry_list_services (BusRegistry *registry, - - error: - for (j = 0; j < i; j++) -- dbus_free (retval[i]); -+ dbus_free (retval[j]); - dbus_free (retval); - - return FALSE; --- -cgit v0.9.0.2-2-gbebe diff --git a/abs/core/dbus/systemd-user-session.patch b/abs/core/dbus/systemd-user-session.patch deleted file mode 100644 index 3e05324..0000000 --- a/abs/core/dbus/systemd-user-session.patch +++ /dev/null @@ -1,183 +0,0 @@ -commit d728fdc655f17031da3bb129ab2fd17dadf0fe3a -Author: Simon Peeters <peeters.simon@gmail.com> -Date: 8 weeks ago - - Set correct address when using --address=systemd: - - When dbus gets launched through systemd, we need to create an address - string based on the sockets passed. - - The _dbus_append_addres_from_socket() function is responsible for - extracting the address information from the file-descriptor and - formatting it in a dbus friendly way. - - This fixes bus activation when running dbus under a systemd session. - - https://bugs.freedesktop.org/show_bug.cgi?id=50962 - - Signed-off-by: Simon Peeters <peeters.simon@gmail.com> - -diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c -index 130f66e..d995240 100644 ---- a/dbus/dbus-server-unix.c -+++ b/dbus/dbus-server-unix.c -@@ -149,7 +149,7 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry, - } - else if (strcmp (method, "systemd") == 0) - { -- int n, *fds; -+ int i, n, *fds; - DBusString address; - - n = _dbus_listen_systemd_sockets (&fds, error); -@@ -159,27 +159,39 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry, - return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; - } - -- _dbus_string_init_const (&address, "systemd:"); -+ if (!_dbus_string_init (&address)) -+ goto systemd_oom; - -- *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL); -- if (*server_p == NULL) -+ for (i = 0; i < n; i++) - { -- int i; -- -- for (i = 0; i < n; i++) -+ if (i > 0) - { -- _dbus_close_socket (fds[i], NULL); -+ if (!_dbus_string_append (&address, ";")) -+ goto systemd_oom; - } -- dbus_free (fds); -- -- dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); -- return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; -+ if (!_dbus_append_address_from_socket (fds[i], &address, error)) -+ goto systemd_err; - } - -+ *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL); -+ if (*server_p == NULL) -+ goto systemd_oom; -+ - dbus_free (fds); - - return DBUS_SERVER_LISTEN_OK; -- } -+ systemd_oom: -+ _DBUS_SET_OOM (error); -+ systemd_err: -+ for (i = 0; i < n; i++) -+ { -+ _dbus_close_socket (fds[i], NULL); -+ } -+ dbus_free (fds); -+ _dbus_string_free (&address); -+ -+ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; -+ } - #ifdef DBUS_ENABLE_LAUNCHD - else if (strcmp (method, "launchd") == 0) - { -diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c -index b4ecc96..55743b1 100644 ---- a/dbus/dbus-sysdeps-unix.c -+++ b/dbus/dbus-sysdeps-unix.c -@@ -55,6 +55,7 @@ - #include <netinet/in.h> - #include <netdb.h> - #include <grp.h> -+#include <arpa/inet.h> - - #ifdef HAVE_ERRNO_H - #include <errno.h> -@@ -4160,4 +4161,71 @@ _dbus_check_setuid (void) - #endif - } - -+/** -+ * Read the address from the socket and append it to the string -+ * -+ * @param fd the socket -+ * @param address -+ * @param error return location for error code -+ */ -+dbus_bool_t -+_dbus_append_address_from_socket (int fd, -+ DBusString *address, -+ DBusError *error) -+{ -+ union { -+ struct sockaddr sa; -+ struct sockaddr_storage storage; -+ struct sockaddr_un un; -+ struct sockaddr_in ipv4; -+ struct sockaddr_in6 ipv6; -+ } socket; -+ char hostip[INET6_ADDRSTRLEN]; -+ int size = sizeof (socket); -+ -+ if (getsockname (fd, &socket.sa, &size)) -+ goto err; -+ -+ switch (socket.sa.sa_family) -+ { -+ case AF_UNIX: -+ if (socket.un.sun_path[0]=='\0') -+ { -+ if (_dbus_string_append_printf (address, "unix:abstract=%s", &(socket.un.sun_path[1]))) -+ return TRUE; -+ } -+ else -+ { -+ if (_dbus_string_append_printf (address, "unix:path=%s", socket.un.sun_path)) -+ return TRUE; -+ } -+ break; -+ case AF_INET: -+ if (inet_ntop (AF_INET, &socket.ipv4.sin_addr, hostip, sizeof (hostip))) -+ if (_dbus_string_append_printf (address, "tcp:family=ipv4,host=%s,port=%u", -+ hostip, ntohs (socket.ipv4.sin_port))) -+ return TRUE; -+ break; -+#ifdef AF_INET6 -+ case AF_INET6: -+ if (inet_ntop (AF_INET6, &socket.ipv6.sin6_addr, hostip, sizeof (hostip))) -+ if (_dbus_string_append_printf (address, "tcp:family=ipv6,host=%s,port=%u", -+ hostip, ntohs (socket.ipv6.sin6_port))) -+ return TRUE; -+ break; -+#endif -+ default: -+ dbus_set_error (error, -+ _dbus_error_from_errno (EINVAL), -+ "Failed to read address from socket: Unknown socket type."); -+ return FALSE; -+ } -+ err: -+ dbus_set_error (error, -+ _dbus_error_from_errno (errno), -+ "Failed to open socket: %s", -+ _dbus_strerror (errno)); -+ return FALSE; -+} -+ - /* tests in dbus-sysdeps-util.c */ -diff --git a/dbus/dbus-sysdeps-unix.h b/dbus/dbus-sysdeps-unix.h -index 9b70896..a265b33 100644 ---- a/dbus/dbus-sysdeps-unix.h -+++ b/dbus/dbus-sysdeps-unix.h -@@ -138,6 +138,10 @@ dbus_bool_t _dbus_parse_uid (const DBusString *uid_str, - - void _dbus_close_all (void); - -+dbus_bool_t _dbus_append_address_from_socket (int fd, -+ DBusString *address, -+ DBusError *error); -+ - /** @} */ - - DBUS_END_DECLS diff --git a/abs/core/dvb-firmware/PKGBUILD b/abs/core/dvb-firmware/PKGBUILD index 59fe759..244f247 100644 --- a/abs/core/dvb-firmware/PKGBUILD +++ b/abs/core/dvb-firmware/PKGBUILD @@ -3,19 +3,18 @@ pkgname=dvb-firmware pkgver=1 -pkgrel=20 +pkgrel=22 pkgdesc="Firmware for DVB cards" replaces=('hd3000firmware') -arch=('i586' 'i686' 'x86_64') +arch=('i686' 'x86_64') url="http://linuxtv.org/" -source=(dvb-firmware.tar.bz2 xc5000.conf) +source=(xc5000.conf) package() { cd $srcdir - mkdir -p ${pkgdir}/lib/firmware - cp -a dvb-fw/* ${pkgdir}/lib/firmware + mkdir -p ${pkgdir}/usr/lib/firmware + cp -a ${startdir}/dvb-fw/* ${pkgdir}/usr/lib/firmware mkdir -p ${pkgdir}/etc/modprobe.d/ install -D -m644 "${srcdir}/xc5000.conf" "${pkgdir}/etc/modprobe.d/" } -md5sums=('d2ba68a1e49adbb71431295fc96cda60' - 'ad7db39e2a2afe3ffc7e65fd5822517d') +md5sums=('ad7db39e2a2afe3ffc7e65fd5822517d') diff --git a/abs/core/dvb-firmware/dvb-firmware.tar.bz2 b/abs/core/dvb-firmware/dvb-firmware.tar.bz2 Binary files differdeleted file mode 100644 index df45dc0..0000000 --- a/abs/core/dvb-firmware/dvb-firmware.tar.bz2 +++ /dev/null diff --git a/abs/core/dvb-firmware/dvb-fw/NXP7164-2010-03-10.1.fw b/abs/core/dvb-firmware/dvb-fw/NXP7164-2010-03-10.1.fw Binary files differnew file mode 100644 index 0000000..01360d1 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/NXP7164-2010-03-10.1.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-fe-bcm3510-01.fw b/abs/core/dvb-firmware/dvb-fw/dvb-fe-bcm3510-01.fw Binary files differnew file mode 100644 index 0000000..6eec615 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-fe-bcm3510-01.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-fe-cx24116.fw b/abs/core/dvb-firmware/dvb-fw/dvb-fe-cx24116.fw Binary files differnew file mode 100644 index 0000000..8fed649 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-fe-cx24116.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-fe-nxt2002.fw b/abs/core/dvb-firmware/dvb-fw/dvb-fe-nxt2002.fw Binary files differnew file mode 100644 index 0000000..3c81c5e --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-fe-nxt2002.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-fe-nxt2004.fw b/abs/core/dvb-firmware/dvb-fw/dvb-fe-nxt2004.fw Binary files differnew file mode 100644 index 0000000..3cd57b1 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-fe-nxt2004.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-fe-or51132-qam.fw b/abs/core/dvb-firmware/dvb-fw/dvb-fe-or51132-qam.fw Binary files differnew file mode 100644 index 0000000..84e6928 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-fe-or51132-qam.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-fe-or51132-vsb.fw b/abs/core/dvb-firmware/dvb-fw/dvb-fe-or51132-vsb.fw Binary files differnew file mode 100644 index 0000000..51168f4 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-fe-or51132-vsb.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-fe-or51211.fw b/abs/core/dvb-firmware/dvb-fw/dvb-fe-or51211.fw Binary files differnew file mode 100644 index 0000000..1300f7f --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-fe-or51211.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-fe-sp887x.fw b/abs/core/dvb-firmware/dvb-fw/dvb-fe-sp887x.fw Binary files differnew file mode 100644 index 0000000..a318966 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-fe-sp887x.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-fe-tda10045.fw b/abs/core/dvb-firmware/dvb-fw/dvb-fe-tda10045.fw Binary files differnew file mode 100644 index 0000000..a5d5568 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-fe-tda10045.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-fe-tda10046.fw b/abs/core/dvb-firmware/dvb-fw/dvb-fe-tda10046.fw Binary files differnew file mode 100644 index 0000000..caad832 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-fe-tda10046.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-fe-tda10048-1.0.fw b/abs/core/dvb-firmware/dvb-fw/dvb-fe-tda10048-1.0.fw Binary files differnew file mode 100644 index 0000000..b46126d --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-fe-tda10048-1.0.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-fe-tdlb7.fw b/abs/core/dvb-firmware/dvb-fw/dvb-fe-tdlb7.fw Binary files differnew file mode 100644 index 0000000..9a2cc31 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-fe-tdlb7.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-fe-xc5000-1.1.fw b/abs/core/dvb-firmware/dvb-fw/dvb-fe-xc5000-1.1.fw Binary files differnew file mode 100644 index 0000000..7d4c230 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-fe-xc5000-1.1.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw Binary files differnew file mode 100644 index 0000000..5bb7f25 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261a b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261a Binary files differnew file mode 100644 index 0000000..7a7b95f --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261a diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261b b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261b Binary files differnew file mode 100644 index 0000000..0c0e792 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261b diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261c b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261c Binary files differnew file mode 100644 index 0000000..671db19 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261c diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261d b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261d Binary files differnew file mode 100644 index 0000000..9b9c53c --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261d diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261f b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261f Binary files differnew file mode 100644 index 0000000..d0b528b --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-261f diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-2622 b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-2622 Binary files differnew file mode 100644 index 0000000..5bb7f25 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-ttpci-01.fw-2622 diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-ttusb-dec-2000t.fw b/abs/core/dvb-firmware/dvb-fw/dvb-ttusb-dec-2000t.fw Binary files differnew file mode 100644 index 0000000..62e5684 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-ttusb-dec-2000t.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-ttusb-dec-2540t.fw b/abs/core/dvb-firmware/dvb-fw/dvb-ttusb-dec-2540t.fw Binary files differnew file mode 100644 index 0000000..7c282d7 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-ttusb-dec-2540t.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-ttusb-dec-3000s.fw b/abs/core/dvb-firmware/dvb-fw/dvb-ttusb-dec-3000s.fw Binary files differnew file mode 100644 index 0000000..2407fbd --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-ttusb-dec-3000s.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-adstech-usb2-02.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-adstech-usb2-02.fw Binary files differnew file mode 100644 index 0000000..119590a --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-adstech-usb2-02.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-af9015.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-af9015.fw Binary files differnew file mode 100644 index 0000000..0014181 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-af9015.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-avertv-a800-02.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-avertv-a800-02.fw Binary files differnew file mode 100644 index 0000000..c8f0be7 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-avertv-a800-02.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-bluebird-01.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-bluebird-01.fw Binary files differnew file mode 100644 index 0000000..3b80112 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-bluebird-01.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-bluebird-02.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-bluebird-02.fw Binary files differnew file mode 100644 index 0000000..11aaf45 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-bluebird-02.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-dib0700-01.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-dib0700-01.fw Binary files differnew file mode 100644 index 0000000..445ddf4 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-dib0700-01.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-dibusb-5.0.0.11.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-dibusb-5.0.0.11.fw Binary files differnew file mode 100644 index 0000000..c57fb29 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-dibusb-5.0.0.11.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-dibusb-6.0.0.8.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-dibusb-6.0.0.8.fw Binary files differnew file mode 100644 index 0000000..825e05d --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-dibusb-6.0.0.8.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-dibusb-an2235-01.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-dibusb-an2235-01.fw Binary files differnew file mode 100644 index 0000000..b57d47a --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-dibusb-an2235-01.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-digitv-02.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-digitv-02.fw Binary files differnew file mode 100644 index 0000000..04b377a --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-digitv-02.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-dtt200u-01.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-dtt200u-01.fw Binary files differnew file mode 100644 index 0000000..5693813 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-dtt200u-01.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-nova-t-usb2-02.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-nova-t-usb2-02.fw Binary files differnew file mode 100644 index 0000000..76ea03d --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-nova-t-usb2-02.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-pctv-400e-01.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-pctv-400e-01.fw Binary files differnew file mode 100644 index 0000000..e5b3ae8 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-pctv-400e-01.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-umt-010-02.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-umt-010-02.fw Binary files differnew file mode 100644 index 0000000..479be75 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-umt-010-02.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-vp702x-01.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-vp702x-01.fw Binary files differnew file mode 100644 index 0000000..e366e92 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-vp702x-01.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-vp702x-02.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-vp702x-02.fw Binary files differnew file mode 100644 index 0000000..d148dd8 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-vp702x-02.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-vp7045-01.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-vp7045-01.fw Binary files differnew file mode 100644 index 0000000..df4f3db --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-vp7045-01.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-wt220u-01.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-wt220u-01.fw Binary files differnew file mode 100644 index 0000000..f0a1e83 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-wt220u-01.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-wt220u-02.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-wt220u-02.fw Binary files differnew file mode 100644 index 0000000..6de7366 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-wt220u-02.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-wt220u-fc03.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-wt220u-fc03.fw Binary files differnew file mode 100644 index 0000000..66c4a9a --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-wt220u-fc03.fw diff --git a/abs/core/dvb-firmware/dvb-fw/dvb-usb-wt220u-zl0353-01.fw b/abs/core/dvb-firmware/dvb-fw/dvb-usb-wt220u-zl0353-01.fw Binary files differnew file mode 100644 index 0000000..49c881f --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/dvb-usb-wt220u-zl0353-01.fw diff --git a/abs/core/dvb-firmware/dvb-fw/pvrusb2.f1 b/abs/core/dvb-firmware/dvb-fw/pvrusb2.f1 Binary files differnew file mode 100644 index 0000000..578e722 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/pvrusb2.f1 diff --git a/abs/core/dvb-firmware/dvb-fw/pvrusb2.f2 b/abs/core/dvb-firmware/dvb-fw/pvrusb2.f2 Binary files differnew file mode 100644 index 0000000..ad73f3b --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/pvrusb2.f2 diff --git a/abs/core/dvb-firmware/dvb-fw/v4l-saa7164-1.0.2.fw b/abs/core/dvb-firmware/dvb-fw/v4l-saa7164-1.0.2.fw Binary files differnew file mode 100644 index 0000000..9a209b7 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/v4l-saa7164-1.0.2.fw diff --git a/abs/core/dvb-firmware/dvb-fw/v4l-saa7164-1.0.3.fw b/abs/core/dvb-firmware/dvb-fw/v4l-saa7164-1.0.3.fw Binary files differnew file mode 100644 index 0000000..ad374fd --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/v4l-saa7164-1.0.3.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028-dvico-au-01.fw b/abs/core/dvb-firmware/dvb-fw/xc3028-dvico-au-01.fw Binary files differnew file mode 100644 index 0000000..379eb2f --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028-dvico-au-01.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028-v27.fw b/abs/core/dvb-firmware/dvb-fw/xc3028-v27.fw Binary files differnew file mode 100644 index 0000000..76f46ab --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028-v27.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028L-v36.fw b/abs/core/dvb-firmware/dvb-fw/xc3028L-v36.fw Binary files differnew file mode 100644 index 0000000..a7bcd64 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028L-v36.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_8MHz_MTS_init0.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_8MHz_MTS_init0.i2c.fw Binary files differnew file mode 100644 index 0000000..7c4df16 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_8MHz_MTS_init0.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_8MHz_init0.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_8MHz_init0.i2c.fw Binary files differnew file mode 100644 index 0000000..7c6f012 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_8MHz_init0.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_A2_A.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_A2_A.i2c.fw Binary files differnew file mode 100644 index 0000000..bb495b2 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_A2_A.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_A2_A_MTS.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_A2_A_MTS.i2c.fw Binary files differnew file mode 100644 index 0000000..bb495b2 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_A2_A_MTS.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_A2_B.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_A2_B.i2c.fw Binary files differnew file mode 100644 index 0000000..83a8383 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_A2_B.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_A2_B_MTS.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_A2_B_MTS.i2c.fw Binary files differnew file mode 100644 index 0000000..4d7eb79 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_A2_B_MTS.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_NICAM_A.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_NICAM_A.i2c.fw Binary files differnew file mode 100644 index 0000000..7b65976 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_NICAM_A.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_NICAM_A_MTS.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_NICAM_A_MTS.i2c.fw Binary files differnew file mode 100644 index 0000000..e8ef52f --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_NICAM_A_MTS.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_NICAM_B.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_NICAM_B.i2c.fw Binary files differnew file mode 100644 index 0000000..7b65976 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_NICAM_B.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_NICAM_B_MTS.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_NICAM_B_MTS.i2c.fw Binary files differnew file mode 100644 index 0000000..e8ef52f --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_BG_PAL_NICAM_B_MTS.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DK_PAL_A2.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_PAL_A2.i2c.fw Binary files differnew file mode 100644 index 0000000..9c4d336 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_PAL_A2.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DK_PAL_A2_MTS.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_PAL_A2_MTS.i2c.fw Binary files differnew file mode 100644 index 0000000..6d7a05e --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_PAL_A2_MTS.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DK_PAL_NICAM.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_PAL_NICAM.i2c.fw Binary files differnew file mode 100644 index 0000000..50826fe --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_PAL_NICAM.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DK_PAL_NICAM_MTS.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_PAL_NICAM_MTS.i2c.fw Binary files differnew file mode 100644 index 0000000..d8a8fe2 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_PAL_NICAM_MTS.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DK_SECAM_A2_DK1.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_SECAM_A2_DK1.i2c.fw Binary files differnew file mode 100644 index 0000000..a02899c --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_SECAM_A2_DK1.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DK_SECAM_A2_DK1_MTS.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_SECAM_A2_DK1_MTS.i2c.fw Binary files differnew file mode 100644 index 0000000..112e30a --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_SECAM_A2_DK1_MTS.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DK_SECAM_A2_L_DK3.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_SECAM_A2_L_DK3.i2c.fw Binary files differnew file mode 100644 index 0000000..ca4787a --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_SECAM_A2_L_DK3.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DK_SECAM_A2_L_DK3_MTS.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_SECAM_A2_L_DK3_MTS.i2c.fw Binary files differnew file mode 100644 index 0000000..b38b1df --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DK_SECAM_A2_L_DK3_MTS.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DTV6_ATSC_2620.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV6_ATSC_2620.i2c.fw Binary files differnew file mode 100644 index 0000000..1260a54 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV6_ATSC_2620.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DTV6_ATSC_2633.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV6_ATSC_2633.i2c.fw Binary files differnew file mode 100644 index 0000000..1260a54 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV6_ATSC_2633.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DTV6_QAM_2620.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV6_QAM_2620.i2c.fw Binary files differnew file mode 100644 index 0000000..9c2631a --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV6_QAM_2620.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DTV6_QAM_2633.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV6_QAM_2633.i2c.fw Binary files differnew file mode 100644 index 0000000..1aa4698 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV6_QAM_2633.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DTV78_2620.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV78_2620.i2c.fw Binary files differnew file mode 100644 index 0000000..e9ad141 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV78_2620.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DTV78_2633.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV78_2633.i2c.fw Binary files differnew file mode 100644 index 0000000..3b872ea --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV78_2633.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DTV7_2620.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV7_2620.i2c.fw Binary files differnew file mode 100644 index 0000000..9a430ef --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV7_2620.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DTV7_2633.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV7_2633.i2c.fw Binary files differnew file mode 100644 index 0000000..e7fa399 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV7_2633.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DTV8_2620.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV8_2620.i2c.fw Binary files differnew file mode 100644 index 0000000..9a430ef --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV8_2620.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_DTV8_2633.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV8_2633.i2c.fw Binary files differnew file mode 100644 index 0000000..e7fa399 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_DTV8_2633.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_FM.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_FM.i2c.fw Binary files differnew file mode 100644 index 0000000..1a7e1cc --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_FM.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_FM_INPUT1_init0.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_FM_INPUT1_init0.i2c.fw Binary files differnew file mode 100644 index 0000000..3d07966 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_FM_INPUT1_init0.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_FM_init0.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_FM_init0.i2c.fw Binary files differnew file mode 100644 index 0000000..efad66a --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_FM_init0.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_I_PAL_NICAM.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_I_PAL_NICAM.i2c.fw Binary files differnew file mode 100644 index 0000000..382f969 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_I_PAL_NICAM.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_I_PAL_NICAM_MTS.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_I_PAL_NICAM_MTS.i2c.fw Binary files differnew file mode 100644 index 0000000..83eff60 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_I_PAL_NICAM_MTS.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_L'_SECAM_NICAM.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_L'_SECAM_NICAM.i2c.fw Binary files differnew file mode 100644 index 0000000..8fe3ab7 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_L'_SECAM_NICAM.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_L_SECAM_AM.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_L_SECAM_AM.i2c.fw Binary files differnew file mode 100644 index 0000000..dc668c7 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_L_SECAM_AM.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_L_SECAM_NICAM.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_L_SECAM_NICAM.i2c.fw Binary files differnew file mode 100644 index 0000000..f22dfcb --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_L_SECAM_NICAM.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_A2.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_A2.i2c.fw Binary files differnew file mode 100644 index 0000000..c3f02c7 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_A2.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_A2_LCD.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_A2_LCD.i2c.fw Binary files differnew file mode 100644 index 0000000..38cda6e --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_A2_LCD.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_A2_LCD_NOGD.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_A2_LCD_NOGD.i2c.fw Binary files differnew file mode 100644 index 0000000..7292163 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_A2_LCD_NOGD.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_A2_MTS.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_A2_MTS.i2c.fw Binary files differnew file mode 100644 index 0000000..a12f1ad --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_A2_MTS.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_BTSC.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_BTSC.i2c.fw Binary files differnew file mode 100644 index 0000000..292a08f --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_BTSC.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_BTSC_LCD.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_BTSC_LCD.i2c.fw Binary files differnew file mode 100644 index 0000000..f6bd3ea --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_BTSC_LCD.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_BTSC_LCD_NOGD.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_BTSC_LCD_NOGD.i2c.fw Binary files differnew file mode 100644 index 0000000..355c2c5 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_BTSC_LCD_NOGD.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_EIAJ.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_EIAJ.i2c.fw Binary files differnew file mode 100644 index 0000000..175ccb2 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_EIAJ.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_EIAJ_LCD.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_EIAJ_LCD.i2c.fw Binary files differnew file mode 100644 index 0000000..f6bd3ea --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_EIAJ_LCD.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_EIAJ_LCD_NOGD.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_EIAJ_LCD_NOGD.i2c.fw Binary files differnew file mode 100644 index 0000000..355c2c5 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_EIAJ_LCD_NOGD.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_MTS.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_MTS.i2c.fw Binary files differnew file mode 100644 index 0000000..c3f02c7 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_MTS.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_MTS_LCD.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_MTS_LCD.i2c.fw Binary files differnew file mode 100644 index 0000000..cdbda18 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_MTS_LCD.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_MTS_LCD_NOGD.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_MTS_LCD_NOGD.i2c.fw Binary files differnew file mode 100644 index 0000000..080463c --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MN_NTSCPAL_MTS_LCD_NOGD.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_MTS_init0.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_MTS_init0.i2c.fw Binary files differnew file mode 100644 index 0000000..100cf32 --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_MTS_init0.i2c.fw diff --git a/abs/core/dvb-firmware/dvb-fw/xc3028_init0.i2c.fw b/abs/core/dvb-firmware/dvb-fw/xc3028_init0.i2c.fw Binary files differnew file mode 100644 index 0000000..e845ede --- /dev/null +++ b/abs/core/dvb-firmware/dvb-fw/xc3028_init0.i2c.fw diff --git a/abs/core/dvdauthor/PKGBUILD b/abs/core/dvdauthor/PKGBUILD index 6eda716..d882f3d 100644 --- a/abs/core/dvdauthor/PKGBUILD +++ b/abs/core/dvdauthor/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 148702 2012-02-05 11:47:33Z ibiru $ +# $Id$ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Travis Willard <travisw@wmpub.ca> +# Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> # Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de> pkgname=dvdauthor -pkgver=0.7.0 -pkgrel=4 +pkgver=0.7.1 +pkgrel=7 pkgdesc="DVD authoring tools" arch=('i686' 'x86_64') url="http://dvdauthor.sourceforge.net/" @@ -14,14 +14,12 @@ license=('GPL') depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') options=('!makeflags') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'dvdauthor-0.7.0-libpng15.patch') -md5sums=('33a447fb98ab3293ac40f869eedc17ff' - '9ea90bbea6adb0469c8c1b2f7d033f11') + "dvdauthor-0.7.1-compat.h.patch") build() { cd "${srcdir}/${pkgname}" - patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch" + patch -Np0 -i "${srcdir}/dvdauthor-0.7.1-compat.h.patch" ./configure --prefix=/usr \ --sysconfdir=/etc @@ -33,3 +31,5 @@ package() { make DESTDIR="${pkgdir}" install } +md5sums=('2694a5a3ef460106ea3caf0f7f60ff80' + 'a5b3cf48aba9db6fed87021202254525') diff --git a/abs/core/dvdauthor/__changelog b/abs/core/dvdauthor/__changelog new file mode 100644 index 0000000..ca9f0cc --- /dev/null +++ b/abs/core/dvdauthor/__changelog @@ -0,0 +1 @@ +PKGBUILD: add dvdauthor-0.7.1-compat.h.patch diff --git a/abs/core/dvdauthor/dvdauthor-0.7.1-compat.h.patch b/abs/core/dvdauthor/dvdauthor-0.7.1-compat.h.patch new file mode 100644 index 0000000..af6956c --- /dev/null +++ b/abs/core/dvdauthor/dvdauthor-0.7.1-compat.h.patch @@ -0,0 +1,11 @@ +--- src/compat.h.orig 2014-12-04 00:12:12.454643812 +0000 ++++ src/compat.h 2014-12-04 00:13:03.341422817 +0000 +@@ -1,6 +1,8 @@ + // basic headers + #define _GNU_SOURCE /* really just for strndup */ + ++#include "config.h" ++ + #ifdef HAVE_STDBOOL_H + # include <stdbool.h> + #else diff --git a/abs/core/enlightenment/PKGBUILD b/abs/core/enlightenment/PKGBUILD index 4f04151..a0004f9 100644 --- a/abs/core/enlightenment/PKGBUILD +++ b/abs/core/enlightenment/PKGBUILD @@ -2,9 +2,9 @@ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=enlightenment -pkgver=1.0.10 +pkgver=1.0.15 _themever=1.0.1 -pkgrel=8 +pkgrel=1 pkgdesc="A fast, flexible, and very extensible Window Manager" arch=('i686' 'x86_64') url="http://www.enlightenment.org" @@ -35,5 +35,5 @@ package() { # make DESTDIR="${pkgdir}" install # chown -R root:root "${pkgdir}"/usr/share/* } -md5sums=('87441a2e7c4639e5d23198ed7bc834ea' - 'ed24a9be5437ca5c53e723cc1a584abd') +md5sums=('a3ab3a965d73109b4a929368b5cd4ae7' + '0098d0a6469ec539bf12eeda2171d540') diff --git a/abs/core/enlightenment/startup.patch b/abs/core/enlightenment/startup.patch index 369b39c..d13ed2f 100644 --- a/abs/core/enlightenment/startup.patch +++ b/abs/core/enlightenment/startup.patch @@ -1,15 +1,14 @@ ---- src/startup.c.orig 2013-01-11 02:14:16.690976774 +0000 -+++ src/startup.c 2013-01-11 21:00:59.344248500 +0000 -@@ -173,5 +173,62 @@ +--- src/startup.c.orig 2014-12-05 22:19:41.506253255 +0000 ++++ src/startup.c 2014-12-08 13:33:17.326875866 +0000 +@@ -172,5 +172,52 @@ + speed = Conf.desks.slidespeed > 0 ? Conf.desks.slidespeed : 500; + duration = 2000000 / speed; - Mode.place.enable_features--; - ESync(ESYNC_STARTUP); -+ + //Start of MythVantage delay for ultra cool startup + printf("***\n"); + int ret = 1 ; -+ -+ //checking for fname + AnimatorAdd(NULL, ANIM_STARTUP, doStartupWindowsOpen, duration, 0, 0, NULL); ++ //checking for fname} + int result; + const char *filename = "/tmp/nofe"; + result = access (filename, F_OK); @@ -21,8 +20,7 @@ + //filename_config = strcat(value , "/.configure"); + const char *filename_config = "/tmp/no_e_delay"; + result_config = access (filename_config, F_OK); -+ -+ if( result == 0 || result_config ==0 ) ++ if( result == 0 || result_config ==0 ) + { + printf("ENLIGHTENMENT: Found /tmp/nofe, skipping delay\n"); + } @@ -54,12 +52,4 @@ + } + } + // End of delay code -+ -+ -+ -+ -+ -+ -+ - AnimatorAdd(doStartupWindowsOpen, NULL); } diff --git a/abs/core/expat/PKGBUILD b/abs/core/expat/PKGBUILD index 73688e0..8ba5f58 100644 --- a/abs/core/expat/PKGBUILD +++ b/abs/core/expat/PKGBUILD @@ -1,32 +1,31 @@ -# $Id: PKGBUILD 156201 2012-04-16 03:41:12Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Committer: Judd Vinet <jvinet@zeroflux.org> +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=expat pkgver=2.1.0 -pkgrel=1 -pkgdesc="An XML parser library" +pkgrel=4 +pkgdesc='An XML parser library' arch=('i686' 'x86_64') -url="http://expat.sourceforge.net/" +url='http://expat.sourceforge.net/' license=('custom') depends=('glibc') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/expat/$pkgname-$pkgver.tar.gz) md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --mandir=/usr/share/man + cd $pkgname-$pkgver + ./configure --prefix=/usr make } check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check + make -C $pkgname-$pkgver check } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } diff --git a/abs/core/expect/PKGBUILD b/abs/core/expect/PKGBUILD index 140b4a4..5e9b909 100644 --- a/abs/core/expect/PKGBUILD +++ b/abs/core/expect/PKGBUILD @@ -1,32 +1,20 @@ -# $Id: PKGBUILD 151250 2012-02-25 10:00:44Z allan $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id$ +# Maintainer: Allan McRae <allan@archlinux.org> pkgname=expect pkgver=5.45 -pkgrel=2 +pkgrel=4 pkgdesc="A tool for automating interactive applications" arch=('i686' 'x86_64') url="http://www.nist.gov/el/msid/expect.cfm" license=('custom') -depends=('tcl>=8.5.3') -conflicts=('expectk') -install=expect.install -changelog=ChangeLog +depends=('tcl') source=(http://downloads.sourceforge.net/project/expect/Expect/${pkgver}/expect${pkgver}.tar.gz) -# CVS checkout on gerolde. -#source=(ftp://ftp.archlinux.org/other/expect/expect-${pkgver}.tar.bz2) -# old nist source=(http://expect.nist.gov/src/expect-${pkgver}.tar.bz2) md5sums=('44e1a4f4c877e9ddc5a542dfa7ecc92b') build() { cd ${srcdir}/expect${pkgver} - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --mandir=/usr/share/man --with-tcl=/usr/lib \ - --with-tclinclude=/usr/include - - # Keep $startdir/pkg out of library search paths. - sed -e 's/-rpath,${LIB_RUNTIME_DIR}:/-rpath,/' -i Makefile + ./configure --prefix=/usr --mandir=/usr/share/man make } @@ -34,9 +22,5 @@ package() { cd ${srcdir}/expect${pkgver} make DESTDIR=${pkgdir} install - # license. install -D -m644 README ${pkgdir}/usr/share/licenses/${pkgname}/README - - (cd ${pkgdir}/usr/lib; - ln -s expect${pkgver}/libexpect${pkgver}.so libexpect.so) } diff --git a/abs/core/ffmpeg/PKGBUILD b/abs/core/ffmpeg/PKGBUILD index 2e90fb1..115ddfb 100644 --- a/abs/core/ffmpeg/PKGBUILD +++ b/abs/core/ffmpeg/PKGBUILD @@ -5,8 +5,8 @@ # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=2.2.1 -pkgrel=2 +pkgver=2.4.3 +pkgrel=1 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64') @@ -16,19 +16,12 @@ depends=( 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libvdpau' 'libbluray' 'libmodplug' 'libtheora' 'libva' 'libvorbis' 'libvpx' 'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'schroedinger' 'sdl' 'speex' - 'v4l-utils' 'x264' 'xvidcore' 'zlib' 'x265' - ) + 'v4l-utils' 'libx264' 'xvidcore' 'zlib' 'x265' 'fribidi' +) makedepends=('libvdpau' 'yasm') -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc} - 0001-libx265-Support-API-version-9.patch) -md5sums=('b8a1ee4964c2638f46fcc803ed453818' - 'SKIP' - '4cbf9b13dc013e96be36445b4a2bfdac') - -prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../0001-libx265-Support-API-version-9.patch -} +source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc}) +md5sums=('8da635baff57d7ab704b1daca5a99b47' + 'SKIP') build() { cd $pkgname-$pkgver @@ -37,14 +30,16 @@ build() { --prefix=/usr \ --disable-debug \ --disable-static \ + --disable-stripping \ + --enable-avisynth \ --enable-avresample \ - --enable-dxva2 \ --enable-fontconfig \ --enable-gnutls \ --enable-gpl \ --enable-libass \ --enable-libbluray \ --enable-libfreetype \ + --enable-libfribidi \ --enable-libgsm \ --enable-libmodplug \ --enable-libmp3lame \ @@ -63,14 +58,12 @@ build() { --enable-libx264 \ --enable-libx265 \ --enable-libxvid \ - --enable-pic \ - --enable-postproc \ --enable-runtime-cpudetect \ --enable-shared \ --enable-swresample \ --enable-vdpau \ --enable-version3 \ - --enable-x11grab + --enable-x11grab \ make make tools/qt-faststart @@ -82,5 +75,3 @@ package() { make DESTDIR="$pkgdir" install install-man install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart } - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/fontconfig/PKGBUILD b/abs/core/fontconfig/PKGBUILD index f698618..2919bb1 100644 --- a/abs/core/fontconfig/PKGBUILD +++ b/abs/core/fontconfig/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 166327 2012-09-06 13:53:52Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig -pkgver=2.10.1 -pkgrel=2 +pkgver=2.11.1 +pkgrel=1 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) url="http://www.fontconfig.org/release/" license=('custom') depends=('expat' 'freetype2') -options=('!libtool') install=fontconfig.install -source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz - 29-replace-bitmap-fonts.conf) -md5sums=('c94e380eea42f2f23ca9537035ef1899' - 'f6b67e8cc79197ed6abd4701911e83da') +source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2) +sha256sums=('dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99') + + # a nice page to test font matching: + # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well libtoolize -f - autoreconf -f + autoreconf -fi ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -35,22 +35,12 @@ build() { } check() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make -k check } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - - # not upstream, not in FC and not in Gentoo, this should probably go upstream - # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back - install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail" - pushd $pkgdir/etc/fonts/conf.d - ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf . - popd - - #Install license - install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" - install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/abs/core/freetype2/PKGBUILD b/abs/core/freetype2/PKGBUILD index 36accb9..a8236f6 100644 --- a/abs/core/freetype2/PKGBUILD +++ b/abs/core/freetype2/PKGBUILD @@ -1,29 +1,46 @@ -# $Id: PKGBUILD 161854 2012-06-15 16:53:25Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 -pkgver=2.4.10 -pkgrel=1 +pkgver=2.5.3 +pkgrel=2 pkgdesc="TrueType font rendering library" arch=(i686 x86_64) license=('GPL') url="http://freetype.sourceforge.net" -depends=('zlib' 'bzip2' 'sh') -options=('!libtool') -replaces=('freetype2-static') -source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 - freetype-2.3.0-enable-spr.patch - freetype-2.2.1-enable-valid.patch) -md5sums=('13286702e9390a91661f980608adaff1' - '816dc8619a6904a7385769433c0a8653' - '214119610444c9b02766ccee5e220680') +# adding harfbuzz for improved OpenType features auto-hinting +# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream +depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz') +source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2{,.sig} + freetype-2.2.1-enable-valid.patch + freetype-2.5.1-enable-spr.patch + freetype-2.5.1-enable-sph.patch + fix_segfault_with_harfbuzz.diff) +sha1sums=('d3c26cc17ec7fe6c36f4efc02ef92ab6aa3f4b46' + 'SKIP' + 'f279d922a873d62a8af50bfc873051839d194dca' + '13ee8d558593db991ad29fa090b461f914536104' + 'c31fa3d342ead56f3acfa1f267b474a7686d0014' + 'c99013b4c19494cd26031878368191cd2b4459b0') -build() { +prepare() { cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" + patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-spr.patch" + + # fix segfaults # https://bugs.archlinux.org/task/39365 + # http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=23367ff97f33ef6a2b7e1fced1157c87a46d9596 + patch -Np1 -i "${srcdir}/fix_segfault_with_harfbuzz.diff" + + # Disabled for now due to resistance + # Kept here for easier rebuilds via ABS + # https://bugs.archlinux.org/task/35274 + #patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-sph.patch" +} - ./configure --prefix=/usr +build() { + cd "${srcdir}/freetype-${pkgver}" + ./configure --prefix=/usr --disable-static make } diff --git a/abs/core/freetype2/__changelog b/abs/core/freetype2/__changelog deleted file mode 100644 index a1edbbd..0000000 --- a/abs/core/freetype2/__changelog +++ /dev/null @@ -1 +0,0 @@ -- added replaces=('freetype2-static') to PKGBUILD diff --git a/abs/core/freetype2/fix_segfault_with_harfbuzz.diff b/abs/core/freetype2/fix_segfault_with_harfbuzz.diff new file mode 100644 index 0000000..a1832eb --- /dev/null +++ b/abs/core/freetype2/fix_segfault_with_harfbuzz.diff @@ -0,0 +1,32 @@ +From 23367ff97f33ef6a2b7e1fced1157c87a46d9596 Mon Sep 17 00:00:00 2001 +From: Werner Lemberg <wl@gnu.org> +Date: Mon, 17 Mar 2014 06:33:14 +0000 +Subject: Fix Savannah bug #41869. + +This works around a problem with HarfBuzz (<= 0.9.26), which doesn't +validate glyph indices returned by +`hb_ot_layout_lookup_collect_glyphs'. + +* src/autofit/hbshim.c (af_get_coverage): Guard `idx'. + +* docs/CHANGES: Updated. +--- +diff --git a/src/autofit/hbshim.c b/src/autofit/hbshim.c +index 11fb743..2eda8d7 100644 +--- a/src/autofit/hbshim.c ++++ b/src/autofit/hbshim.c +@@ -347,6 +347,11 @@ + count++; + #endif + ++ /* HarfBuzz 0.9.26 and older doesn't validate glyph indices */ ++ /* returned by `hb_ot_layout_lookup_collect_glyphs'... */ ++ if ( idx >= (hb_codepoint_t)globals->glyph_count ) ++ continue; ++ + if ( gstyles[idx] == AF_STYLE_UNASSIGNED ) + gstyles[idx] = (FT_Byte)style_class->style; + #ifdef FT_DEBUG_LEVEL_TRACE +-- +cgit v0.9.0.2 + diff --git a/abs/core/freetype2/freetype-2.5.1-enable-sph.patch b/abs/core/freetype2/freetype-2.5.1-enable-sph.patch new file mode 100644 index 0000000..69f73b7 --- /dev/null +++ b/abs/core/freetype2/freetype-2.5.1-enable-sph.patch @@ -0,0 +1,13 @@ +diff --git i/include/config/ftoption.h w/include/config/ftoption.h +index fe2ba15..1ab4226 100644 +--- i/include/config/ftoption.h ++++ w/include/config/ftoption.h +@@ -591,7 +591,7 @@ FT_BEGIN_HEADER + /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ + /* defined. */ + /* */ +-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */ ++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING + + + /*************************************************************************/ diff --git a/abs/core/freetype2/freetype-2.3.0-enable-spr.patch b/abs/core/freetype2/freetype-2.5.1-enable-spr.patch index 8432e28..0d300a8 100644 --- a/abs/core/freetype2/freetype-2.3.0-enable-spr.patch +++ b/abs/core/freetype2/freetype-2.5.1-enable-spr.patch @@ -1,6 +1,8 @@ ---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 -+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 -@@ -92,7 +92,7 @@ +diff --git i/include/config/ftoption.h w/include/config/ftoption.h +index fe2ba15..22ce1a3 100644 +--- i/include/config/ftoption.h ++++ w/include/config/ftoption.h +@@ -92,7 +92,7 @@ FT_BEGIN_HEADER /* This is done to allow FreeType clients to run unmodified, forcing */ /* them to display normal gray-level anti-aliased glyphs. */ /* */ diff --git a/abs/core/func/PKGBUILD b/abs/core/func/PKGBUILD index 1b7b000..5ff6dd5 100644 --- a/abs/core/func/PKGBUILD +++ b/abs/core/func/PKGBUILD @@ -1,6 +1,6 @@ pkgname=func pkgver=0.25 -pkgrel=17 +pkgrel=19 pkgdesc="fedora unifed network controller" url="" license="gpl" @@ -42,6 +42,6 @@ md5sums=('892252004f122c61bb58bb4607553ffe' '32cc4d15a3083b518d9f645b656cc273' 'c30f420c01628a08061270e8502115c5' 'b02a733b7a74569e57521bc3708724a5' - '7b4266a8031cf7de485bf6b74e57bd74' + '7d2a049f8f764ea46508f523152c3b5b' 'b816bdb222e646a7801b218c3a626b0e' '7d7c8a334f6b46ae1e5e483854b93924') diff --git a/abs/core/func/msg.py b/abs/core/func/msg.py index e776b69..0940382 100644 --- a/abs/core/func/msg.py +++ b/abs/core/func/msg.py @@ -29,11 +29,11 @@ class msg(func_module.FuncModule): except: text=flags config_section="default" - text=flags - cmd = sub_process.Popen("/usr/LH/bin/msg_client.py --msg \"%s\" " % text,stdout=sub_process.PIPE,shell=True) + + cmd = sub_process.Popen("/usr/LH/bin/msg_client.py --msg \"%s\" " % flags,stdout=sub_process.PIPE,shell=True) data = cmd.communicate()[0] - cmd = sub_process.Popen("/usr/bin/wall %s" % text,stdout=sub_process.PIPE,shell=True) + cmd = sub_process.Popen("/usr/bin/echo -e \"%s\" | /usr/bin/wall" % text, stdout=sub_process.PIPE,shell=True) data = cmd.communicate()[0] return ("Message delivered") diff --git a/abs/core/gdk-pixbuf/PKGBUILD b/abs/core/gdk-pixbuf/PKGBUILD index 7b0059d..e569b29 100644 --- a/abs/core/gdk-pixbuf/PKGBUILD +++ b/abs/core/gdk-pixbuf/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 66703 2012-02-27 17:09:51Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# $Id: PKGBUILD 99752 2013-10-30 23:29:49Z allan $ +# Maintainer: Brian Bidulock <bidulock@openss7.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=gdk-pixbuf pkgver=0.22.0 -pkgrel=9 +pkgrel=12 pkgdesc="Image loading and manipulation library" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('GPL' 'LGPL') depends=('gtk' 'libtiff' 'libpng') makedepends=('libxt') -options=('!libtool') source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.22/${pkgname}-${pkgver}.tar.bz2 gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch gdk-pixbuf-0.22.0-bmp_secure.patch @@ -34,10 +34,18 @@ build() { patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch patch -Np1 -i ${srcdir}/libpng15.patch + sed -i \ + -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|' \ + -e 's|AM_PROG_CC_STDC|AC_PROG_CC|' \ + configure.in libtoolize --force --copy --automake autoreconf --force --install ./configure --prefix=/usr --disable-gtk-doc make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/usr/share/gnome } diff --git a/abs/core/gdk-pixbuf2/PKGBUILD b/abs/core/gdk-pixbuf2/PKGBUILD index d281834..ad535fc 100644 --- a/abs/core/gdk-pixbuf2/PKGBUILD +++ b/abs/core/gdk-pixbuf2/PKGBUILD @@ -1,32 +1,31 @@ -# $Id: PKGBUILD 156774 2012-04-23 09:05:18Z ibiru $ +# $Id$ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gdk-pixbuf2 -pkgver=2.26.1 -pkgrel=1 +pkgver=2.31.1 +pkgrel=2 pkgdesc="An image loading library" arch=('i686' 'x86_64') url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11') +license=('LGPL2.1') +depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11' 'jasper') makedepends=('gtk-doc' 'gobject-introspection') -options=('!libtool') install=gdk-pixbuf2.install -source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba') +source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver:0:4}/gdk-pixbuf-$pkgver.tar.xz) +sha256sums=('25a75e3c61dac11e6ff6416ad846951ccafac6486b1c6a1bfb0b213b99db52cd') build() { - cd "gdk-pixbuf-$pkgver" + cd gdk-pixbuf-$pkgver ./configure --prefix=/usr \ - --without-libjasper \ --with-x11 \ + --with-libjasper \ --with-included-loaders=png make } package() { - cd "gdk-pixbuf-$pkgver" + cd gdk-pixbuf-$pkgver make DESTDIR="$pkgdir" install } diff --git a/abs/core/ghostscript/PKGBUILD b/abs/core/ghostscript/PKGBUILD index a911598..f27e992 100644 --- a/abs/core/ghostscript/PKGBUILD +++ b/abs/core/ghostscript/PKGBUILD @@ -1,26 +1,42 @@ -# $Id: PKGBUILD 149988 2012-02-12 09:04:00Z andyrtr $ +# $Id$ # Maintainer: AndyRTR <andyrtr@archlinux.org> +### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ### + pkgname=ghostscript -pkgver=9.05 +pkgver=9.15 pkgrel=1 pkgdesc="An interpreter for the PostScript language" arch=('i686' 'x86_64') -license=('GPL3' 'custom') -depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community? -makedepends=('gtk2' 'gnutls') +license=('AGPL' 'custom') +depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' + 'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper') +makedepends=('gtk3' 'gnutls') optdepends=('texlive-core: needed for dvipdf' - 'gtk2: needed for gsx') + 'gtk3: needed for gsx') url="http://www.ghostscript.com/" -source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) -options=('!libtool' '!makeflags') -md5sums=('8bcef1f33ddf8a4d12b2cf8da385c191') +source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2 + ghostscript-sys-zlib.patch) +#options=('!makeflags') +# http://downloads.ghostscript.com/public/SHA1SUMS +sha1sums=('19f01538d33b9623bc6653d96ea4ec891f14a9d3' + 'e054caf753df4d67221b29a2eac66130653f7556') + +prepare() { + cd ghostscript-${pkgver} + # fix build with system zlib + patch -Np1 -i ${srcdir}/ghostscript-sys-zlib.patch +} build() { - cd ${srcdir}/ghostscript-${pkgver} + cd ghostscript-${pkgver} # force it to use system-libs - rm -rf jpeg libpng zlib jasper expat tiff lcms freetype + # keep heavily patched included openjpeg, leads to segfault with system openjpeg + # https://bugs.archlinux.org/task/38226 + rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community + + autoconf --force ./configure --prefix=/usr \ --enable-dynamic \ @@ -30,37 +46,42 @@ build() { --with-x \ --with-drivers=ALL\ --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ - --with-install-cups \ --enable-fontconfig \ --enable-freetype \ + --enable-openjpeg \ --without-luratech \ + --without-omni \ --with-system-libtiff \ + --with-libpaper \ --disable-compile-inits #--help # needed for linking with system-zlib make # Build IJS - cd ${srcdir}/ghostscript-${pkgver}/ijs + cd ijs + sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac ./autogen.sh ./configure --prefix=/usr --enable-shared --disable-static make } package() { - cd ${srcdir}/ghostscript-${pkgver} - make DESTDIR=${pkgdir} \ - cups_serverroot=${pkgdir}/etc/cups \ - cups_serverbin=${pkgdir}/usr/lib/cups install soinstall + cd ghostscript-${pkgver} + make DESTDIR="${pkgdir}" \ + cups_serverroot="${pkgdir}"/etc/cups \ + cups_serverbin="${pkgdir}"/usr/lib/cups install install-so # install missing doc files # http://bugs.archlinux.org/task/18023 - install -m 644 ${srcdir}/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/ghostscript/$pkgver/doc/ + install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/ - mkdir -p ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/ + install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE # remove unwanted localized man-pages - rm -rf $pkgdir/usr/share/man/[^man1]* + rm -rf "$pkgdir"/usr/share/man/[^man1]* # install IJS - cd ${srcdir}/ghostscript-${pkgver}/ijs - make DESTDIR=${pkgdir} install + cd ijs + make DESTDIR="${pkgdir}" install + + # remove filters that are now maintained in cups-filters as upstream home + rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster} } diff --git a/abs/core/ghostscript/ghostscript-sys-zlib.patch b/abs/core/ghostscript/ghostscript-sys-zlib.patch new file mode 100644 index 0000000..d632fcb --- /dev/null +++ b/abs/core/ghostscript/ghostscript-sys-zlib.patch @@ -0,0 +1,25 @@ +diff -up ghostscript-9.12/configure.ac.sys-zlib ghostscript-9.12/configure.ac +--- ghostscript-9.12/configure.ac.sys-zlib 2014-03-26 11:48:54.983972222 +0000 ++++ ghostscript-9.12/configure.ac 2014-03-26 11:49:36.807230531 +0000 +@@ -854,7 +854,7 @@ AC_MSG_CHECKING([for local zlib source]) + dnl zlib is needed for language level 3, and libpng + # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) + # this seems a harmless default +-ZLIBDIR=src ++ZLIBDIR=$includedir + AUX_SHARED_ZLIB= + + if test -d $srcdir/zlib; then +diff -up ghostscript-9.12/configure.sys-zlib ghostscript-9.12/configure +--- ghostscript-9.12/configure.sys-zlib 2014-03-26 11:49:45.547284521 +0000 ++++ ghostscript-9.12/configure 2014-03-26 11:49:56.171350127 +0000 +@@ -6254,7 +6254,7 @@ fi + $as_echo_n "checking for local zlib source... " >&6; } + # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) + # this seems a harmless default +-ZLIBDIR=src ++ZLIBDIR=$includedir + AUX_SHARED_ZLIB= + + if test -d $srcdir/zlib; then + diff --git a/abs/core/ghostscript/svn_rev11948.diff b/abs/core/ghostscript/svn_rev11948.diff deleted file mode 100644 index 92abb0d..0000000 --- a/abs/core/ghostscript/svn_rev11948.diff +++ /dev/null @@ -1,16 +0,0 @@ -Modified: trunk/gs/base/gximag3x.c -=================================================================== ---- trunk/gs/base/gximag3x.c 2010-12-10 19:50:53 UTC (rev 11947) -+++ trunk/gs/base/gximag3x.c 2010-12-11 23:02:25 UTC (rev 11948) -@@ -241,7 +241,9 @@ - const gs_image3x_mask_t *pixm = - (i == 0 ? &pim->Opacity : &pim->Shape); - -- *(gs_data_image_t *)&mask[i].image = pixm->MaskDict; -+ /* Use memcpy because direct assignment breaks ANSI aliasing */ -+ /* rules and causes SEGV with gcc 4.5.1 */ -+ memcpy(&mask[i].image, &pixm->MaskDict, sizeof(pixm->MaskDict)); - mask[i].image.type = type1; - mask[i].image.BitsPerComponent = pixm->MaskDict.BitsPerComponent; - } - diff --git a/abs/core/giflib/PKGBUILD b/abs/core/giflib/PKGBUILD index d92ecb7..da553cf 100644 --- a/abs/core/giflib/PKGBUILD +++ b/abs/core/giflib/PKGBUILD @@ -1,44 +1,31 @@ -# $Id: PKGBUILD 151260 2012-02-25 10:17:00Z allan $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> # Contributor: mightyjaym <jm.ambrosino@free.fr> pkgname=giflib -pkgver=4.1.6 -pkgrel=5 +pkgver=5.1.0 +pkgrel=1 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64') license=('MIT') -depends=('libx11') -provides=("libungif=${pkgver}") -conflicts=('libungif') -replaces=('libungif') -options=('!libtool') +depends=('glibc') +makedepends=('xmlto' 'docbook-xml' 'docbook-xsl') source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7125644155ae6ad33dbc9fc15a14735f') +md5sums=('603838feeed62e9eaa90415742adddf9') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i '/AC_PATH_XTRA/d' configure.ac - libtoolize -f - autoreconf + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static make - - # libungif compatibility - instructions taken from Redhat specfile - MAJOR=`echo ${pkgver} | sed 's/\([0-9]\+\)\..*/\1/'` - gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.${pkgver} } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - install -m755 libungif.so.${pkgver} "${pkgdir}/usr/lib/" - ln -sf libungif.so.${pkgver} "${pkgdir}/usr/lib/libungif.so.4" - ln -sf libungif.so.4 "${pkgdir}/usr/lib/libungif.so" - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } +md5sums=('c7e9f1c10b755ab955156d4c1ac7fc5d') diff --git a/abs/core/glib2/PKGBUILD b/abs/core/glib2/PKGBUILD index 6617cc0..ee1ccf0 100644 --- a/abs/core/glib2/PKGBUILD +++ b/abs/core/glib2/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=glib2 pkgname=(glib2 glib2-docs) -pkgver=2.40.0 +pkgver=2.42.1 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" @@ -11,7 +11,7 @@ arch=(i686 x86_64) makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz revert-warn-glib-compile-schemas.patch) -sha256sums=('0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5' +sha256sums=('8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') prepare() { diff --git a/abs/core/gobject-introspection/PKGBUILD b/abs/core/gobject-introspection/PKGBUILD index 1d25467..9757c17 100644 --- a/abs/core/gobject-introspection/PKGBUILD +++ b/abs/core/gobject-introspection/PKGBUILD @@ -2,27 +2,31 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gobject-introspection -pkgver=1.40.0 +pkgver=1.42.0 pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="https://live.gnome.org/GObjectIntrospection" arch=('x86_64' 'i686') license=('LGPL' 'GPL') -depends=('glib2' 'python2' 'python2-mako') -makedepends=('cairo') +depends=('glib2') +makedepends=('cairo' 'python2' 'python2-mako') +optdepends=('python2: gir development tools' + 'python2-mako: g-ir-doc-tool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98') +sha256sums=('3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7') + +prepare() { + cd $pkgname-$pkgver + sed -i '1s|#!/usr/bin/env python$|&2|' giscanner/*.py +} build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static --enable-doctool make } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - - sed -i '1s|#!/usr/bin/env python$|&2|' \ - "$pkgdir"/usr/lib/gobject-introspection/giscanner/*.py } diff --git a/abs/core/gtk2/PKGBUILD b/abs/core/gtk2/PKGBUILD index 13d72a2..4949bfc 100644 --- a/abs/core/gtk2/PKGBUILD +++ b/abs/core/gtk2/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 163898 2012-07-21 19:20:18Z ibiru $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.11 +pkgver=2.24.25 pkgrel=1 arch=('i686' 'x86_64') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' - 'shared-mime-info' 'cairo' 'gdk-pixbuf2' 'gobject-introspection') -options=('!libtool') + 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection' 'python2') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz - xid-collision-debug.patch) -sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9' + gtkrc xid-collision-debug.patch) +sha256sums=('38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3' + 'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') +prepare() { + cd gtk+-$pkgver + patch -Np1 -i ../xid-collision-debug.patch +} + build() { - cd "$srcdir/gtk+-$pkgver" - patch -Np1 -i "$srcdir/xid-collision-debug.patch" + cd gtk+-$pkgver CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -34,23 +38,27 @@ build() { package_gtk2() { pkgdesc="GTK+ is a multi-platform toolkit (v2)" install=gtk2.install - depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'gtk-update-icon-cache') - backup=(etc/gtk-2.0/gtkrc) + depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' + 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') + optdepends=('gnome-themes-standard: Default widget theme' + 'gnome-icon-theme: Default icon theme') replaces=('gtk2-docs') - cd "$srcdir/gtk+-$pkgver" - + cd gtk+-$pkgver make DESTDIR="$pkgdir" install + sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert - echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc" + + install -Dm644 "$srcdir/gtkrc" "$pkgdir/usr/share/gtk-2.0/gtkrc" + #split this out to use with gtk3 too rm $pkgdir/usr/bin/gtk-update-icon-cache } package_gtk-update-icon-cache() { pkgdesc="The GTK+ update icon cache tool" - depends=('gdk-pixbuf2>=2.24.1-3') - - cd "$srcdir/gtk+-$pkgver/gtk" + depends=('gdk-pixbuf2>=2.24.1-3' 'hicolor-icon-theme') + install=gtk-update-icon-cache.install - install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache + cd gtk+-$pkgver/gtk + install -D -m755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache" } diff --git a/abs/core/gtk2/gtk-update-icon-cache.install b/abs/core/gtk2/gtk-update-icon-cache.install new file mode 100644 index 0000000..1afcc72 --- /dev/null +++ b/abs/core/gtk2/gtk-update-icon-cache.install @@ -0,0 +1,3 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} diff --git a/abs/core/gtk2/gtk2.install b/abs/core/gtk2/gtk2.install index a988c64..f14e648 100644 --- a/abs/core/gtk2/gtk2.install +++ b/abs/core/gtk2/gtk2.install @@ -1,16 +1,17 @@ post_install() { - gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + /usr/bin/gtk-query-immodules-2.0 --update-cache } pre_upgrade() { - pre_remove + if (( $(vercmp $2 2.24.20) < 0 )); then + rm -f /etc/gtk-2.0/gtk.immodules + fi } post_upgrade() { - post_install + post_install } pre_remove() { - rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null - rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null + rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache } diff --git a/abs/core/gtk2/gtkrc b/abs/core/gtk2/gtkrc new file mode 100644 index 0000000..d2282ac --- /dev/null +++ b/abs/core/gtk2/gtkrc @@ -0,0 +1,3 @@ +gtk-icon-theme-name = "gnome" +gtk-theme-name = "Adwaita" +gtk-font-name = "Cantarell 11" diff --git a/abs/core/hdparm/PKGBUILD b/abs/core/hdparm/PKGBUILD index 044ae24..e4c3fe4 100644 --- a/abs/core/hdparm/PKGBUILD +++ b/abs/core/hdparm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186146 2013-05-21 09:12:32Z tpowa $ +# $Id$ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hdparm -pkgver=9.43 -pkgrel=2 +pkgver=9.45 +pkgrel=1 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters" arch=(i686 x86_64) depends=('glibc') @@ -14,6 +14,8 @@ license=('BSD') url="http://sourceforge.net/projects/hdparm/" optdepends=('bash: for wiper.sh script') options=('emptydirs') +md5sums=('1c75d0751a44928b6c4bc81fb16d7fe8' + '74e368f384166a7710b447573cda120a') prepare() { cd ${srcdir}/${pkgname}-${pkgver} @@ -40,5 +42,3 @@ package() { #install license file install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT } -md5sums=('f73233be118d86c779a8463d8b6a3cdb' - '74e368f384166a7710b447573cda120a') diff --git a/abs/core/imagemagick/PKGBUILD b/abs/core/imagemagick/PKGBUILD index e2426fc..4080a3b 100644 --- a/abs/core/imagemagick/PKGBUILD +++ b/abs/core/imagemagick/PKGBUILD @@ -1,82 +1,90 @@ -# $Id: PKGBUILD 163750 2012-07-19 04:55:07Z eric $ +# $Id$ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.8.7 +pkgver=6.9.0.0 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" license=('custom') -makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ - 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') -source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ +makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' + 'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2' + 'opencl-headers' 'libcl' 'libwebp' 'subversion') +#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} +source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} perlmagick.rpath.patch) +sha1sums=('6bf4263ceaeea61e00fe15a95db320d49bcc48c4' + 'SKIP' + 'e143cf9d530fabf3b58023899b5cc544ba93daec') -build() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - +prepare() { + cd ImageMagick-${pkgver%.*}-${pkgver##*.} sed '/AC_PATH_XTRA/d' -i configure.ac - autoreconf --install - patch -p0 -i ../perlmagick.rpath.patch + autoreconf --force --install + patch -p0 -i "${srcdir}/perlmagick.rpath.patch" +} + +build() { + cd ImageMagick-${pkgver%.*}-${pkgver##*.} + [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686" + [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64" - ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ - --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ - --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr \ - --without-gvc --without-djvu --without-autotrace --without-webp \ - --without-jbig --without-fpx --without-dps --without-fftw + ./configure --prefix=/usr --sysconfdir=/etc --with-modules \ + --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 \ + --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ + --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \ + --enable-opencl --with-openjp2 --without-gvc --without-djvu --without-autotrace \ + --without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS make } check() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make check + cd ImageMagick-${pkgver%.*}-${pkgver##*.} +# make check } package_imagemagick() { pkgdesc="An image viewing/manipulation program" - depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') - optdepends=('ghostscript: for Ghostscript support' + depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr' 'libcl') + optdepends=('imagemagick-doc: for additional information' + 'ghostscript: for Ghostscript support' 'openexr: for OpenEXR support' + 'openjpeg2: for JP2 support' 'libwmf: for WMF support' 'librsvg: for SVG support' 'libxml2: for XML support' - 'jasper: for JPEG-2000 support' - 'libpng: for PNG support') - backup=('etc/ImageMagick/coder.xml' - 'etc/ImageMagick/colors.xml' - 'etc/ImageMagick/delegates.xml' - 'etc/ImageMagick/log.xml' - 'etc/ImageMagick/magic.xml' - 'etc/ImageMagick/mime.xml' - 'etc/ImageMagick/policy.xml' - 'etc/ImageMagick/quantization-table.xml' - 'etc/ImageMagick/thresholds.xml' - 'etc/ImageMagick/type.xml' - 'etc/ImageMagick/type-dejavu.xml' - 'etc/ImageMagick/type-ghostscript.xml' - 'etc/ImageMagick/type-windows.xml') + 'libpng: for PNG support' + 'libwebp: for WEBP support') + backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml" + "etc/ImageMagick-${pkgver%%.*}/colors.xml" + "etc/ImageMagick-${pkgver%%.*}/delegates.xml" + "etc/ImageMagick-${pkgver%%.*}/log.xml" + "etc/ImageMagick-${pkgver%%.*}/magic.xml" + "etc/ImageMagick-${pkgver%%.*}/mime.xml" + "etc/ImageMagick-${pkgver%%.*}/policy.xml" + "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml" + "etc/ImageMagick-${pkgver%%.*}/thresholds.xml" + "etc/ImageMagick-${pkgver%%.*}/type.xml" + "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml" + "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml" + "etc/ImageMagick-${pkgver%%.*}/type-windows.xml") options=('!docs' 'libtool' '!emptydirs') - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make DESTDIR="${pkgdir}" install - chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" + cd ImageMagick-${pkgver%.*}-${pkgver##*.} + make -j1 DESTDIR="${pkgdir}" install install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" #Cleaning - find "${pkgdir}" -name '*.bs' -delete rm -f "${pkgdir}"/usr/lib/*.la } package_imagemagick-doc() { pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + cd ImageMagick-${pkgver%.*}-${pkgver##*.} make DESTDIR="${pkgdir}" install-data-html install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE" install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE" } -md5sums=('c12aa1fafac9ebdca42464ba872fac86' - 'ff9974decbfe9846f8e347239d87e4eb') diff --git a/abs/core/imagemagick/perlmagick.rpath.patch b/abs/core/imagemagick/perlmagick.rpath.patch index 958c0f2..a5b1a82 100644 --- a/abs/core/imagemagick/perlmagick.rpath.patch +++ b/abs/core/imagemagick/perlmagick.rpath.patch @@ -1,10 +1,11 @@ ---- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300 -+++ Makefile.in 2009-05-26 16:23:27.000000000 -0300 -@@ -10067,6 +10067,7 @@ +--- Makefile.in.orig 2013-02-21 03:26:56.785156600 -0500 ++++ Makefile.in 2013-02-21 03:39:03.102411457 -0500 +@@ -10469,6 +10469,8 @@ - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER) @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile ++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE) + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ diff --git a/abs/core/imlib2/PKGBUILD b/abs/core/imlib2/PKGBUILD index 1918169..1a24157 100644 --- a/abs/core/imlib2/PKGBUILD +++ b/abs/core/imlib2/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 148788 2012-02-05 11:50:31Z ibiru $ +# $Id$ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Arjan Timmerman <arjan.archlinux.org> # Contributor: Tom Newsom <Jeepster.gmx.co.uk> pkgname=imlib2 -pkgver=1.4.5 -pkgrel=2 +pkgver=1.4.6 +pkgrel=3 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch=('i686' 'x86_64') license=('BSD') depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo') -options=('!libtool') -source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2") -sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0') +source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2 + imlib2-giflib51.patch) +sha1sums=('20e111d822074593e8d657ecf8aafe504e9e2967' + '3ee249142b4caecc4a38ac29a999708447f250c1') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../imlib2-giflib51.patch + sed -i 's/@my_libs@//' imlib2-config.in +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver - # disable optimizations, they cause problems (e.g. FS#12268) - [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx" - [ $CARCH = "x86_64" ] && EXTRAOPTS="--disable-amd64" + [ $CARCH = "i686" ] && EXTRAOPTS="--enable-mmx" + [ $CARCH = "x86_64" ] && EXTRAOPTS="--enable-amd64" - # Configure and Build ./configure --prefix=/usr \ --sysconfdir=/etc/imlib2 \ --x-libraries=/usr/lib $EXTRAOPTS @@ -30,7 +35,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install # Install License diff --git a/abs/core/imlib2/imlib2-giflib51.patch b/abs/core/imlib2/imlib2-giflib51.patch new file mode 100644 index 0000000..1bd8627 --- /dev/null +++ b/abs/core/imlib2/imlib2-giflib51.patch @@ -0,0 +1,64 @@ +diff -ruN imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c imlib2-1.4.6/src/modules/loaders/loader_gif.c +--- imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c 2013-12-21 10:16:10.000000000 +0000 ++++ imlib2-1.4.6/src/modules/loaders/loader_gif.c 2014-05-27 09:52:35.857291512 +0000 +@@ -36,7 +36,7 @@ + #endif + if (fd < 0) + return 0; +- gif = DGifOpenFileHandle(fd); ++ gif = DGifOpenFileHandle(fd, NULL); + if (!gif) + { + close(fd); +@@ -60,13 +60,13 @@ + h = gif->Image.Height; + if (!IMAGE_DIMENSIONS_OK(w, h)) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + return 0; + } + rows = malloc(h * sizeof(GifRowType *)); + if (!rows) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + return 0; + } + for (i = 0; i < h; i++) +@@ -78,7 +78,7 @@ + rows[i] = malloc(w * sizeof(GifPixelType)); + if (!rows[i]) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + if (rows[i]) +@@ -150,7 +150,7 @@ + im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h); + if (!im->data) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + free(rows); + return 0; + } +@@ -181,7 +181,7 @@ + last_per = (int)per; + if (!(progress(im, (int)per, 0, last_y, w, i))) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + free(rows[i]); +@@ -198,7 +198,7 @@ + { + progress(im, 100, 0, last_y, w, h); + } +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + free(rows[i]); diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD index 370c5f4..ca5b4c1 100644 --- a/abs/core/initscripts/PKGBUILD +++ b/abs/core/initscripts/PKGBUILD @@ -5,7 +5,7 @@ pkgname=initscripts pkgver=2014.03.1 -pkgrel=1 +pkgrel=2 pkgdesc="Maintained fork of system initialization/bootup scripts" arch=('any') url="https://bitbucket.org/TZ86/initscripts-fork/overview" @@ -14,7 +14,7 @@ provides=('initscripts-systemd') conflicts=('initscripts-systemd') replaces=('initscripts-systemd') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown) -depends=('glibc' 'bash' 'coreutils' 'iproute2' 'ncurses' 'findutils' 'procps-ng' 'kbd') +depends=('glibc' 'bash' 'coreutils' 'iproute2' 'ncurses' 'findutils' 'procps-ng' 'kbd' 'bootlogd') optdepends=('dhcpcd: DHCP network configuration' 'bridge-utils: Network bridging support' 'net-tools: Network support' @@ -34,8 +34,6 @@ package() { #comment out some rc.conf options sed -i 's/NETWORK_PERSIST=/#NETWORK_PERSIST=/g' ${pkgdir}/etc/rc.conf sed -i 's/DAEMONS=/#DAEMONS=/g' ${pkgdir}/etc/rc.conf - #don't use bootlogd - sed -i 's/bootlogd /#bootlogd /g' ${pkgdir}/etc/rc.sysinit } # vim:set ts=2 sw=2 et: diff --git a/abs/core/initscripts/__changelog b/abs/core/initscripts/__changelog index f6b268d..6fe0a05 100644 --- a/abs/core/initscripts/__changelog +++ b/abs/core/initscripts/__changelog @@ -3,4 +3,4 @@ - PKGBUILD: removed initscripts from provides, conflicts, replaces - PKGBUILD: remove dep sysvinit - PKGBUILD: comment out of rc.conf NETWORK_PERSIST= and DAEMONS= -- PKGBUILD: comment out of rc.sysinit starting bootlogd +- PKGBUILD: add dep bootlogd diff --git a/abs/core/iproute2/PKGBUILD b/abs/core/iproute2/PKGBUILD index 04ca6df..e1f1683 100644 --- a/abs/core/iproute2/PKGBUILD +++ b/abs/core/iproute2/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 199763 2013-11-15 21:24:40Z ronald $ +# $Id$ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=3.11.0 +pkgver=3.17.0 pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" -depends=('glibc' 'db' 'iptables') -makedepends=('linux-atm') +depends=('glibc' 'iptables') +makedepends=('linux-atm' 'git') optdepends=('linux-atm: ATM support') groups=('base') provides=('iproute') @@ -19,15 +19,16 @@ replaces=('iproute') options=('staticlibs' '!makeflags') backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') -source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz +#source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz +source=(git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git#tag=v$pkgver iproute2-fhs.patch - unwanted-link-help.patch) -sha1sums=('efb5ca0688e28967ec146ac37cc728c4f53c9d8f' + unwanted-link-help.patch) +sha1sums=('SKIP' '35b8cf2dc94b73eccad427235c07596146cd6f6c' '3b1335f4025f657f388fbf4e5a740871e3129c2a') prepare() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname" # set correct fhs structure patch -Np1 -i "$srcdir/iproute2-fhs.patch" @@ -40,14 +41,14 @@ prepare() { } build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname" ./configure make } package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname" make DESTDIR="$pkgdir" install diff --git a/abs/core/iptables/0503-extension_cppflags.patch b/abs/core/iptables/0503-extension_cppflags.patch deleted file mode 100644 index 0eb6457..0000000 --- a/abs/core/iptables/0503-extension_cppflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/extensions/GNUmakefile.in -=================================================================== ---- a/extensions/GNUmakefile.in 2012-03-27 12:14:05.000000000 -0400 -+++ b/extensions/GNUmakefile.in 2012-03-27 16:03:48.378790221 -0400 -@@ -21,7 +21,7 @@ - kinclude_CPPFLAGS = @kinclude_CPPFLAGS@ - - AM_CFLAGS = ${regular_CFLAGS} --AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} -+AM_CPPFLAGS = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} - AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ - AM_LDFLAGS = @noundef_LDFLAGS@ - diff --git a/abs/core/iptables/PKGBUILD b/abs/core/iptables/PKGBUILD index 0c65bd1..65fd20e 100644 --- a/abs/core/iptables/PKGBUILD +++ b/abs/core/iptables/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 199764 2013-11-15 21:24:41Z ronald $ +# $Id$ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.20 +pkgver=1.4.21 pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') @@ -20,11 +20,10 @@ source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-nat.rules empty-raw.rules empty-security.rules - 0503-extension_cppflags.patch iptables.service ip6tables.service iptables-flush) -sha1sums=('7219b32657e9f794ff1b5a2476363c59f9c2175c' +sha1sums=('85d4160537546a23a7e42bc26dd7ee62a0ede4c8' 'SKIP' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' 'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec' @@ -33,18 +32,19 @@ sha1sums=('7219b32657e9f794ff1b5a2476363c59f9c2175c' '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' - '44626980a52e49f345a0b1e1ca03060f3a35763c' '9306cba67dbeaa004af084a816f66920a6a10faf' '38fa2ffe7965e63b494d333f69193029c1258c28' 'e7abda09c61142121b6695928d3b71ccd8fdf73a') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" # use system one rm include/linux/types.h +} - patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ diff --git a/abs/core/isl/PKGBUILD b/abs/core/isl/PKGBUILD index 2aa5e21..0ca728b 100644 --- a/abs/core/isl/PKGBUILD +++ b/abs/core/isl/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 162067 2012-06-19 12:27:31Z allan $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=isl -pkgver=0.10 +pkgver=0.13 pkgrel=1 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" arch=('i686' 'x86_64') -url="http://www.kotnet.org/~skimo/isl/" -license=('LGPL2.1') -options=('!libtool') -source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) -md5sums=('c1ece653891bb2a5f55ca25e3f4e8f35') +url="http://freecode.com/projects/isl" +depends=('gmp') +license=('MIT') +source=(http://isl.gforge.inria.fr/$pkgname-$pkgver.tar.bz2) +md5sums=('e4cf20c4c10d5d613457558b1f46b5e2') + build() { cd "$srcdir/$pkgname-$pkgver" @@ -25,8 +26,10 @@ check() { package() { cd "$srcdir/$pkgname-$pkgver" - make -j1 DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir/" install install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/ - mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.0.0-gdb.py + mv $pkgdir/usr/lib/libisl.so.*-gdb.py $pkgdir/usr/share/gdb/auto-load/usr/lib/ + + install -Dm644 LICENSE $pkgdir/usr/share/licenses/isl/LICENSE } diff --git a/abs/core/lcms2/PKGBUILD b/abs/core/lcms2/PKGBUILD index e601882..4ccb712 100644 --- a/abs/core/lcms2/PKGBUILD +++ b/abs/core/lcms2/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 148812 2012-02-05 11:51:30Z ibiru $ +# $Id$ # Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=lcms2 -pkgver=2.3 -pkgrel=2 +pkgver=2.6 +pkgrel=1 pkgdesc="Small-footprint color management engine, version 2" arch=('i686' 'x86_64') +url="http://www.littlecms.com" license=('MIT') depends=('libtiff') -url="http://www.littlecms.com" -options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz) -sha1sums=('67d5fabda2f5777ca8387766539b9c871d993133') +sha1sums=('b0ecee5cb8391338e6c281d1c11dcae2bc22a5d2') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } +check() { + cd ${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/core/libarchive/0001-Limit-write-requests-to-at-most-INT_MAX.patch b/abs/core/libarchive/0001-Limit-write-requests-to-at-most-INT_MAX.patch new file mode 100644 index 0000000..c805ce1 --- /dev/null +++ b/abs/core/libarchive/0001-Limit-write-requests-to-at-most-INT_MAX.patch @@ -0,0 +1,32 @@ +From 22531545514043e04633e1c015c7540b9de9dbe4 Mon Sep 17 00:00:00 2001 +From: Tim Kientzle <kientzle@acm.org> +Date: Fri, 22 Mar 2013 23:48:41 -0700 +Subject: [PATCH] Limit write requests to at most INT_MAX. This prevents a + certain common programming error (passing -1 to write) from leading to other + problems deeper in the library. + +--- + libarchive/archive_write.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c +index eede5e0..be85621 100644 +--- a/libarchive/archive_write.c ++++ b/libarchive/archive_write.c +@@ -673,8 +673,13 @@ static ssize_t + _archive_write_data(struct archive *_a, const void *buff, size_t s) + { + struct archive_write *a = (struct archive_write *)_a; ++ const size_t max_write = INT_MAX; ++ + archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC, + ARCHIVE_STATE_DATA, "archive_write_data"); ++ /* In particular, this catches attempts to pass negative values. */ ++ if (s > max_write) ++ s = max_write; + archive_clear_error(&a->archive); + return ((a->format_write_data)(a, buff, s)); + } +-- +1.9.0 + diff --git a/abs/core/libarchive/PKGBUILD b/abs/core/libarchive/PKGBUILD index 182ea71..3b1540f 100644 --- a/abs/core/libarchive/PKGBUILD +++ b/abs/core/libarchive/PKGBUILD @@ -3,21 +3,26 @@ pkgname=libarchive pkgver=3.1.2 -pkgrel=3 +pkgrel=8 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64') url="http://libarchive.org/" license=('BSD') -depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib' 'nettle') +depends=('acl' 'attr' 'bzip2' 'expat' 'lzo' 'nettle' 'openssl' 'xz' 'zlib') +options=('strip' 'debug' 'libtool') provides=('libarchive.so') source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz" '0001-mtree-fix-line-filename-length-calculation.patch' - 'libarchive-3.1.2-acl.patch') + '0001-Limit-write-requests-to-at-most-INT_MAX.patch' + 'libarchive-3.1.2-acl.patch' + 'libarchive-3.1.2-sparce-mtree.patch') md5sums=('efad5a503f66329bb9d2f4308b5de98a' 'fda89c145bbcd793a96b06b463ef6a72' - 'a5c995661c62429ceff2c23ea322393b') + '9bf80940bd3ce861137a0a8dcacf5705' + 'a5c995661c62429ceff2c23ea322393b' + 'cb344a879b3c4550fe3faf86c3826f23') -build() { +prepare() { cd "$pkgname-$pkgver" # https://code.google.com/p/libarchive/issues/detail?id=301 @@ -27,6 +32,15 @@ build() { # https://code.google.com/p/libarchive/issues/detail?id=329 patch -Np1 -i "$srcdir/libarchive-3.1.2-acl.patch" + # CVE-2013-0211 + patch -Np1 -i "$srcdir/0001-Limit-write-requests-to-at-most-INT_MAX.patch" + + # upstream commit 977bf2a4 - improved mtree support + patch -p1 -i $srcdir/libarchive-3.1.2-sparce-mtree.patch +} + +build() { + cd "$pkgname-$pkgver" ./configure --prefix=/usr --without-xml2 make } diff --git a/abs/core/libarchive/libarchive-3.1.2-sparce-mtree.patch b/abs/core/libarchive/libarchive-3.1.2-sparce-mtree.patch new file mode 100644 index 0000000..7b40277 --- /dev/null +++ b/abs/core/libarchive/libarchive-3.1.2-sparce-mtree.patch @@ -0,0 +1,478 @@ +From 977bf2a49484239f7a7b6ce08bfa9da413a27ead Mon Sep 17 00:00:00 2001 +From: Florian Pritz <bluewind@xinu.at> +Date: Sat, 1 Mar 2014 17:21:47 +0100 +Subject: [PATCH] mtree: Make reading additional information from the fs + optional + +This feature is not needed if users just want to read in the content of +an mtree file and do validation against the file system themselves. + +It is needed for `bsdtar cvf out.tar @input.mtree` which is why the +option is enabled in bsdtar. + +Since the mtree tests rely on this feature, this patch also enables it +there. + +Signed-off-by: Florian Pritz <bluewind@xinu.at> +--- + libarchive/archive_read_support_format_mtree.c | 290 ++++++++++++++----------- + libarchive/test/test_read_format_mtree.c | 20 ++ + tar/write.c | 1 + + 3 files changed, 179 insertions(+), 132 deletions(-) + +diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c +index 44799df..d82d4c1 100644 +--- a/libarchive/archive_read_support_format_mtree.c ++++ b/libarchive/archive_read_support_format_mtree.c +@@ -104,6 +104,7 @@ struct mtree { + struct archive_entry_linkresolver *resolver; + + int64_t cur_size; ++ char checkfs; + }; + + static int bid_keycmp(const char *, const char *, ssize_t); +@@ -174,6 +175,29 @@ static int read_header(struct archive_read *, + #endif + } + ++static int ++archive_read_format_mtree_options(struct archive_read *a, ++ const char *key, const char *val) ++{ ++ struct mtree *mtree; ++ ++ mtree = (struct mtree *)(a->format->data); ++ if (strcmp(key, "checkfs") == 0) { ++ /* Allows to read information missing from the mtree from the file system */ ++ if (val == NULL || val[0] == 0) { ++ mtree->checkfs = 0; ++ } else { ++ mtree->checkfs = 1; ++ } ++ return (ARCHIVE_OK); ++ } ++ ++ /* Note: The "warn" return is just to inform the options ++ * supervisor that we didn't handle it. It will generate ++ * a suitable error if no one used this option. */ ++ return (ARCHIVE_WARN); ++} ++ + static void + free_options(struct mtree_option *head) + { +@@ -206,7 +230,7 @@ static int read_header(struct archive_read *, + mtree->fd = -1; + + r = __archive_read_register_format(a, mtree, "mtree", +- mtree_bid, NULL, read_header, read_data, skip, NULL, cleanup); ++ mtree_bid, archive_read_format_mtree_options, read_header, read_data, skip, NULL, cleanup); + + if (r != ARCHIVE_OK) + free(mtree); +@@ -1104,162 +1128,164 @@ static int read_header(struct archive_read *, + mtree->current_dir.length = n; + } + +- /* +- * Try to open and stat the file to get the real size +- * and other file info. It would be nice to avoid +- * this here so that getting a listing of an mtree +- * wouldn't require opening every referenced contents +- * file. But then we wouldn't know the actual +- * contents size, so I don't see a really viable way +- * around this. (Also, we may want to someday pull +- * other unspecified info from the contents file on +- * disk.) +- */ +- mtree->fd = -1; +- if (archive_strlen(&mtree->contents_name) > 0) +- path = mtree->contents_name.s; +- else +- path = archive_entry_pathname(entry); +- +- if (archive_entry_filetype(entry) == AE_IFREG || +- archive_entry_filetype(entry) == AE_IFDIR) { +- mtree->fd = open(path, O_RDONLY | O_BINARY | O_CLOEXEC); +- __archive_ensure_cloexec_flag(mtree->fd); +- if (mtree->fd == -1 && +- (errno != ENOENT || +- archive_strlen(&mtree->contents_name) > 0)) { +- archive_set_error(&a->archive, errno, +- "Can't open %s", path); +- r = ARCHIVE_WARN; ++ if (mtree->checkfs) { ++ /* ++ * Try to open and stat the file to get the real size ++ * and other file info. It would be nice to avoid ++ * this here so that getting a listing of an mtree ++ * wouldn't require opening every referenced contents ++ * file. But then we wouldn't know the actual ++ * contents size, so I don't see a really viable way ++ * around this. (Also, we may want to someday pull ++ * other unspecified info from the contents file on ++ * disk.) ++ */ ++ mtree->fd = -1; ++ if (archive_strlen(&mtree->contents_name) > 0) ++ path = mtree->contents_name.s; ++ else ++ path = archive_entry_pathname(entry); ++ ++ if (archive_entry_filetype(entry) == AE_IFREG || ++ archive_entry_filetype(entry) == AE_IFDIR) { ++ mtree->fd = open(path, O_RDONLY | O_BINARY | O_CLOEXEC); ++ __archive_ensure_cloexec_flag(mtree->fd); ++ if (mtree->fd == -1 && ++ (errno != ENOENT || ++ archive_strlen(&mtree->contents_name) > 0)) { ++ archive_set_error(&a->archive, errno, ++ "Can't open %s", path); ++ r = ARCHIVE_WARN; ++ } + } +- } + +- st = &st_storage; +- if (mtree->fd >= 0) { +- if (fstat(mtree->fd, st) == -1) { +- archive_set_error(&a->archive, errno, +- "Could not fstat %s", path); +- r = ARCHIVE_WARN; +- /* If we can't stat it, don't keep it open. */ +- close(mtree->fd); +- mtree->fd = -1; ++ st = &st_storage; ++ if (mtree->fd >= 0) { ++ if (fstat(mtree->fd, st) == -1) { ++ archive_set_error(&a->archive, errno, ++ "Could not fstat %s", path); ++ r = ARCHIVE_WARN; ++ /* If we can't stat it, don't keep it open. */ ++ close(mtree->fd); ++ mtree->fd = -1; ++ st = NULL; ++ } ++ } else if (lstat(path, st) == -1) { + st = NULL; + } +- } else if (lstat(path, st) == -1) { +- st = NULL; +- } + +- /* +- * Check for a mismatch between the type in the specification and +- * the type of the contents object on disk. +- */ +- if (st != NULL) { +- if ( +- ((st->st_mode & S_IFMT) == S_IFREG && +- archive_entry_filetype(entry) == AE_IFREG) ++ /* ++ * Check for a mismatch between the type in the specification and ++ * the type of the contents object on disk. ++ */ ++ if (st != NULL) { ++ if ( ++ ((st->st_mode & S_IFMT) == S_IFREG && ++ archive_entry_filetype(entry) == AE_IFREG) + #ifdef S_IFLNK +- || ((st->st_mode & S_IFMT) == S_IFLNK && +- archive_entry_filetype(entry) == AE_IFLNK) ++ || ((st->st_mode & S_IFMT) == S_IFLNK && ++ archive_entry_filetype(entry) == AE_IFLNK) + #endif + #ifdef S_IFSOCK +- || ((st->st_mode & S_IFSOCK) == S_IFSOCK && +- archive_entry_filetype(entry) == AE_IFSOCK) ++ || ((st->st_mode & S_IFSOCK) == S_IFSOCK && ++ archive_entry_filetype(entry) == AE_IFSOCK) + #endif + #ifdef S_IFCHR +- || ((st->st_mode & S_IFMT) == S_IFCHR && +- archive_entry_filetype(entry) == AE_IFCHR) ++ || ((st->st_mode & S_IFMT) == S_IFCHR && ++ archive_entry_filetype(entry) == AE_IFCHR) + #endif + #ifdef S_IFBLK +- || ((st->st_mode & S_IFMT) == S_IFBLK && +- archive_entry_filetype(entry) == AE_IFBLK) ++ || ((st->st_mode & S_IFMT) == S_IFBLK && ++ archive_entry_filetype(entry) == AE_IFBLK) + #endif +- || ((st->st_mode & S_IFMT) == S_IFDIR && +- archive_entry_filetype(entry) == AE_IFDIR) ++ || ((st->st_mode & S_IFMT) == S_IFDIR && ++ archive_entry_filetype(entry) == AE_IFDIR) + #ifdef S_IFIFO +- || ((st->st_mode & S_IFMT) == S_IFIFO && +- archive_entry_filetype(entry) == AE_IFIFO) ++ || ((st->st_mode & S_IFMT) == S_IFIFO && ++ archive_entry_filetype(entry) == AE_IFIFO) + #endif +- ) { +- /* Types match. */ +- } else { +- /* Types don't match; bail out gracefully. */ +- if (mtree->fd >= 0) +- close(mtree->fd); +- mtree->fd = -1; +- if (parsed_kws & MTREE_HAS_OPTIONAL) { +- /* It's not an error for an optional entry +- to not match disk. */ +- *use_next = 1; +- } else if (r == ARCHIVE_OK) { +- archive_set_error(&a->archive, +- ARCHIVE_ERRNO_MISC, +- "mtree specification has different type for %s", +- archive_entry_pathname(entry)); +- r = ARCHIVE_WARN; +- } +- return r; ++ ) { ++ /* Types match. */ ++ } else { ++ /* Types don't match; bail out gracefully. */ ++ if (mtree->fd >= 0) ++ close(mtree->fd); ++ mtree->fd = -1; ++ if (parsed_kws & MTREE_HAS_OPTIONAL) { ++ /* It's not an error for an optional entry ++ to not match disk. */ ++ *use_next = 1; ++ } else if (r == ARCHIVE_OK) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_MISC, ++ "mtree specification has different type for %s", ++ archive_entry_pathname(entry)); ++ r = ARCHIVE_WARN; ++ } ++ return r; ++ } + } +- } + +- /* +- * If there is a contents file on disk, pick some of the metadata +- * from that file. For most of these, we only set it from the contents +- * if it wasn't already parsed from the specification. +- */ +- if (st != NULL) { +- if (((parsed_kws & MTREE_HAS_DEVICE) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) && +- (archive_entry_filetype(entry) == AE_IFCHR || +- archive_entry_filetype(entry) == AE_IFBLK)) +- archive_entry_set_rdev(entry, st->st_rdev); +- if ((parsed_kws & (MTREE_HAS_GID | MTREE_HAS_GNAME)) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) +- archive_entry_set_gid(entry, st->st_gid); +- if ((parsed_kws & (MTREE_HAS_UID | MTREE_HAS_UNAME)) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) +- archive_entry_set_uid(entry, st->st_uid); +- if ((parsed_kws & MTREE_HAS_MTIME) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) { ++ /* ++ * If there is a contents file on disk, pick some of the metadata ++ * from that file. For most of these, we only set it from the contents ++ * if it wasn't already parsed from the specification. ++ */ ++ if (st != NULL) { ++ if (((parsed_kws & MTREE_HAS_DEVICE) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) && ++ (archive_entry_filetype(entry) == AE_IFCHR || ++ archive_entry_filetype(entry) == AE_IFBLK)) ++ archive_entry_set_rdev(entry, st->st_rdev); ++ if ((parsed_kws & (MTREE_HAS_GID | MTREE_HAS_GNAME)) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) ++ archive_entry_set_gid(entry, st->st_gid); ++ if ((parsed_kws & (MTREE_HAS_UID | MTREE_HAS_UNAME)) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) ++ archive_entry_set_uid(entry, st->st_uid); ++ if ((parsed_kws & MTREE_HAS_MTIME) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) { + #if HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC +- archive_entry_set_mtime(entry, st->st_mtime, +- st->st_mtimespec.tv_nsec); ++ archive_entry_set_mtime(entry, st->st_mtime, ++ st->st_mtimespec.tv_nsec); + #elif HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC +- archive_entry_set_mtime(entry, st->st_mtime, +- st->st_mtim.tv_nsec); ++ archive_entry_set_mtime(entry, st->st_mtime, ++ st->st_mtim.tv_nsec); + #elif HAVE_STRUCT_STAT_ST_MTIME_N +- archive_entry_set_mtime(entry, st->st_mtime, +- st->st_mtime_n); ++ archive_entry_set_mtime(entry, st->st_mtime, ++ st->st_mtime_n); + #elif HAVE_STRUCT_STAT_ST_UMTIME +- archive_entry_set_mtime(entry, st->st_mtime, +- st->st_umtime*1000); ++ archive_entry_set_mtime(entry, st->st_mtime, ++ st->st_umtime*1000); + #elif HAVE_STRUCT_STAT_ST_MTIME_USEC +- archive_entry_set_mtime(entry, st->st_mtime, +- st->st_mtime_usec*1000); ++ archive_entry_set_mtime(entry, st->st_mtime, ++ st->st_mtime_usec*1000); + #else +- archive_entry_set_mtime(entry, st->st_mtime, 0); ++ archive_entry_set_mtime(entry, st->st_mtime, 0); + #endif ++ } ++ if ((parsed_kws & MTREE_HAS_NLINK) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) ++ archive_entry_set_nlink(entry, st->st_nlink); ++ if ((parsed_kws & MTREE_HAS_PERM) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) ++ archive_entry_set_perm(entry, st->st_mode); ++ if ((parsed_kws & MTREE_HAS_SIZE) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) ++ archive_entry_set_size(entry, st->st_size); ++ archive_entry_set_ino(entry, st->st_ino); ++ archive_entry_set_dev(entry, st->st_dev); ++ ++ archive_entry_linkify(mtree->resolver, &entry, &sparse_entry); ++ } else if (parsed_kws & MTREE_HAS_OPTIONAL) { ++ /* ++ * Couldn't open the entry, stat it or the on-disk type ++ * didn't match. If this entry is optional, just ignore it ++ * and read the next header entry. ++ */ ++ *use_next = 1; ++ return ARCHIVE_OK; + } +- if ((parsed_kws & MTREE_HAS_NLINK) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) +- archive_entry_set_nlink(entry, st->st_nlink); +- if ((parsed_kws & MTREE_HAS_PERM) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) +- archive_entry_set_perm(entry, st->st_mode); +- if ((parsed_kws & MTREE_HAS_SIZE) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) +- archive_entry_set_size(entry, st->st_size); +- archive_entry_set_ino(entry, st->st_ino); +- archive_entry_set_dev(entry, st->st_dev); +- +- archive_entry_linkify(mtree->resolver, &entry, &sparse_entry); +- } else if (parsed_kws & MTREE_HAS_OPTIONAL) { +- /* +- * Couldn't open the entry, stat it or the on-disk type +- * didn't match. If this entry is optional, just ignore it +- * and read the next header entry. +- */ +- *use_next = 1; +- return ARCHIVE_OK; + } + + mtree->cur_size = archive_entry_size(entry); +diff --git a/libarchive/test/test_read_format_mtree.c b/libarchive/test/test_read_format_mtree.c +index 830fa0a..f96529d 100644 +--- a/libarchive/test/test_read_format_mtree.c ++++ b/libarchive/test/test_read_format_mtree.c +@@ -58,6 +58,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_filename(a, reffile, 11)); + + /* +@@ -209,6 +211,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_memory(a, archive, sizeof(archive))); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualInt(archive_format(a), ARCHIVE_FORMAT_MTREE); +@@ -246,6 +250,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_memory(a, archive, sizeof(archive))); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString(archive_entry_pathname(ae), "a"); +@@ -299,6 +305,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_memory(a, archive, sizeof(archive))); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString(archive_entry_pathname(ae), "./a"); +@@ -365,6 +373,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_memory(a, archive, sizeof(archive))); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString(archive_entry_pathname(ae), "./a"); +@@ -402,6 +412,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_memory(a, archive2, sizeof(archive2))); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString(archive_entry_pathname(ae), "./a"); +@@ -449,6 +461,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_filename(a, reffile, 11)); + + /* +@@ -552,6 +566,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_filename(a, reffile, 11)); + + /* +@@ -617,6 +633,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_filename(a, reffile, 11)); + + /* +@@ -680,6 +698,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_memory(a, archive, sizeof(archive))); + assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); + assert(strlen(archive_error_string(a)) > 0); +diff --git a/tar/write.c b/tar/write.c +index 40d2fb0..7e8cb13 100644 +--- a/tar/write.c ++++ b/tar/write.c +@@ -648,6 +648,7 @@ static void write_hierarchy(struct bsdtar *, struct archive *, + archive_read_support_format_all(ina); + archive_read_support_filter_all(ina); + set_reader_options(bsdtar, a); ++ archive_read_set_options(ina, "mtree:checkfs"); + if (archive_read_open_filename(ina, filename, + bsdtar->bytes_per_block)) { + lafe_warnc(0, "%s", archive_error_string(ina)); +-- +1.8.5.5 + diff --git a/abs/core/libass/PKGBUILD b/abs/core/libass/PKGBUILD index ec9c5f0..0b860d6 100644 --- a/abs/core/libass/PKGBUILD +++ b/abs/core/libass/PKGBUILD @@ -3,16 +3,16 @@ # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> pkgname=libass -pkgver=0.11.2 +pkgver=0.12.0 pkgrel=1 pkgdesc="A portable library for SSA/ASS subtitles rendering" arch=('i686' 'x86_64') -url="https://github.com/libass/libass/releases" +url="https://github.com/libass/libass/" license=('BSD') depends=('fribidi' 'fontconfig' 'enca' 'harfbuzz') makedepends=('pkg-config' 'yasm') -source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('701b761934de0eff7d45f58d7d13eaf6') +source=("${url}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz") +md5sums=('ba806f521248dd08032d433abc6d5ace') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/abs/core/libcec/PKGBUILD b/abs/core/libcec/PKGBUILD index e2ce13d..b877e84 100644 --- a/abs/core/libcec/PKGBUILD +++ b/abs/core/libcec/PKGBUILD @@ -4,31 +4,24 @@ # vim: ft=sh: pkgname=libcec -pkgver=2.1.3 +pkgver=2.2.0 pkgrel=1 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64') -url="https://github.com/Pulse-Eight/libcec" +url="http://libcec.pulse-eight.com/" license=('GPL') depends=('udev' 'lockdev') -source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-54be21e -options=(!libtool) -sha256sums=('2aa88451b528184b02077ee8c6cd10e2f89121a6a05b1b35b4b792b03108a9d1') +source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/$pkgname/archive/$pkgname-$pkgver.tar.gz") build() { - mv "$_srcfolder" "$pkgname-$pkgver" - - cd "$pkgname-$pkgver" - export CFLAGS="$CFLAGS -fPIC" - export CXXFLAGS="$CXXFLAGS -fPIC" - export LDFLAGS="$LDFLAGS -fPIC" + cd "$pkgname-$pkgname-$pkgver" autoreconf -vif ./configure --prefix=/usr make } package() { - cd "$pkgname-$pkgver" + cd "$pkgname-$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +sha256sums=('fd4f47a18d6e0f4b9e6f5831280207ee2b2a5fc2741ae32ae09ad12a8aa52917') diff --git a/abs/core/libdrm/PKGBUILD b/abs/core/libdrm/PKGBUILD index e93b0ac..356b9f7 100644 --- a/abs/core/libdrm/PKGBUILD +++ b/abs/core/libdrm/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.52 +pkgver=2.4.58 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -14,7 +14,7 @@ replaces=('libdrm-new' 'libdrm-nouveau') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 COPYING) -sha256sums=('fa693c2f1f61befcefbdcc396673e38481110bac9db610afa4b8afb2be0218c1' +sha256sums=('b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') build() { diff --git a/abs/core/libdv/PKGBUILD b/abs/core/libdv/PKGBUILD index fdeec4a..ee95a55 100644 --- a/abs/core/libdv/PKGBUILD +++ b/abs/core/libdv/PKGBUILD @@ -1,24 +1,21 @@ -# $Id: PKGBUILD 150457 2012-02-17 23:44:16Z allan $ +# $Id$ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libdv pkgver=1.0.0 -pkgrel=4 +pkgrel=6 pkgdesc="The Quasar DV codec (libdv) is a software codec for DV video" arch=('i686' 'x86_64') url="http://libdv.sourceforge.net/" license=('LGPL') depends=('popt') -makedepends=('pkg-config' 'gtk' 'libxv') -optdepends=('gtk: for using playdv' 'libxv: for using playdv') -options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('f895162161cfa4bb4a94c070a7caa6c7') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-gtk make } diff --git a/abs/core/libdvdnav/PKGBUILD b/abs/core/libdvdnav/PKGBUILD new file mode 100644 index 0000000..334c63d --- /dev/null +++ b/abs/core/libdvdnav/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Arjan <arjan@archlinux.org> +# contributor Sarah Hay <sarahhay@mb.sympatico.ca> + +pkgname=libdvdnav +pkgver=5.0.1 +pkgrel=1 +pkgdesc="The library for xine-dvdnav plugin." +arch=('i686' 'x86_64') +license=('GPL') +url="http://dvdnav.mplayerhq.hu/" +depends=('libdvdread') +makedepends=('git') +source=(git://git.videolan.org/libdvdnav.git#tag=$pkgver) +sha256sums=('SKIP') + +prepare() { + cd $pkgname + autoreconf -fi +} + +build() { + cd $pkgname + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname + make DESTDIR="${pkgdir}" install +} diff --git a/abs/core/libdvdread/PKGBUILD b/abs/core/libdvdread/PKGBUILD index 53a51bc..b7fdba4 100644 --- a/abs/core/libdvdread/PKGBUILD +++ b/abs/core/libdvdread/PKGBUILD @@ -1,32 +1,33 @@ -# $Id: PKGBUILD 144377 2011-12-05 12:49:24Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libdvdread -pkgver=4.2.0 +pkgver=5.0.0 pkgrel=1 pkgdesc="Provides a simple foundation for reading DVD video disks" arch=(i686 x86_64) url="http://dvdnav.mplayerhq.hu" license=('GPL') depends=('glibc') -makedepends=('libdvdcss') +makedepends=('libdvdcss' 'git') optdepends=('libdvdcss: for decoding encrypted DVDs') -options=('!libtool') -source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5ada8097') +source=(git://git.videolan.org/libdvdread.git#tag=$pkgver) +sha256sums=('SKIP') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2009-February/000986.html (FS#19324) +prepare() { + cd $pkgname + autoreconf -fi +} - ./autogen.sh --prefix=/usr +build() { + cd $pkgname + ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname make DESTDIR="${pkgdir}" install } diff --git a/abs/core/libhdhomerun/PKGBUILD b/abs/core/libhdhomerun/PKGBUILD index 052ca47..8c52362 100644 --- a/abs/core/libhdhomerun/PKGBUILD +++ b/abs/core/libhdhomerun/PKGBUILD @@ -1,66 +1,31 @@ -pkgname=libhdhomerun -pkgver=20120128 +# Mainainer: Ryan Corder <ryanc@greengrey.org> +# Contributor: Garrett Ward <glward1 at gmail dot com> + +pkgname=libhdhomerun +pkgver=20140121 pkgrel=1 -pkgdesc="utils and firmware needed for the hdhomerun" +pkgdesc="Library for interfacing with HDHomeRun device" arch=('i686' 'x86_64') -url="http://www.silicondust.com" -license=('GPL3') -#makedepends=('gtk2') -#optdepends=('gtk2: for using hdhomerun_config_gui') -replaces=('hdhomerun') -_firmware1=hdhomerun_atsc_firmware_${pkgver}.bin -_firmware2=hdhomerun_dvbt_firmware_${pkgver}.bin -_firmware3=hdhomerun3_atsc_firmware_${pkgver}.bin -_firmware4=hdhomerun3_dvbt_firmware_${pkgver}.bin -_firmware5=hdhomerun3_dvbtc_firmware_${pkgver}.bin -_firmware6=hdhomerun3_cablecard_firmware_${pkgver}.bin -_firmware7=hdhomerun_tech_atsc_firmware_${pkgver}.bin -_firmware8=hdhomerun3_tech_atsc_firmware_${pkgver}.bin -_firmware9=hdhomerun3_tech_dvbtc_firmware_${pkgver}.bin -_url2=http://download.silicondust.com/hdhomerun -source=("${_url2}/libhdhomerun_${pkgver}.tgz" - "${_url2}/${_firmware1}" - "${_url2}/${_firmware2}" - "${_url2}/${_firmware3}" - "${_url2}/${_firmware4}" - "${_url2}/${_firmware5}" - "${_url2}/${_firmware6}" - "${_url2}/${_firmware7}" - "${_url2}/${_firmware8}" - "${_url2}/${_firmware9}") - #"${_url2}/hdhomerun_config_gui_${pkgver}.tgz") +url="http://www.silicondust.com/downloads" +license=('LGPL') +source=("http://download.silicondust.com/hdhomerun/${pkgname}_${pkgver}.tgz") +md5sums=('5411594931245c80597ad899eacc7541') +depends=('glibc') build() { - cd ${srcdir}/libhdhomerun - make || return 1 - #cd ${srcdir}/hdhomerun_config_gui - # ./configure --prefix=/usr || return 1 - # make || return 1 + cd "$srcdir/$pkgname" + + make } package() { - cd ${srcdir}/libhdhomerun - install -D -m755 libhdhomerun.so ${pkgdir}/usr/lib/libhdhomerun.so - install -D -m755 hdhomerun_config ${pkgdir}/usr/bin/hdhomerun_config - - # cd ${srcdir}/hdhomerun_config_gui - # make DESTDIR=${pkgdir} install || return 1 + cd "$srcdir/$pkgname" - cd ${srcdir} - install -d ${pkgdir}/lib/firmware + mkdir -m 0755 -p $pkgdir/usr/lib + mkdir -m 0755 -p $pkgdir/usr/bin + mkdir -m 0755 -p $pkgdir/usr/include/hdhomerun - for file in ${_firmware1} ${_firmware2} ${_firmware3} ${_firmware4} \ - ${_firmware5} ${_firmware6} ; do - install -D ${srcdir}/${file} ${pkgdir}/lib/firmware/ - done + install -m 644 *.h $pkgdir/usr/include/hdhomerun/ + install -m 755 libhdhomerun.so $pkgdir/usr/lib/libhdhomerun.so + install -m 755 hdhomerun_config $pkgdir/usr/bin/hdhomerun_config } -md5sums=('8b1c5c3b723f2e7b3d1b7599c1c1c1c8' - '441cc1915f5c38ef779e66f0198305be' - '90d027bdbee27af5bb4aef13ba361f91' - '8d303e61ce4a3ad57be980e2f27ad1f5' - '4f96d55d4a84f9edff730663bd836a3f' - '16d0a18e5971acf47a2d0d635b4c6c74' - 'e32423f02872d1ce6432cb7c24f7d41f' - 'cbe27be2dd94b59cc745c5112ef54912' - '469cac13aa65b9ac5a04a15b7d050893' - 'da478fce3260c8982dbcfb8cf3a46415') diff --git a/abs/core/libjpeg-turbo/PKGBUILD b/abs/core/libjpeg-turbo/PKGBUILD index 65f5bc4..e2dedc3 100644 --- a/abs/core/libjpeg-turbo/PKGBUILD +++ b/abs/core/libjpeg-turbo/PKGBUILD @@ -5,19 +5,29 @@ pkgname=libjpeg-turbo pkgver=1.3.1 -pkgrel=1 +pkgrel=3 pkgdesc='JPEG image codec with accelerated baseline compression and decompression' url='http://libjpeg-turbo.virtualgl.org/' license=('GPL' 'custom') arch=('i686' 'x86_64') makedepends=('nasm') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('5fa19252e5ca992cfa40446a0210ceff55fbe468') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'jstdhuff.patch' + 'overrun.patch') +sha1sums=('5fa19252e5ca992cfa40446a0210ceff55fbe468' + 'f459890257df430dc4e2d8bd3060173a1be7516e' + '438aba2241b19857bab090c6f61bd3f249f27591') provides=('libjpeg=8.0.2' 'turbojpeg') conflicts=('libjpeg' 'turbojpeg') replaces=('libjpeg' 'turbojpeg') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../jstdhuff.patch # FS#42747 + patch -p1 -i ../overrun.patch # FS#42922 +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man diff --git a/abs/core/libjpeg-turbo/jstdhuff.patch b/abs/core/libjpeg-turbo/jstdhuff.patch new file mode 100644 index 0000000..764147d --- /dev/null +++ b/abs/core/libjpeg-turbo/jstdhuff.patch @@ -0,0 +1,301 @@ +Index: jcparam.c +=================================================================== +--- jcparam.c (revision 1103) ++++ jcparam.c (revision 1104) +@@ -16,6 +16,7 @@ + #define JPEG_INTERNALS + #include "jinclude.h" + #include "jpeglib.h" ++#include "jstdhuff.c" + + + /* +@@ -166,116 +167,6 @@ + + + /* +- * Huffman table setup routines +- */ +- +-LOCAL(void) +-add_huff_table (j_compress_ptr cinfo, +- JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val) +-/* Define a Huffman table */ +-{ +- int nsymbols, len; +- +- if (*htblptr == NULL) +- *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo); +- +- /* Copy the number-of-symbols-of-each-code-length counts */ +- MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits)); +- +- /* Validate the counts. We do this here mainly so we can copy the right +- * number of symbols from the val[] array, without risking marching off +- * the end of memory. jchuff.c will do a more thorough test later. +- */ +- nsymbols = 0; +- for (len = 1; len <= 16; len++) +- nsymbols += bits[len]; +- if (nsymbols < 1 || nsymbols > 256) +- ERREXIT(cinfo, JERR_BAD_HUFF_TABLE); +- +- MEMCOPY((*htblptr)->huffval, val, nsymbols * SIZEOF(UINT8)); +- +- /* Initialize sent_table FALSE so table will be written to JPEG file. */ +- (*htblptr)->sent_table = FALSE; +-} +- +- +-LOCAL(void) +-std_huff_tables (j_compress_ptr cinfo) +-/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */ +-/* IMPORTANT: these are only valid for 8-bit data precision! */ +-{ +- static const UINT8 bits_dc_luminance[17] = +- { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }; +- static const UINT8 val_dc_luminance[] = +- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; +- +- static const UINT8 bits_dc_chrominance[17] = +- { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; +- static const UINT8 val_dc_chrominance[] = +- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; +- +- static const UINT8 bits_ac_luminance[17] = +- { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d }; +- static const UINT8 val_ac_luminance[] = +- { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, +- 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, +- 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, +- 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, +- 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, +- 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, +- 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, +- 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, +- 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, +- 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, +- 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, +- 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, +- 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, +- 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, +- 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, +- 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, +- 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, +- 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, +- 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, +- 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, +- 0xf9, 0xfa }; +- +- static const UINT8 bits_ac_chrominance[17] = +- { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 }; +- static const UINT8 val_ac_chrominance[] = +- { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, +- 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, +- 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, +- 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, +- 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, +- 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, +- 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, +- 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, +- 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, +- 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, +- 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, +- 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, +- 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, +- 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, +- 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, +- 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, +- 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, +- 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, +- 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, +- 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, +- 0xf9, 0xfa }; +- +- add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[0], +- bits_dc_luminance, val_dc_luminance); +- add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[0], +- bits_ac_luminance, val_ac_luminance); +- add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[1], +- bits_dc_chrominance, val_dc_chrominance); +- add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[1], +- bits_ac_chrominance, val_ac_chrominance); +-} +- +- +-/* + * Default parameter setup for compression. + * + * Applications that don't choose to use this routine must do their +@@ -313,7 +204,7 @@ + /* Set up two quantization tables using default quality of 75 */ + jpeg_set_quality(cinfo, 75, TRUE); + /* Set up two Huffman tables */ +- std_huff_tables(cinfo); ++ std_huff_tables((j_common_ptr) cinfo); + + /* Initialize default arithmetic coding conditioning */ + for (i = 0; i < NUM_ARITH_TBLS; i++) { +Index: jstdhuff.c +=================================================================== +--- jstdhuff.c (revision 0) ++++ jstdhuff.c (revision 1104) +@@ -0,0 +1,133 @@ ++/* ++* jstdhuff.c ++* ++* This file was part of the Independent JPEG Group's software: ++* Copyright (C) 1991-1998, Thomas G. Lane. ++* libjpeg-turbo Modifications: ++* Copyright (C) 2013, D. R. Commander. ++* For conditions of distribution and use, see the accompanying README file. ++* ++* This file contains routines to set the default Huffman tables, if they are ++* not already set. ++*/ ++ ++/* ++ * Huffman table setup routines ++ */ ++ ++LOCAL(void) ++add_huff_table (j_common_ptr cinfo, ++ JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val) ++/* Define a Huffman table */ ++{ ++ int nsymbols, len; ++ ++ if (*htblptr == NULL) ++ *htblptr = jpeg_alloc_huff_table(cinfo); ++ else ++ return; ++ ++ /* Copy the number-of-symbols-of-each-code-length counts */ ++ MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits)); ++ ++ /* Validate the counts. We do this here mainly so we can copy the right ++ * number of symbols from the val[] array, without risking marching off ++ * the end of memory. jchuff.c will do a more thorough test later. ++ */ ++ nsymbols = 0; ++ for (len = 1; len <= 16; len++) ++ nsymbols += bits[len]; ++ if (nsymbols < 1 || nsymbols > 256) ++ ERREXIT(cinfo, JERR_BAD_HUFF_TABLE); ++ ++ MEMCOPY((*htblptr)->huffval, val, nsymbols * SIZEOF(UINT8)); ++ ++ /* Initialize sent_table FALSE so table will be written to JPEG file. */ ++ (*htblptr)->sent_table = FALSE; ++} ++ ++ ++LOCAL(void) ++std_huff_tables (j_common_ptr cinfo) ++/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */ ++/* IMPORTANT: these are only valid for 8-bit data precision! */ ++{ ++ JHUFF_TBL **dc_huff_tbl_ptrs, **ac_huff_tbl_ptrs; ++ ++ static const UINT8 bits_dc_luminance[17] = ++ { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }; ++ static const UINT8 val_dc_luminance[] = ++ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; ++ ++ static const UINT8 bits_dc_chrominance[17] = ++ { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; ++ static const UINT8 val_dc_chrominance[] = ++ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; ++ ++ static const UINT8 bits_ac_luminance[17] = ++ { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d }; ++ static const UINT8 val_ac_luminance[] = ++ { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, ++ 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, ++ 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, ++ 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, ++ 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, ++ 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, ++ 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, ++ 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, ++ 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, ++ 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, ++ 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, ++ 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, ++ 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, ++ 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, ++ 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, ++ 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, ++ 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, ++ 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, ++ 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, ++ 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, ++ 0xf9, 0xfa }; ++ ++ static const UINT8 bits_ac_chrominance[17] = ++ { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 }; ++ static const UINT8 val_ac_chrominance[] = ++ { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, ++ 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, ++ 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, ++ 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, ++ 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, ++ 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, ++ 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, ++ 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, ++ 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, ++ 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, ++ 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, ++ 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, ++ 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, ++ 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, ++ 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, ++ 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, ++ 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, ++ 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, ++ 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, ++ 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, ++ 0xf9, 0xfa }; ++ ++ if (cinfo->is_decompressor) { ++ dc_huff_tbl_ptrs = ((j_decompress_ptr)cinfo)->dc_huff_tbl_ptrs; ++ ac_huff_tbl_ptrs = ((j_decompress_ptr)cinfo)->ac_huff_tbl_ptrs; ++ } else { ++ dc_huff_tbl_ptrs = ((j_compress_ptr)cinfo)->dc_huff_tbl_ptrs; ++ ac_huff_tbl_ptrs = ((j_compress_ptr)cinfo)->ac_huff_tbl_ptrs; ++ } ++ ++ add_huff_table(cinfo, &dc_huff_tbl_ptrs[0], bits_dc_luminance, ++ val_dc_luminance); ++ add_huff_table(cinfo, &ac_huff_tbl_ptrs[0], bits_ac_luminance, ++ val_ac_luminance); ++ add_huff_table(cinfo, &dc_huff_tbl_ptrs[1], bits_dc_chrominance, ++ val_dc_chrominance); ++ add_huff_table(cinfo, &ac_huff_tbl_ptrs[1], bits_ac_chrominance, ++ val_ac_chrominance); ++} +Index: jdhuff.c +=================================================================== +--- jdhuff.c (revision 1103) ++++ jdhuff.c (revision 1104) +@@ -21,6 +21,7 @@ + #include "jpeglib.h" + #include "jdhuff.h" /* Declarations shared with jdphuff.c */ + #include "jpegcomp.h" ++#include "jstdhuff.c" + + + /* +@@ -795,6 +796,12 @@ + huff_entropy_ptr entropy; + int i; + ++ /* Motion JPEG frames typically do not include the Huffman tables if they ++ are the default tables. Thus, if the tables are not set by the time ++ the Huffman decoder is initialized (usually within the body of ++ jpeg_start_decompress()), we set them to default values. */ ++ std_huff_tables((j_common_ptr) cinfo); ++ + entropy = (huff_entropy_ptr) + (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, + SIZEOF(huff_entropy_decoder)); diff --git a/abs/core/libjpeg-turbo/overrun.patch b/abs/core/libjpeg-turbo/overrun.patch new file mode 100644 index 0000000..92f48c3 --- /dev/null +++ b/abs/core/libjpeg-turbo/overrun.patch @@ -0,0 +1,21 @@ +diff -Naur old/jchuff.c new/jchuff.c +--- old/jchuff.c 2014-11-27 06:48:21.009442853 -1000 ++++ new/jchuff.c 2014-11-27 06:48:46.289700004 -1000 +@@ -391,7 +391,16 @@ + #endif + + +-#define BUFSIZE (DCTSIZE2 * 2) ++/* Although it is exceedingly rare, it is possible for a Huffman-encoded ++ * coefficient block to be larger than the 128-byte unencoded block. For each ++ * of the 64 coefficients, PUT_BITS is invoked twice, and each invocation can ++ * theoretically store 16 bits (for a maximum of 2048 bits or 256 bytes per ++ * encoded block.) If, for instance, one artificially sets the AC ++ * coefficients to alternating values of 32767 and -32768 (using the JPEG ++ * scanning order-- 1, 8, 16, etc.), then this will produce an encoded block ++ * larger than 200 bytes. ++ */ ++#define BUFSIZE (DCTSIZE2 * 4) + + #define LOAD_BUFFER() { \ + if (state->free_in_buffer < BUFSIZE) { \ diff --git a/abs/core/libmpeg2/PKGBUILD b/abs/core/libmpeg2/PKGBUILD index 2596082..095777a 100644 --- a/abs/core/libmpeg2/PKGBUILD +++ b/abs/core/libmpeg2/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 134366 2011-08-03 07:11:36Z jgc $ +# $Id$ # Contributor: Sarah Hay <sarah@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libmpeg2 pkgver=0.5.1 -pkgrel=3 +pkgrel=5 pkgdesc="Library for decoding MPEG-1 and MPEG-2 video streams." arch=('i686' 'x86_64') url="http://libmpeg2.sourceforge.net/" depends=('glibc') makedepends=('sdl' 'libxv') -optdepends=('sdl: requiered for mpeg2dec' - 'libxv: requiered for mpeg2dec') +optdepends=('sdl: required for mpeg2dec' + 'libxv: required for mpeg2dec') source=(http://libmpeg2.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz libmpeg2-0.5.1-gcc4.6.patch) license=('GPL2') -options=(!libtool) provides=('mpeg2dec') md5sums=('0f92c7454e58379b4a5a378485bbd8ef' '8b36660297e6ffde6aa9733136bff405') @@ -31,5 +30,9 @@ build() { make OPT_CFLAGS="${CFLAGS}" \ MPEG2DEC_CFLAGS="${CFLAGS}" \ LIBMPEG2_CFLAGS="" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/abs/core/libpng/PKGBUILD b/abs/core/libpng/PKGBUILD index cf7b93b..957c256 100644 --- a/abs/core/libpng/PKGBUILD +++ b/abs/core/libpng/PKGBUILD @@ -1,35 +1,44 @@ -# $Id: PKGBUILD 169446 2012-10-21 10:49:41Z ibiru $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.5.13 -_apngver=1.5.13 +pkgver=1.6.15 +_apngver=1.6.15 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64') url="http://www.libpng.org/pub/png/libpng.html" license=('custom') depends=('zlib' 'sh') -options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" - "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz") -md5sums=('0b607a685da977f1bfc96e1c47055183' - '23c8765aa6ca188c0575386d5ea8fe70') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz{,.asc} + http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz) +md5sums=('a95cb387c53215b034203b41ec57c7e5' + 'SKIP' + '612524080d5515f4ea81541a9b13bf61') -build() { +prepare() { cd $pkgname-$pkgver - # Add animated PNG (apng) support + # Add animated PNG (apng) support. Required by Firefox # see http://sourceforge.net/projects/libpng-apng/ - patch -p1 -i ../libpng-$_apngver-apng.patch + patch -Np1 -i ../libpng-$_apngver-apng.patch +} + +build() { + cd $pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/abs/core/librsvg/PKGBUILD b/abs/core/librsvg/PKGBUILD index 284f405..e3e7534 100644 --- a/abs/core/librsvg/PKGBUILD +++ b/abs/core/librsvg/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 156916 2012-04-23 09:09:00Z ibiru $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg -pkgver=2.36.1 +pkgver=2.40.5 pkgrel=1 +epoch=1 pkgdesc="A SVG viewing library" arch=(i686 x86_64) license=('LGPL') depends=('gdk-pixbuf2' 'pango' 'libcroco') -makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection') +makedepends=('intltool' 'gtk3' 'gobject-introspection' 'vala' 'python2') optdepends=('gtk3: for rsvg-view-3') -options=('!libtool' '!emptydirs') -url="http://librsvg.sourceforge.net/" +options=('!emptydirs') +url="https://live.gnome.org/LibRsvg" install=librsvg.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('786b95e1a091375c5ef2997a21c69ff24d7077afeff18197355f54d9dcbcd8c5') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('d14d7b3e25023ce34302022fd7c9b3a468629c94dff6c177874629686bfc71a7') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --disable-static + ./configure --prefix=/usr --disable-static --enable-vala make } diff --git a/abs/core/libssh2/PKGBUILD b/abs/core/libssh2/PKGBUILD index 520b900..d9b7d82 100644 --- a/abs/core/libssh2/PKGBUILD +++ b/abs/core/libssh2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159788 2012-05-27 02:25:20Z dreisner $ +# $Id$ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,8 +6,8 @@ # Contributor: ice-man <icemanf@gmail.com> pkgname=libssh2 -pkgver=1.4.2 -pkgrel=1 +pkgver=1.4.3 +pkgrel=2 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" url="http://www.libssh2.org/" arch=('i686' 'x86_64') @@ -15,10 +15,9 @@ license=('BSD') depends=('openssl') makedepends=('zlib') provides=('libssh2.so') -options=('!libtool') source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc}) -md5sums=('42e2b3796ac07fc1dbafc7abcc002cd3' - '872cfb1d61dbd5acd0481ab030e8f130') +md5sums=('071004c60c5d6f90354ad1b701013a0b' + 'bd01eca1e58c15233d69dae411dd2656') build() { cd "$pkgname-$pkgver" diff --git a/abs/core/libtiff/PKGBUILD b/abs/core/libtiff/PKGBUILD index 2606aa1..300fe4c 100644 --- a/abs/core/libtiff/PKGBUILD +++ b/abs/core/libtiff/PKGBUILD @@ -1,33 +1,64 @@ -# $Id: PKGBUILD 162307 2012-06-24 20:44:52Z eric $ +# $Id$ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libtiff -pkgver=4.0.2 -pkgrel=1 +pkgver=4.0.3 +pkgrel=5 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64') url="http://www.remotesensing.org/libtiff/" license=('custom') -depends=('libjpeg' 'zlib' 'xz') -makedepends=('freeglut') +depends=('gcc-libs' 'libjpeg' 'zlib' 'xz') +makedepends=('freeglut' 'glu' 'mesa' 'jbigkit') optdepends=('freeglut: for using tiffgt') -options=('!libtool') -source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) -sha1sums=('d84b7b33a6cfb3d15ca386c8c16b05047f8b5352') +source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz + tiff-3.9.7-CVE-2012-4447.patch + tiff-3.9.7-CVE-2012-4564.patch + tiff-4.0.3-CVE-2013-1960.patch + tiff-4.0.3-CVE-2013-1961.patch + tiff-4.0.3-libjpeg-turbo.patch + tiff-4.0.3-tiff2pdf-colors.patch + tiff-4.0.3-CVE-2013-4231.patch + tiff-4.0.3-CVE-2013-4232.patch + libtiff-CVE-2013-4244.patch) +sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0' + '41be661638282dae0d07bd2788414cb6650f8981' + '6cb3d480908132335c05c769b5a51f951413725d' + '5903355afdd0bb27ea3746339e2196720f9fac9d' + '29a91870cca5d4cd9ca1c464f8074088eddc3fb8' + '02d57835df50d3f84587571ec52b36f5af838de2' + '23443ad0bc130d70860b6cc6d19b69584ae7a6cc' + '969f588e9da5991e7f17dddf69ae59424b05fa16' + '2a23c55d081bed74ac8dd99541a93d312cc72b64' + '01c6792ba2470493da4d990edae8de6c13bd4670') + +prepare() { + cd tiff-${pkgver} + patch -p0 -i "${srcdir}/tiff-4.0.3-tiff2pdf-colors.patch" + patch -p1 -i "${srcdir}/tiff-3.9.7-CVE-2012-4447.patch" + patch -p1 -i "${srcdir}/tiff-3.9.7-CVE-2012-4564.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1960.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1961.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-libjpeg-turbo.patch" + patch -p1 -i "${srcdir}/libtiff-CVE-2013-4244.patch" + cd tools + patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4231.patch" + patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4232.patch" +} build() { - cd "${srcdir}/tiff-${pkgver}" + cd tiff-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/tiff-${pkgver}" + cd tiff-${pkgver} make check } package() { - cd "${srcdir}/tiff-${pkgver}" + cd tiff-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/core/libtiff/libtiff-CVE-2013-4244.patch b/abs/core/libtiff/libtiff-CVE-2013-4244.patch new file mode 100644 index 0000000..792e076 --- /dev/null +++ b/abs/core/libtiff/libtiff-CVE-2013-4244.patch @@ -0,0 +1,15 @@ +diff --git a/tools/gif2tiff.c b/tools/gif2tiff.c +index 375b152..2731273 100644 +--- a/tools/gif2tiff.c ++++ b/tools/gif2tiff.c +@@ -402,6 +402,10 @@ process(register int code, unsigned char** fill) + } + + if (oldcode == -1) { ++ if (code >= clear) { ++ fprintf(stderr, "bad input: code=%d is larger than clear=%d\n",code, clear); ++ return 0; ++ } + *(*fill)++ = suffix[code]; + firstchar = oldcode = code; + return 1; diff --git a/abs/core/libtiff/tiff-3.9.7-CVE-2012-4447.patch b/abs/core/libtiff/tiff-3.9.7-CVE-2012-4447.patch new file mode 100644 index 0000000..f23e984 --- /dev/null +++ b/abs/core/libtiff/tiff-3.9.7-CVE-2012-4447.patch @@ -0,0 +1,37 @@ +Upstream patch for CVE-2012-4447. This also covers an out-of-bounds-read +possibility in the same file, which wasn't given a separate CVE. + + +diff -Naur tiff-3.9.4.orig/libtiff/tif_pixarlog.c tiff-3.9.4/libtiff/tif_pixarlog.c +--- tiff-3.9.4.orig/libtiff/tif_pixarlog.c 2010-06-08 14:50:42.000000000 -0400 ++++ tiff-3.9.4/libtiff/tif_pixarlog.c 2012-12-10 15:50:14.421538317 -0500 +@@ -641,6 +641,20 @@ + return bytes; + } + ++static tsize_t ++add_ms(tsize_t m1, tsize_t m2) ++{ ++ tsize_t bytes = m1 + m2; ++ ++ /* if either input is zero, assume overflow already occurred */ ++ if (m1 == 0 || m2 == 0) ++ bytes = 0; ++ else if (bytes <= m1 || bytes <= m2) ++ bytes = 0; ++ ++ return bytes; ++} ++ + static int + PixarLogSetupDecode(TIFF* tif) + { +@@ -661,6 +675,8 @@ + td->td_samplesperpixel : 1); + tbuf_size = multiply(multiply(multiply(sp->stride, td->td_imagewidth), + td->td_rowsperstrip), sizeof(uint16)); ++ /* add one more stride in case input ends mid-stride */ ++ tbuf_size = add_ms(tbuf_size, sizeof(uint16) * sp->stride); + if (tbuf_size == 0) + return (0); + sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size); diff --git a/abs/core/libtiff/tiff-3.9.7-CVE-2012-4564.patch b/abs/core/libtiff/tiff-3.9.7-CVE-2012-4564.patch new file mode 100644 index 0000000..98a6e6c --- /dev/null +++ b/abs/core/libtiff/tiff-3.9.7-CVE-2012-4564.patch @@ -0,0 +1,77 @@ +Upstream patch for CVE-2012-4564. + + +diff -Naur tiff-3.9.4.orig/tools/ppm2tiff.c tiff-3.9.4/tools/ppm2tiff.c +--- tiff-3.9.4.orig/tools/ppm2tiff.c 2010-06-08 14:50:44.000000000 -0400 ++++ tiff-3.9.4/tools/ppm2tiff.c 2012-12-10 16:16:05.154045877 -0500 +@@ -68,6 +68,17 @@ + exit(-2); + } + ++static tsize_t ++multiply_ms(tsize_t m1, tsize_t m2) ++{ ++ tsize_t bytes = m1 * m2; ++ ++ if (m1 && bytes / m1 != m2) ++ bytes = 0; ++ ++ return bytes; ++} ++ + int + main(int argc, char* argv[]) + { +@@ -85,6 +96,7 @@ + int c; + extern int optind; + extern char* optarg; ++ tsize_t scanline_size; + + if (argc < 2) { + fprintf(stderr, "%s: Too few arguments\n", argv[0]); +@@ -217,7 +229,8 @@ + } + switch (bpp) { + case 1: +- linebytes = (spp * w + (8 - 1)) / 8; ++ /* if round-up overflows, result will be zero, OK */ ++ linebytes = (multiply_ms(spp, w) + (8 - 1)) / 8; + if (rowsperstrip == (uint32) -1) { + TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, h); + } else { +@@ -226,15 +239,31 @@ + } + break; + case 8: +- linebytes = spp * w; ++ linebytes = multiply_ms(spp, w); + TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, + TIFFDefaultStripSize(out, rowsperstrip)); + break; + } +- if (TIFFScanlineSize(out) > linebytes) ++ if (linebytes == 0) { ++ fprintf(stderr, "%s: scanline size overflow\n", infile); ++ (void) TIFFClose(out); ++ exit(-2); ++ } ++ scanline_size = TIFFScanlineSize(out); ++ if (scanline_size == 0) { ++ /* overflow - TIFFScanlineSize already printed a message */ ++ (void) TIFFClose(out); ++ exit(-2); ++ } ++ if (scanline_size < linebytes) + buf = (unsigned char *)_TIFFmalloc(linebytes); + else +- buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); ++ buf = (unsigned char *)_TIFFmalloc(scanline_size); ++ if (buf == NULL) { ++ fprintf(stderr, "%s: Not enough memory\n", infile); ++ (void) TIFFClose(out); ++ exit(-2); ++ } + if (resolution > 0) { + TIFFSetField(out, TIFFTAG_XRESOLUTION, resolution); + TIFFSetField(out, TIFFTAG_YRESOLUTION, resolution); diff --git a/abs/core/libtiff/tiff-4.0.3-CVE-2013-1960.patch b/abs/core/libtiff/tiff-4.0.3-CVE-2013-1960.patch new file mode 100644 index 0000000..1c8dfb7 --- /dev/null +++ b/abs/core/libtiff/tiff-4.0.3-CVE-2013-1960.patch @@ -0,0 +1,145 @@ +diff -Naur tiff-4.0.3.orig/tools/tiff2pdf.c tiff-4.0.3/tools/tiff2pdf.c +--- tiff-4.0.3.orig/tools/tiff2pdf.c 2012-07-25 22:56:43.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2pdf.c 2013-05-02 12:04:49.057090227 -0400 +@@ -3341,33 +3341,56 @@ + uint32 height){ + + tsize_t i=0; +- uint16 ri =0; +- uint16 v_samp=1; +- uint16 h_samp=1; +- int j=0; +- +- i++; +- +- while(i<(*striplength)){ ++ ++ while (i < *striplength) { ++ tsize_t datalen; ++ uint16 ri; ++ uint16 v_samp; ++ uint16 h_samp; ++ int j; ++ int ncomp; ++ ++ /* marker header: one or more FFs */ ++ if (strip[i] != 0xff) ++ return(0); ++ i++; ++ while (i < *striplength && strip[i] == 0xff) ++ i++; ++ if (i >= *striplength) ++ return(0); ++ /* SOI is the only pre-SOS marker without a length word */ ++ if (strip[i] == 0xd8) ++ datalen = 0; ++ else { ++ if ((*striplength - i) <= 2) ++ return(0); ++ datalen = (strip[i+1] << 8) | strip[i+2]; ++ if (datalen < 2 || datalen >= (*striplength - i)) ++ return(0); ++ } + switch( strip[i] ){ +- case 0xd8: +- /* SOI - start of image */ ++ case 0xd8: /* SOI - start of image */ + _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), 2); + *bufferoffset+=2; +- i+=2; + break; +- case 0xc0: +- case 0xc1: +- case 0xc3: +- case 0xc9: +- case 0xca: ++ case 0xc0: /* SOF0 */ ++ case 0xc1: /* SOF1 */ ++ case 0xc3: /* SOF3 */ ++ case 0xc9: /* SOF9 */ ++ case 0xca: /* SOF10 */ + if(no==0){ +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- for(j=0;j<buffer[*bufferoffset+9];j++){ +- if( (buffer[*bufferoffset+11+(2*j)]>>4) > h_samp) +- h_samp = (buffer[*bufferoffset+11+(2*j)]>>4); +- if( (buffer[*bufferoffset+11+(2*j)] & 0x0f) > v_samp) +- v_samp = (buffer[*bufferoffset+11+(2*j)] & 0x0f); ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ ncomp = buffer[*bufferoffset+9]; ++ if (ncomp < 1 || ncomp > 4) ++ return(0); ++ v_samp=1; ++ h_samp=1; ++ for(j=0;j<ncomp;j++){ ++ uint16 samp = buffer[*bufferoffset+11+(3*j)]; ++ if( (samp>>4) > h_samp) ++ h_samp = (samp>>4); ++ if( (samp & 0x0f) > v_samp) ++ v_samp = (samp & 0x0f); + } + v_samp*=8; + h_samp*=8; +@@ -3381,45 +3404,43 @@ + (unsigned char) ((height>>8) & 0xff); + buffer[*bufferoffset+6]= + (unsigned char) (height & 0xff); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; +- ++ *bufferoffset+=datalen+2; ++ /* insert a DRI marker */ + buffer[(*bufferoffset)++]=0xff; + buffer[(*bufferoffset)++]=0xdd; + buffer[(*bufferoffset)++]=0x00; + buffer[(*bufferoffset)++]=0x04; + buffer[(*bufferoffset)++]=(ri >> 8) & 0xff; + buffer[(*bufferoffset)++]= ri & 0xff; +- } else { +- i+=strip[i+2]+2; + } + break; +- case 0xc4: +- case 0xdb: +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; ++ case 0xc4: /* DHT */ ++ case 0xdb: /* DQT */ ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ *bufferoffset+=datalen+2; + break; +- case 0xda: ++ case 0xda: /* SOS */ + if(no==0){ +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ *bufferoffset+=datalen+2; + } else { + buffer[(*bufferoffset)++]=0xff; + buffer[(*bufferoffset)++]= + (unsigned char)(0xd0 | ((no-1)%8)); +- i+=strip[i+2]+2; + } +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), (*striplength)-i-1); +- *bufferoffset+=(*striplength)-i-1; ++ i += datalen + 1; ++ /* copy remainder of strip */ ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i]), *striplength - i); ++ *bufferoffset+= *striplength - i; + return(1); + default: +- i+=strip[i+2]+2; ++ /* ignore any other marker */ ++ break; + } ++ i += datalen + 1; + } +- + ++ /* failed to find SOS marker */ + return(0); + } + #endif diff --git a/abs/core/libtiff/tiff-4.0.3-CVE-2013-1961.patch b/abs/core/libtiff/tiff-4.0.3-CVE-2013-1961.patch new file mode 100644 index 0000000..0ea9b52 --- /dev/null +++ b/abs/core/libtiff/tiff-4.0.3-CVE-2013-1961.patch @@ -0,0 +1,759 @@ +diff -Naur tiff-4.0.3.orig/contrib/dbs/xtiff/xtiff.c tiff-4.0.3/contrib/dbs/xtiff/xtiff.c +--- tiff-4.0.3.orig/contrib/dbs/xtiff/xtiff.c 2010-06-08 14:55:15.000000000 -0400 ++++ tiff-4.0.3/contrib/dbs/xtiff/xtiff.c 2013-05-02 12:02:42.782287939 -0400 +@@ -512,9 +512,9 @@ + Arg args[1]; + + if (tfMultiPage) +- sprintf(buffer, "%s - page %d", fileName, tfDirectory); ++ snprintf(buffer, sizeof(buffer), "%s - page %d", fileName, tfDirectory); + else +- strcpy(buffer, fileName); ++ snprintf(buffer, sizeof(buffer), "%s", fileName); + XtSetArg(args[0], XtNlabel, buffer); + XtSetValues(labelWidget, args, 1); + } +diff -Naur tiff-4.0.3.orig/libtiff/tif_codec.c tiff-4.0.3/libtiff/tif_codec.c +--- tiff-4.0.3.orig/libtiff/tif_codec.c 2010-12-14 09:18:28.000000000 -0500 ++++ tiff-4.0.3/libtiff/tif_codec.c 2013-05-02 12:02:42.783287946 -0400 +@@ -108,7 +108,8 @@ + const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression); + char compression_code[20]; + +- sprintf( compression_code, "%d", tif->tif_dir.td_compression ); ++ snprintf(compression_code, sizeof(compression_code), "%d", ++ tif->tif_dir.td_compression ); + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "%s compression support is not configured", + c ? c->name : compression_code ); +diff -Naur tiff-4.0.3.orig/libtiff/tif_dirinfo.c tiff-4.0.3/libtiff/tif_dirinfo.c +--- tiff-4.0.3.orig/libtiff/tif_dirinfo.c 2012-08-19 12:56:34.000000000 -0400 ++++ tiff-4.0.3/libtiff/tif_dirinfo.c 2013-05-02 12:02:42.784287953 -0400 +@@ -711,7 +711,7 @@ + * note that this name is a special sign to TIFFClose() and + * _TIFFSetupFields() to free the field + */ +- sprintf(fld->field_name, "Tag %d", (int) tag); ++ snprintf(fld->field_name, 32, "Tag %d", (int) tag); + + return fld; + } +diff -Naur tiff-4.0.3.orig/tools/rgb2ycbcr.c tiff-4.0.3/tools/rgb2ycbcr.c +--- tiff-4.0.3.orig/tools/rgb2ycbcr.c 2011-05-31 13:03:16.000000000 -0400 ++++ tiff-4.0.3/tools/rgb2ycbcr.c 2013-05-02 12:02:42.785287961 -0400 +@@ -332,7 +332,8 @@ + TIFFSetField(out, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); + { char buf[2048]; + char *cp = strrchr(TIFFFileName(in), '/'); +- sprintf(buf, "YCbCr conversion of %s", cp ? cp+1 : TIFFFileName(in)); ++ snprintf(buf, sizeof(buf), "YCbCr conversion of %s", ++ cp ? cp+1 : TIFFFileName(in)); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, buf); + } + TIFFSetField(out, TIFFTAG_SOFTWARE, TIFFGetVersion()); +diff -Naur tiff-4.0.3.orig/tools/tiff2bw.c tiff-4.0.3/tools/tiff2bw.c +--- tiff-4.0.3.orig/tools/tiff2bw.c 2010-07-08 12:10:24.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2bw.c 2013-05-02 12:02:42.785287961 -0400 +@@ -205,7 +205,7 @@ + } + } + TIFFSetField(out, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); +- sprintf(thing, "B&W version of %s", argv[optind]); ++ snprintf(thing, sizeof(thing), "B&W version of %s", argv[optind]); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing); + TIFFSetField(out, TIFFTAG_SOFTWARE, "tiff2bw"); + outbuf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); +diff -Naur tiff-4.0.3.orig/tools/tiff2pdf.c tiff-4.0.3/tools/tiff2pdf.c +--- tiff-4.0.3.orig/tools/tiff2pdf.c 2012-07-25 22:56:43.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2pdf.c 2013-05-02 12:02:42.788287983 -0400 +@@ -3609,7 +3609,9 @@ + char buffer[16]; + int buflen=0; + +- buflen=sprintf(buffer, "%%PDF-%u.%u ", t2p->pdf_majorversion&0xff, t2p->pdf_minorversion&0xff); ++ buflen = snprintf(buffer, sizeof(buffer), "%%PDF-%u.%u ", ++ t2p->pdf_majorversion&0xff, ++ t2p->pdf_minorversion&0xff); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t)"\n%\342\343\317\323\n", 7); + +@@ -3623,10 +3625,10 @@ + tsize_t t2p_write_pdf_obj_start(uint32 number, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + +- buflen=sprintf(buffer, "%lu", (unsigned long)number); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number); + written += t2pWriteFile(output, (tdata_t) buffer, buflen ); + written += t2pWriteFile(output, (tdata_t) " 0 obj\n", 7); + +@@ -3665,13 +3667,13 @@ + written += t2pWriteFile(output, (tdata_t) "/", 1); + for (i=0;i<namelen;i++){ + if ( ((unsigned char)name[i]) < 0x21){ +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + nextchar=1; + } + if ( ((unsigned char)name[i]) > 0x7E){ +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + nextchar=1; +@@ -3679,57 +3681,57 @@ + if (nextchar==0){ + switch (name[i]){ + case 0x23: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x25: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x28: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x29: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x2F: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x3C: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x3E: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x5B: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x5D: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x7B: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x7D: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; +@@ -3844,14 +3846,14 @@ + tsize_t t2p_write_pdf_stream_dict(tsize_t len, uint32 number, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "/Length ", 8); + if(len!=0){ + written += t2p_write_pdf_stream_length(len, output); + } else { +- buflen=sprintf(buffer, "%lu", (unsigned long)number); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + } +@@ -3892,10 +3894,10 @@ + tsize_t t2p_write_pdf_stream_length(tsize_t len, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + +- buflen=sprintf(buffer, "%lu", (unsigned long)len); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)len); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n", 1); + +@@ -3909,7 +3911,7 @@ + tsize_t t2p_write_pdf_catalog(T2P* t2p, TIFF* output) + { + tsize_t written = 0; +- char buffer[16]; ++ char buffer[32]; + int buflen = 0; + + written += t2pWriteFile(output, +@@ -3948,7 +3950,6 @@ + written += t2p_write_pdf_string(t2p->pdf_datetime, output); + } + written += t2pWriteFile(output, (tdata_t) "\n/Producer ", 11); +- _TIFFmemset((tdata_t)buffer, 0x00, sizeof(buffer)); + snprintf(buffer, sizeof(buffer), "libtiff / tiff2pdf - %d", TIFFLIB_VERSION); + written += t2p_write_pdf_string(buffer, output); + written += t2pWriteFile(output, (tdata_t) "\n", 1); +@@ -4089,7 +4090,7 @@ + { + tsize_t written=0; + tdir_t i=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + int page=0; +@@ -4097,7 +4098,7 @@ + (tdata_t) "<< \n/Type /Pages \n/Kids [ ", 26); + page = t2p->pdf_pages+1; + for (i=0;i<t2p->tiff_pagecount;i++){ +- buflen=sprintf(buffer, "%d", page); ++ buflen=snprintf(buffer, sizeof(buffer), "%d", page); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); + if ( ((i+1)%8)==0 ) { +@@ -4112,8 +4113,7 @@ + } + } + written += t2pWriteFile(output, (tdata_t) "] \n/Count ", 10); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%d", t2p->tiff_pagecount); ++ buflen=snprintf(buffer, sizeof(buffer), "%d", t2p->tiff_pagecount); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " \n>> \n", 6); + +@@ -4128,28 +4128,28 @@ + + unsigned int i=0; + tsize_t written=0; +- char buffer[16]; ++ char buffer[256]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "<<\n/Type /Page \n/Parent ", 24); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_pages); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + written += t2pWriteFile(output, (tdata_t) "/MediaBox [", 11); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x1); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y1); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x2); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x2); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y2); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y2); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "] \n", 3); + written += t2pWriteFile(output, (tdata_t) "/Contents ", 10); +- buflen=sprintf(buffer, "%lu", (unsigned long)(object + 1)); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(object + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + written += t2pWriteFile(output, (tdata_t) "/Resources << \n", 15); +@@ -4157,15 +4157,13 @@ + written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12); + for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount;i++){ + written += t2pWriteFile(output, (tdata_t) "/Im", 3); +- buflen = sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "_", 1); +- buflen = sprintf(buffer, "%u", i+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", i+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4177,12 +4175,10 @@ + } else { + written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12); + written += t2pWriteFile(output, (tdata_t) "/Im", 3); +- buflen = sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4191,9 +4187,7 @@ + if(t2p->tiff_transferfunctioncount != 0) { + written += t2pWriteFile(output, (tdata_t) "/ExtGState <<", 13); + t2pWriteFile(output, (tdata_t) "/GS1 ", 5); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object + 3)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4566,7 +4560,7 @@ + if(t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount>0){ + for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount; i++){ + box=t2p->tiff_tiles[t2p->pdf_page].tiles_tiles[i].tile_box; +- buflen=sprintf(buffer, ++ buflen=snprintf(buffer, sizeof(buffer), + "q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d_%ld Do Q\n", + t2p->tiff_transferfunctioncount?"/GS1 gs ":"", + box.mat[0], +@@ -4581,7 +4575,7 @@ + } + } else { + box=t2p->pdf_imagebox; +- buflen=sprintf(buffer, ++ buflen=snprintf(buffer, sizeof(buffer), + "q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d Do Q\n", + t2p->tiff_transferfunctioncount?"/GS1 gs ":"", + box.mat[0], +@@ -4606,59 +4600,48 @@ + TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2p_write_pdf_stream_dict(0, t2p->pdf_xrefcount+1, output); + written += t2pWriteFile(output, + (tdata_t) "/Type /XObject \n/Subtype /Image \n/Name /Im", + 42); +- buflen=sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + if(tile != 0){ + written += t2pWriteFile(output, (tdata_t) "_", 1); +- buflen=sprintf(buffer, "%lu", (unsigned long)tile); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)tile); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } + written += t2pWriteFile(output, (tdata_t) "\n/Width ", 8); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); + if(tile==0){ +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_width); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_width); + } else { + if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){ +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); + } else { +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); + } + } + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/Height ", 9); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); + if(tile==0){ +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_length); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_length); + } else { + if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){ +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); + } else { +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); + } + } + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/BitsPerComponent ", 19); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/ColorSpace ", 13); + written += t2p_write_pdf_xobject_cs(t2p, output); +@@ -4702,11 +4685,10 @@ + t2p->pdf_colorspace ^= T2P_CS_PALETTE; + written += t2p_write_pdf_xobject_cs(t2p, output); + t2p->pdf_colorspace |= T2P_CS_PALETTE; +- buflen=sprintf(buffer, "%u", (0x0001 << t2p->tiff_bitspersample)-1 ); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", (0x0001 << t2p->tiff_bitspersample)-1 ); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_palettecs ); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_palettecs ); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ]\n", 7); + return(written); +@@ -4740,10 +4722,10 @@ + X_W /= Y_W; + Z_W /= Y_W; + Y_W = 1.0F; +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Range ", 7); +- buflen=sprintf(buffer, "[%d %d %d %d] \n", ++ buflen=snprintf(buffer, sizeof(buffer), "[%d %d %d %d] \n", + t2p->pdf_labrange[0], + t2p->pdf_labrange[1], + t2p->pdf_labrange[2], +@@ -4759,26 +4741,26 @@ + tsize_t t2p_write_pdf_transfer(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "<< /Type /ExtGState \n/TR ", 25); + if(t2p->tiff_transferfunctioncount == 1){ +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); + } else { + written += t2pWriteFile(output, (tdata_t) "[ ", 2); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 2)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 3)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4800,7 +4782,7 @@ + written += t2pWriteFile(output, (tdata_t) "/FunctionType 0 \n", 17); + written += t2pWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \n", 19); + written += t2pWriteFile(output, (tdata_t) "/Range [0.0 1.0] \n", 18); +- buflen=sprintf(buffer, "/Size [%u] \n", (1<<t2p->tiff_bitspersample)); ++ buflen=snprintf(buffer, sizeof(buffer), "/Size [%u] \n", (1<<t2p->tiff_bitspersample)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/BitsPerSample 16 \n", 19); + written += t2p_write_pdf_stream_dict(((tsize_t)1)<<(t2p->tiff_bitspersample+1), 0, output); +@@ -4827,7 +4809,7 @@ + tsize_t t2p_write_pdf_xobject_calcs(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[128]; ++ char buffer[256]; + int buflen=0; + + float X_W=0.0; +@@ -4895,16 +4877,16 @@ + written += t2pWriteFile(output, (tdata_t) "<< \n", 4); + if(t2p->pdf_colorspace & T2P_CS_CALGRAY){ + written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Gamma 2.2 \n", 12); + } + if(t2p->pdf_colorspace & T2P_CS_CALRGB){ + written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Matrix ", 8); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", + X_R, Y_R, Z_R, + X_G, Y_G, Z_G, + X_B, Y_B, Z_B); +@@ -4923,11 +4905,11 @@ + tsize_t t2p_write_pdf_xobject_icccs(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "[/ICCBased ", 11); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_icccs); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_icccs); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R] \n", 7); + +@@ -4937,11 +4919,11 @@ + tsize_t t2p_write_pdf_xobject_icccs_dict(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "/N ", 3); +- buflen=sprintf(buffer, "%u \n", t2p->tiff_samplesperpixel); ++ buflen=snprintf(buffer, sizeof(buffer), "%u \n", t2p->tiff_samplesperpixel); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Alternate ", 11); + t2p->pdf_colorspace ^= T2P_CS_ICCBASED; +@@ -5006,7 +4988,7 @@ + tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t tile, T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + if(t2p->pdf_compression==T2P_COMPRESS_NONE){ +@@ -5021,41 +5003,33 @@ + written += t2pWriteFile(output, (tdata_t) "<< /K -1 ", 9); + if(tile==0){ + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_width); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_length); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } + if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } +@@ -5082,21 +5056,17 @@ + if(t2p->pdf_compressionquality%100){ + written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13); + written += t2pWriteFile(output, (tdata_t) "<< /Predictor ", 14); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->pdf_compressionquality%100); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_compressionquality%100); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Columns ", 10); +- _TIFFmemset(buffer, 0x00, 16); +- buflen = sprintf(buffer, "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_width); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Colors ", 9); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_samplesperpixel); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_samplesperpixel); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /BitsPerComponent ", 19); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) ">>\n", 3); + } +@@ -5116,16 +5086,16 @@ + tsize_t t2p_write_pdf_xreftable(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[21]; ++ char buffer[64]; + int buflen=0; + uint32 i=0; + + written += t2pWriteFile(output, (tdata_t) "xref\n0 ", 7); +- buflen=sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " \n0000000000 65535 f \n", 22); + for (i=0;i<t2p->pdf_xrefcount;i++){ +- sprintf(buffer, "%.10lu 00000 n \n", ++ snprintf(buffer, sizeof(buffer), "%.10lu 00000 n \n", + (unsigned long)t2p->pdf_xrefoffsets[i]); + written += t2pWriteFile(output, (tdata_t) buffer, 20); + } +@@ -5149,17 +5119,14 @@ + snprintf(t2p->pdf_fileid + i, 9, "%.8X", rand()); + + written += t2pWriteFile(output, (tdata_t) "trailer\n<<\n/Size ", 17); +- buflen = sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount+1)); ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount+1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) "\n/Root ", 7); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_catalog); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_catalog); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) " 0 R \n/Info ", 12); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_info); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_info); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) " 0 R \n/ID[<", 11); + written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, + sizeof(t2p->pdf_fileid) - 1); +@@ -5167,9 +5134,8 @@ + written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, + sizeof(t2p->pdf_fileid) - 1); + written += t2pWriteFile(output, (tdata_t) ">]\n>>\nstartxref\n", 16); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_startxref); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_startxref); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) "\n%%EOF\n", 7); + + return(written); +diff -Naur tiff-4.0.3.orig/tools/tiff2ps.c tiff-4.0.3/tools/tiff2ps.c +--- tiff-4.0.3.orig/tools/tiff2ps.c 2011-05-31 13:10:18.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2ps.c 2013-05-02 12:02:42.789287990 -0400 +@@ -1781,8 +1781,8 @@ + imageOp = "imagemask"; + + (void)strcpy(im_x, "0"); +- (void)sprintf(im_y, "%lu", (long) h); +- (void)sprintf(im_h, "%lu", (long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu", (long) h); ++ (void)snprintf(im_h, sizeof(im_h), "%lu", (long) h); + tile_width = w; + tile_height = h; + if (TIFFIsTiled(tif)) { +@@ -1803,7 +1803,7 @@ + } + if (tile_height < h) { + fputs("/im_y 0 def\n", fd); +- (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); + } + } else { + repeat_count = tf_numberstrips; +@@ -1815,7 +1815,7 @@ + fprintf(fd, "/im_h %lu def\n", + (unsigned long) tile_height); + (void)strcpy(im_h, "im_h"); +- (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); + } + } + +diff -Naur tiff-4.0.3.orig/tools/tiffcrop.c tiff-4.0.3/tools/tiffcrop.c +--- tiff-4.0.3.orig/tools/tiffcrop.c 2010-12-14 09:18:28.000000000 -0500 ++++ tiff-4.0.3/tools/tiffcrop.c 2013-05-02 12:02:42.791288005 -0400 +@@ -2077,7 +2077,7 @@ + return 1; + } + +- sprintf (filenum, "-%03d%s", findex, export_ext); ++ snprintf(filenum, sizeof(filenum), "-%03d%s", findex, export_ext); + filenum[14] = '\0'; + strncat (exportname, filenum, 15); + } +@@ -2230,8 +2230,8 @@ + + /* dump.infilename is guaranteed to be NUL termimated and have 20 bytes + fewer than PATH_MAX */ +- memset (temp_filename, '\0', PATH_MAX + 1); +- sprintf (temp_filename, "%s-read-%03d.%s", dump.infilename, dump_images, ++ snprintf(temp_filename, sizeof(temp_filename), "%s-read-%03d.%s", ++ dump.infilename, dump_images, + (dump.format == DUMP_TEXT) ? "txt" : "raw"); + if ((dump.infile = fopen(temp_filename, dump.mode)) == NULL) + { +@@ -2249,8 +2249,8 @@ + + /* dump.outfilename is guaranteed to be NUL termimated and have 20 bytes + fewer than PATH_MAX */ +- memset (temp_filename, '\0', PATH_MAX + 1); +- sprintf (temp_filename, "%s-write-%03d.%s", dump.outfilename, dump_images, ++ snprintf(temp_filename, sizeof(temp_filename), "%s-write-%03d.%s", ++ dump.outfilename, dump_images, + (dump.format == DUMP_TEXT) ? "txt" : "raw"); + if ((dump.outfile = fopen(temp_filename, dump.mode)) == NULL) + { +diff -Naur tiff-4.0.3.orig/tools/tiffdither.c tiff-4.0.3/tools/tiffdither.c +--- tiff-4.0.3.orig/tools/tiffdither.c 2010-03-10 13:56:50.000000000 -0500 ++++ tiff-4.0.3/tools/tiffdither.c 2013-05-02 12:02:42.792288013 -0400 +@@ -260,7 +260,7 @@ + TIFFSetField(out, TIFFTAG_FILLORDER, fillorder); + else + CopyField(TIFFTAG_FILLORDER, shortv); +- sprintf(thing, "Dithered B&W version of %s", argv[optind]); ++ snprintf(thing, sizeof(thing), "Dithered B&W version of %s", argv[optind]); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing); + CopyField(TIFFTAG_PHOTOMETRIC, shortv); + CopyField(TIFFTAG_ORIENTATION, shortv); diff --git a/abs/core/libtiff/tiff-4.0.3-CVE-2013-4231.patch b/abs/core/libtiff/tiff-4.0.3-CVE-2013-4231.patch new file mode 100644 index 0000000..3c21718 --- /dev/null +++ b/abs/core/libtiff/tiff-4.0.3-CVE-2013-4231.patch @@ -0,0 +1,18 @@ +Index: gif2tiff.c +=================================================================== +RCS file: /cvs/maptools/cvsroot/libtiff/tools/gif2tiff.c,v +retrieving revision 1.12 +diff -u -r1.12 gif2tiff.c +--- gif2tiff.c 15 Dec 2010 00:22:44 -0000 1.12 ++++ gif2tiff.c 13 Aug 2013 08:25:38 -0000 +@@ -333,6 +333,10 @@ + int status = 1; + + datasize = getc(infile); ++ ++ if (datasize > 12) ++ return 0; ++ + clear = 1 << datasize; + eoi = clear + 1; + avail = clear + 2; diff --git a/abs/core/libtiff/tiff-4.0.3-CVE-2013-4232.patch b/abs/core/libtiff/tiff-4.0.3-CVE-2013-4232.patch new file mode 100644 index 0000000..87673d9 --- /dev/null +++ b/abs/core/libtiff/tiff-4.0.3-CVE-2013-4232.patch @@ -0,0 +1,15 @@ +Index: tiff2pdf.c +=================================================================== +RCS file: /cvs/maptools/cvsroot/libtiff/tools/tiff2pdf.c,v +retrieving revision 1.71 +diff -u -r1.71 tiff2pdf.c +--- tiff2pdf.c 2 May 2013 14:54:08 -0000 1.71 ++++ tiff2pdf.c 13 Aug 2013 04:45:40 -0000 +@@ -2462,6 +2462,7 @@ + TIFFFileName(input)); + t2p->t2p_error = T2P_ERR_ERROR; + _TIFFfree(buffer); ++ return(0); + } else { + buffer=samplebuffer; + t2p->tiff_datasize *= t2p->tiff_samplesperpixel; diff --git a/abs/core/libtiff/tiff-4.0.3-libjpeg-turbo.patch b/abs/core/libtiff/tiff-4.0.3-libjpeg-turbo.patch new file mode 100644 index 0000000..92cff7e --- /dev/null +++ b/abs/core/libtiff/tiff-4.0.3-libjpeg-turbo.patch @@ -0,0 +1,122 @@ +Back-port upstream patch to avoid assuming quite so much about what libjpeg +will return. Needed because libjpeg-turbo with the jpeg8 API broke the +expectations of the previous coding. + + +diff -Naur tiff-4.0.3.orig/test/raw_decode.c tiff-4.0.3/test/raw_decode.c +--- tiff-4.0.3.orig/test/raw_decode.c 2012-07-06 13:05:16.000000000 -0400 ++++ tiff-4.0.3/test/raw_decode.c 2012-12-19 13:04:37.609738276 -0500 +@@ -71,33 +71,54 @@ + return 1; + } + +-static int check_rgb_pixel( int pixel, int red, int green, int blue, unsigned char *buffer ) { ++static int check_rgb_pixel( int pixel, ++ int min_red, int max_red, ++ int min_green, int max_green, ++ int min_blue, int max_blue, ++ unsigned char *buffer ) { + unsigned char *rgb = buffer + 3 * pixel; + +- if( rgb[0] == red && rgb[1] == green && rgb[2] == blue ) { ++ if( rgb[0] >= min_red && rgb[0] <= max_red && ++ rgb[1] >= min_green && rgb[1] <= max_green && ++ rgb[2] >= min_blue && rgb[2] <= max_blue ) { + return 0; + } + + fprintf( stderr, "Pixel %d did not match expected results.\n", pixel ); +- fprintf( stderr, "Expect: %3d %3d %3d\n", red, green, blue ); +- fprintf( stderr, " Got: %3d %3d %3d\n", rgb[0], rgb[1], rgb[2] ); ++ fprintf( stderr, "Got R=%d (expected %d..%d), G=%d (expected %d..%d), B=%d (expected %d..%d)\n", ++ rgb[0], min_red, max_red, ++ rgb[1], min_green, max_green, ++ rgb[2], min_blue, max_blue ); + return 1; + } + +-static int check_rgba_pixel( int pixel, int red, int green, int blue, int alpha, uint32 *buffer ) { ++static int check_rgba_pixel( int pixel, ++ int min_red, int max_red, ++ int min_green, int max_green, ++ int min_blue, int max_blue, ++ int min_alpha, int max_alpha, ++ uint32 *buffer ) { + /* RGBA images are upside down - adjust for normal ordering */ + int adjusted_pixel = pixel % 128 + (127 - (pixel/128)) * 128; + uint32 rgba = buffer[adjusted_pixel]; + +- if( TIFFGetR(rgba) == (uint32) red && TIFFGetG(rgba) == (uint32) green && +- TIFFGetB(rgba) == (uint32) blue && TIFFGetA(rgba) == (uint32) alpha ) { ++ if( TIFFGetR(rgba) >= (uint32) min_red && ++ TIFFGetR(rgba) <= (uint32) max_red && ++ TIFFGetG(rgba) >= (uint32) min_green && ++ TIFFGetG(rgba) <= (uint32) max_green && ++ TIFFGetB(rgba) >= (uint32) min_blue && ++ TIFFGetB(rgba) <= (uint32) max_blue && ++ TIFFGetA(rgba) >= (uint32) min_alpha && ++ TIFFGetA(rgba) <= (uint32) max_alpha ) { + return 0; + } + + fprintf( stderr, "Pixel %d did not match expected results.\n", pixel ); +- fprintf( stderr, "Expect: %3d %3d %3d %3d\n", red, green, blue, alpha ); +- fprintf( stderr, " Got: %3d %3d %3d %3d\n", +- TIFFGetR(rgba), TIFFGetG(rgba), TIFFGetB(rgba), TIFFGetA(rgba) ); ++ fprintf( stderr, "Got R=%d (expected %d..%d), G=%d (expected %d..%d), B=%d (expected %d..%d), A=%d (expected %d..%d)\n", ++ TIFFGetR(rgba), min_red, max_red, ++ TIFFGetG(rgba), min_green, max_green, ++ TIFFGetB(rgba), min_blue, max_blue, ++ TIFFGetA(rgba), min_alpha, max_alpha ); + return 1; + } + +@@ -191,15 +212,17 @@ + return 1; + } + +-#if JPEG_LIB_VERSION >= 70 +- pixel_status |= check_rgb_pixel( 0, 18, 0, 41, buffer ); +- pixel_status |= check_rgb_pixel( 64, 0, 0, 0, buffer ); +- pixel_status |= check_rgb_pixel( 512, 5, 34, 196, buffer ); +-#else +- pixel_status |= check_rgb_pixel( 0, 15, 0, 18, buffer ); +- pixel_status |= check_rgb_pixel( 64, 0, 0, 2, buffer ); +- pixel_status |= check_rgb_pixel( 512, 6, 36, 182, buffer ); +-#endif ++ /* ++ * JPEG decoding is inherently inexact, so we can't test for exact ++ * pixel values. (Well, if we knew exactly which libjpeg version ++ * we were using, and with what settings, we could expect specific ++ * values ... but it's not worth the trouble to keep track of.) ++ * Hence, use ranges of expected values. The ranges may need to be ++ * widened over time as more versions of libjpeg appear. ++ */ ++ pixel_status |= check_rgb_pixel( 0, 15, 18, 0, 0, 18, 41, buffer ); ++ pixel_status |= check_rgb_pixel( 64, 0, 0, 0, 0, 0, 2, buffer ); ++ pixel_status |= check_rgb_pixel( 512, 5, 6, 34, 36, 182, 196, buffer ); + + free( buffer ); + +@@ -224,15 +247,12 @@ + * accomplish it from the YCbCr subsampled buffer ourselves in which + * case the results may be subtly different but similar. + */ +-#if JPEG_LIB_VERSION >= 70 +- pixel_status |= check_rgba_pixel( 0, 18, 0, 41, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 64, 0, 0, 0, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 512, 5, 34, 196, 255, rgba_buffer ); +-#else +- pixel_status |= check_rgba_pixel( 0, 15, 0, 18, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 64, 0, 0, 2, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 512, 6, 36, 182, 255, rgba_buffer ); +-#endif ++ pixel_status |= check_rgba_pixel( 0, 15, 18, 0, 0, 18, 41, 255, 255, ++ rgba_buffer ); ++ pixel_status |= check_rgba_pixel( 64, 0, 0, 0, 0, 0, 2, 255, 255, ++ rgba_buffer ); ++ pixel_status |= check_rgba_pixel( 512, 5, 6, 34, 36, 182, 196, 255, 255, ++ rgba_buffer ); + + free( rgba_buffer ); + TIFFClose(tif); diff --git a/abs/core/libtiff/tiff-4.0.3-tiff2pdf-colors.patch b/abs/core/libtiff/tiff-4.0.3-tiff2pdf-colors.patch new file mode 100644 index 0000000..a503444 --- /dev/null +++ b/abs/core/libtiff/tiff-4.0.3-tiff2pdf-colors.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/145055 + +http://build.opensuse.org/package/view_file?file=tiff-4.0.2-tiff2pdf-colors.patch&package=tiff&project=openSUSE%3AFactory + +--- tools/tiff2pdf.c ++++ tools/tiff2pdf.c +@@ -4991,7 +4991,7 @@ + + if(t2p->tiff_photometric != PHOTOMETRIC_YCBCR) { + written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13); +- written += t2pWriteFile(output, (tdata_t) "<< /ColorTransform 0 >>\n", 24); ++ written += t2pWriteFile(output, (tdata_t) "<< /ColorTransform 1 >>\n", 24); + } + break; + #endif diff --git a/abs/core/libtool/PKGBUILD b/abs/core/libtool/PKGBUILD index ce5c272..493c799 100644 --- a/abs/core/libtool/PKGBUILD +++ b/abs/core/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168333 2012-10-08 22:50:22Z allan $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,15 +6,17 @@ pkgname=('libtool' 'libltdl') pkgver=2.4.2 -pkgrel=7 +_gccver=4.9.2 +pkgrel=15 pkgdesc="A generic library support script" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libtool" license=('GPL') -options=('!libtool') +makedepends=("gcc=${_gccver}") source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig}) md5sums=('2ec8997e0c07249eb4cbd072417d70fe' '1e6ba57420c82c663c85e745d11c7eed') +validpgpkeys=('CFE2BE707B538E8B26757D84151308092983D606') build() { cd ${srcdir}/${pkgbase}-${pkgver} @@ -28,7 +30,7 @@ check() { } package_libtool() { - depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.7.2') + depends=('sh' "libltdl=$pkgver" 'tar' "gcc=${_gccver}") groups=('base-devel') install=libtool.install @@ -36,7 +38,7 @@ package_libtool() { make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \ install-data-local - rm -rf ${pkgdir}/usr/share/libtool/libltdl/ + rm -r ${pkgdir}/usr/share/libtool/libltdl/ } package_libltdl() { @@ -45,5 +47,5 @@ package_libltdl() { cd ${srcdir}/${pkgbase}-${pkgver} make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \ install-ltdlincludeHEADERS install-data-local - rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config} + rm -r ${pkgdir}/usr/share/{aclocal,libtool/config} } diff --git a/abs/core/libvdpau/PKGBUILD b/abs/core/libvdpau/PKGBUILD index f215b3c..911d3e4 100644 --- a/abs/core/libvdpau/PKGBUILD +++ b/abs/core/libvdpau/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libvdpau -pkgver=0.7 +pkgver=0.8 pkgrel=1 pkgdesc="Nvidia VDPAU library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ conflicts=('nvidia-utils<190.42-2') license=('custom') source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz) makedepends=('dri2proto') -sha256sums=('24dc08467ce8c59d6cfbf0d34d2dd1f86b4ff62e90777e0a8f513c5c9de9bce0') +sha256sums=('73a7d11cc1abed8bcaf1392bd361fc00fd43bd85bbeafb12a64bdd0bcb4101ed') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/abs/core/libx11/PKGBUILD b/abs/core/libx11/PKGBUILD index dfee942..4e34502 100644 --- a/abs/core/libx11/PKGBUILD +++ b/abs/core/libx11/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 160633 2012-06-02 21:43:25Z andyrtr $ +# $Id$ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.5.0 -pkgrel=1 +pkgver=1.6.2 +pkgrel=2 pkgdesc="X11 client-side library" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" depends=('libxcb' 'xproto' 'kbproto') makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto') -options=('!libtool') license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 - xorg.sh - xorg.csh) -sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86' - '1a1b5db0320579958fba24774bae7984a1b1b8c647ac6fbd4d8937178c48ed46' - '96c85ccbdcb056540f2e2b6cf48dea067f80260c16957ee401c49cf94cea5894') + fix_typo.diff) +sha256sums=('2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16' + '384a10e57e0d6125ebb7e6eaca046e02f59e8101eaa7ba470e52b5bcc18bedf3') + +prepare() { + cd "${srcdir}/libX11-${pkgver}" + # upstream patch for https://bugs.archlinux.org/task/40537 + patch -Np1 -i ${srcdir}/fix_typo.diff +} build() { cd "${srcdir}/libX11-${pkgver}" @@ -24,7 +28,7 @@ build() { make } -package() { +check() { cd "${srcdir}/libX11-${pkgver}" make check } @@ -33,9 +37,6 @@ package() { cd "${srcdir}/libX11-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/profile.d" - install -m755 "${srcdir}/"xorg.{sh,csh} "${pkgdir}/etc/profile.d/" - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/libx11/fix_typo.diff b/abs/core/libx11/fix_typo.diff new file mode 100644 index 0000000..a55a940 --- /dev/null +++ b/abs/core/libx11/fix_typo.diff @@ -0,0 +1,27 @@ +From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001 +From: James Cloos <cloos@jhcloos.com> +Date: Tue, 17 Sep 2013 16:50:42 +0000 +Subject: nls/en_US.UTF-8/Compose.pre: Fix typo. + +Fix typo added in 215ce6a67863, s/actute/acute/. + +Fixes bug #69476. Reported by Jean Krohn. + +Signed-off-by: James Cloos <cloos@jhcloos.com> +--- +diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre +index a741332..7314d7f 100644 +--- a/nls/en_US.UTF-8/Compose.pre ++++ b/nls/en_US.UTF-8/Compose.pre +@@ -743,7 +743,7 @@ XCOMM Part 3 + <Multi_key> <i> <quotedbl> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS + <Multi_key> <diaeresis> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS + <Multi_key> <i> <diaeresis> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS +-<dead_actute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 ++<dead_acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + <Multi_key> <apostrophe> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + <Multi_key> <j> <apostrophe> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + <Multi_key> <acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 +-- +cgit v0.9.0.2-2-gbebe + diff --git a/abs/core/libx11/xorg.csh b/abs/core/libx11/xorg.csh deleted file mode 100644 index 39d5a97..0000000 --- a/abs/core/libx11/xorg.csh +++ /dev/null @@ -1,15 +0,0 @@ -setenv XDG_DATA_HOME ${HOME}/.local/share -setenv XDG_CONFIG_HOME ${HOME}/.config -setenv XDG_CACHE_HOME ${HOME}/.cache - -if (! ($?XDG_DATA_DIRS) ) then - setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/ -else - setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/:${XDG_DATA_DIRS} -endif - -if (! ($?XDG_CONFIG_DIRS) ) then - setenv XDG_CONFIG_DIRS /etc/xdg -else - setenv XDG_CONFIG_DIRS /etc/xdg:${XDG_CONFIG_DIRS} -endif diff --git a/abs/core/libx11/xorg.sh b/abs/core/libx11/xorg.sh deleted file mode 100644 index 4fc02e3..0000000 --- a/abs/core/libx11/xorg.sh +++ /dev/null @@ -1,15 +0,0 @@ -export XDG_DATA_HOME=$HOME/.local/share -export XDG_CONFIG_HOME=$HOME/.config -export XDG_CACHE_HOME=$HOME/.cache - -if [ -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=/usr/local/share/:/usr/share/ -else - export XDG_DATA_DIRS=/usr/local/share/:/usr/share/:$XDG_DATA_DIRS -fi - -if [ -z $XDG_CONFIG_DIRS ]; then - export XDG_CONFIG_DIRS=/etc/xdg -else - export XDG_CONFIG_DIRS=/etc/xdg:$XDG_CONFIG_DIRS -fi diff --git a/abs/core/libxaw/PKGBUILD b/abs/core/libxaw/PKGBUILD index 687aaea..201d7a2 100644 --- a/abs/core/libxaw/PKGBUILD +++ b/abs/core/libxaw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160631 2012-06-02 21:31:52Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxaw -pkgver=1.0.11 +pkgver=1.0.12 pkgrel=1 pkgdesc="X11 Athena Widget library" arch=('i686' 'x86_64') @@ -10,9 +10,8 @@ license=('custom') url="http://xorg.freedesktop.org/" depends=('libxmu' 'libxpm') makedepends=('xorg-util-macros') -options=('!libtool') source=(${url}/releases/individual/lib/libXaw-${pkgver}.tar.bz2) -sha256sums=('87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492') +sha256sums=('96fc314874fce9979556321d1d6ee00b5baf32fb333b7278853b4983bc3cdbf6') build() { cd "${srcdir}/libXaw-${pkgver}" diff --git a/abs/core/libxcb/PKGBUILD b/abs/core/libxcb/PKGBUILD index 990dbe8..126d0a8 100644 --- a/abs/core/libxcb/PKGBUILD +++ b/abs/core/libxcb/PKGBUILD @@ -4,18 +4,18 @@ # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb -pkgver=1.10 +pkgver=1.11 pkgrel=1 pkgdesc="X11 client-side library" arch=('i686' 'x86_64') url="http://xcb.freedesktop.org/" -depends=('xcb-proto>=1.10' 'libxdmcp' 'libxau') -makedepends=('pkgconfig' 'libxslt' 'python2') +depends=('xcb-proto>=1.11' 'libxdmcp' 'libxau') +makedepends=('libxslt' 'python2' 'xorg-util-macros') license=('custom') source=($url/dist/$pkgname-$pkgver.tar.bz2 libxcb-1.1-no-pthread-stubs.patch) -sha256sums=('98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5' - '748ed83af60468a0eb6785222e4a5ca589d28f20b9bfc60d5936ec93b8eef356') +sha256sums=('03635d70045b9ede90778e67516135828a57de87ac508f987024f43c03620ff7' + '3923bcb1930b851012968435909597d8d5251c72153511cb2982636c97100cc3') prepare() { cd "$pkgname-$pkgver" diff --git a/abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch b/abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch index 52c22ab..84c7f8e 100644 --- a/abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch +++ b/abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch @@ -3,7 +3,7 @@ @@ -43,7 +43,7 @@ # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.10) + PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.11) -NEEDED="pthread-stubs xau >= 0.99.2" +NEEDED="xau >= 0.99.2" PKG_CHECK_MODULES(NEEDED, $NEEDED) diff --git a/abs/core/libxcomposite/PKGBUILD b/abs/core/libxcomposite/PKGBUILD index 23cec88..fe036c7 100644 --- a/abs/core/libxcomposite/PKGBUILD +++ b/abs/core/libxcomposite/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 151410 2012-02-26 10:37:09Z pierre $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxcomposite -pkgver=0.4.3 +pkgver=0.4.4 pkgrel=2 pkgdesc="X11 Composite extension library" arch=('i686' 'x86_64') @@ -10,18 +10,17 @@ url="http://xorg.freedesktop.org/" license=('custom') depends=('libxfixes' 'compositeproto') makedepends=('xorg-util-macros') -options=('!libtool') source=("${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2") -sha1sums=('081b26b556d55e20d7956c80a2ea2854962aecec') +sha256sums=('ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178') build() { - cd "${srcdir}/libXcomposite-${pkgver}" + cd libXcomposite-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } package() { - cd "${srcdir}/libXcomposite-${pkgver}" + cd libXcomposite-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/abs/core/libxft/PKGBUILD b/abs/core/libxft/PKGBUILD index b38f5ee..cd6e547 100644 --- a/abs/core/libxft/PKGBUILD +++ b/abs/core/libxft/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 160629 2012-06-02 21:27:53Z andyrtr $ +# $Id$ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxft -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="FreeType-based font drawing library for X" arch=('i686' 'x86_64') @@ -10,9 +11,8 @@ license=('custom') url="http://xorg.freedesktop.org/" depends=('fontconfig' 'libxrender') makedepends=('pkgconfig') -options=('!libtool') -source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2") -sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd') +source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2) +sha256sums=('f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c') build() { cd "${srcdir}/libXft-${pkgver}" diff --git a/abs/core/libxinerama/PKGBUILD b/abs/core/libxinerama/PKGBUILD index 043cf6f..a50178d 100644 --- a/abs/core/libxinerama/PKGBUILD +++ b/abs/core/libxinerama/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 152778 2012-03-09 16:15:35Z andyrtr $ +# $Id$ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxinerama -pkgver=1.1.2 -pkgrel=1 +pkgver=1.1.3 +pkgrel=2 pkgdesc="X11 Xinerama extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxext' 'xineramaproto') makedepends=('xorg-util-macros') -options=('!libtool') source=("${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2") -sha1sums=('06a5b636305725ce09f6c3a4d5a15f2f188b5afd') +sha256sums=('7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2') build() { - cd "${srcdir}/libXinerama-${pkgver}" + cd libXinerama-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/libXinerama-${pkgver}" + cd libXinerama-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/abs/core/libxml2/PKGBUILD b/abs/core/libxml2/PKGBUILD index 58c4756..0949823 100644 --- a/abs/core/libxml2/PKGBUILD +++ b/abs/core/libxml2/PKGBUILD @@ -1,38 +1,48 @@ -# $Id: PKGBUILD 165211 2012-08-13 09:09:13Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: John Proctor <jproctor@prium.net> pkgname=libxml2 -pkgver=2.8.0 -pkgrel=1 +pkgver=2.9.2 +pkgrel=2 pkgdesc="XML parsing library, version 2" arch=(i686 x86_64) -license=('custom') -depends=('zlib>=1.2.4' 'readline>=6.1' 'ncurses>=5.7' 'xz') +license=('MIT') +depends=('zlib' 'readline' 'ncurses' 'xz') makedepends=('python2') -options=('!libtool') +optdepends=('python2: python bindings to libxml') url="http://www.xmlsoft.org/" source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz - http://www.w3.org/XML/Test/xmlts20080205.tar.gz) -md5sums=('c62106f02ee00b6437f0fb9d370c1093' - 'b255be9a1c7f7021e52448e4ec8d7a0d') + http://www.w3.org/XML/Test/xmlts20080827.tar.gz + revert-catalog-initialize.patch + fix-CVE-2014-3660.patch) +md5sums=('9e6a9aca9d155737868b3dc5fd82f788' + 'ae3d1ebe000a3972afa104ca7f0e1b4a' + 'fdb2e26174ac9cced85ffbf4fb782187' + '71c88ee5a133461a8ab8aaa194899453') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py - ./configure --prefix=/usr --with-threads --with-history \ - --with-python=/usr/bin/python2 + mv ../xmlconf . + patch -Np1 -i ../revert-catalog-initialize.patch + patch -Np1 -i ../fix-CVE-2014-3660.patch +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python2 make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" - mv "${srcdir}/xmlconf" . + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/libxml2/fix-CVE-2014-3660.patch b/abs/core/libxml2/fix-CVE-2014-3660.patch new file mode 100644 index 0000000..9e6441c --- /dev/null +++ b/abs/core/libxml2/fix-CVE-2014-3660.patch @@ -0,0 +1,28 @@ +From 72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard@redhat.com> +Date: Thu, 23 Oct 2014 11:35:36 +0800 +Subject: Fix missing entities after CVE-2014-3660 fix + +For https://bugzilla.gnome.org/show_bug.cgi?id=738805 + +The fix for CVE-2014-3660 introduced a regression in some case +where entity substitution is required and the entity is used +first in anotther entity referenced from an attribute value + +diff --git a/parser.c b/parser.c +index 67c9dfd..a8d1b67 100644 +--- a/parser.c ++++ b/parser.c +@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { + * far more secure as the parser will only process data coming from + * the document entity by default. + */ +- if ((ent->checked == 0) && ++ if (((ent->checked == 0) || ++ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) && + ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) || + (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) { + unsigned long oldnbent = ctxt->nbentities; +-- +cgit v0.10.1 + diff --git a/abs/core/libxml2/revert-catalog-initialize.patch b/abs/core/libxml2/revert-catalog-initialize.patch new file mode 100644 index 0000000..d98b382 --- /dev/null +++ b/abs/core/libxml2/revert-catalog-initialize.patch @@ -0,0 +1,26 @@ +From f65128f38289d77ff322d63aef2858cc0a819c34 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard@redhat.com> +Date: Fri, 17 Oct 2014 17:13:41 +0800 +Subject: Revert "Missing initialization for the catalog module" + +This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7. +As this break xmlcatalog command +https://bugzilla.redhat.com/show_bug.cgi?id=1153753 + +diff --git a/parser.c b/parser.c +index 1d93967..67c9dfd 100644 +--- a/parser.c ++++ b/parser.c +@@ -14830,9 +14830,6 @@ xmlInitParser(void) { + #ifdef LIBXML_XPATH_ENABLED + xmlXPathInit(); + #endif +-#ifdef LIBXML_CATALOG_ENABLED +- xmlInitializeCatalog(); +-#endif + xmlParserInitialized = 1; + #ifdef LIBXML_THREAD_ENABLED + } +-- +cgit v0.10.1 + diff --git a/abs/core/libxrandr/PKGBUILD b/abs/core/libxrandr/PKGBUILD index 94a99d0..fdb44f0 100644 --- a/abs/core/libxrandr/PKGBUILD +++ b/abs/core/libxrandr/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 143893 2011-11-30 19:05:26Z andrea $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxrandr -pkgver=1.3.2 +pkgver=1.4.2 pkgrel=2 pkgdesc="X11 RandR extension library" arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" -depends=('libxext' 'libxrender' 'randrproto') +depends=('libxext' 'libxrender' 'randrproto>=1.4.0') makedepends=('xorg-util-macros') -options=('!libtool') source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2) -sha1sums=('0c844a4c5237f96794f0c18a5af16dc5ab7a36ec') +sha256sums=('caa7b31ac769be51a532343c65376f1d4df3f307afaed58e34fb5e82e8b825ad') build() { - cd "${srcdir}/libXrandr-${pkgver}" + cd libXrandr-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd "${srcdir}/libXrandr-${pkgver}" + cd libXrandr-${pkgver} make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/abs/core/lighttpd/PKGBUILD b/abs/core/lighttpd/PKGBUILD index a2c3b7d..8ae5054 100644 --- a/abs/core/lighttpd/PKGBUILD +++ b/abs/core/lighttpd/PKGBUILD @@ -3,13 +3,13 @@ pkgname=lighttpd pkgver=1.4.35 -pkgrel=1 +pkgrel=2 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') url="http://www.lighttpd.net/" -depends=('pcre' 'openssl' 'zlib' 'bzip2' 'attr' 'libldap' 'lua' 'php-cgi') -makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig') +depends=('pcre' 'openssl' 'zlib' 'bzip2' 'attr' 'libldap' 'lua51' 'php-cgi') +makedepends=('fcgi' 'libmysqlclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig') optdepends=('libxml2: mod_webdav' \ 'e2fsprogs: mod_webdav' \ 'libmysqlclient: mod_mysql_vhost' \ diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index c8e97ab..02ee1db 100644 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-theme -pkgver=8.2 -pkgrel=7 +pkgver=8.3 +pkgrel=1 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') @@ -10,7 +10,7 @@ patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch' 'menu-ui-vert.xml.patch' 'schedule-ui.xml.patch' 'qtlook.txt.patch') #The LinHES theme is based on TintedGlass 4.56 by Harley Peters -source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' +source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' 'osd_subtitle.xml' 'background.png' 'preview.png' 'tux_thoughts.png' 'LHLogoAndText.png') @@ -80,13 +80,14 @@ package() { sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml } md5sums=('2dca856c2a4d1f959473512c94e43b60' - 'e857e084963166bb37c6236463750dc1' + '13bff6425487194cc7bc622e64c6176a' '5fccb4e20c15d87223ea5de4c40faa06' - 'c75c83b90969fb07755062113f858e88' + 'acf2fa359f7be7db30a81cae4dd5fa3f' '22ff4044c8c29560451fb51dcbf4d44e' '9fe3371a8b964a7028126405cfaa330b' '5a8fb2a5f0e657d52be6f0a6a006ce72' 'a0201e0aa1608eeab27ee754e4d2c1de' + 'bfc32b9fa5dca3d46dd6f365ecb449b5' '12d26a786fde397348653128a6d7676a' '4b1c27297bb5f8d9d7bbaf72b35130b5' '2bd09b8049aaf5ba21db5baf3a0ce077' diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch index 914ecf7..5d6f330 100644 --- a/abs/core/linhes-theme/menu-ui-vert.xml.patch +++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch @@ -1,5 +1,5 @@ ---- menu-ui-vert.xml.orig 2014-03-26 17:04:48.808874995 +0000 -+++ menu-ui-vert.xml 2014-03-26 17:06:18.504013928 +0000 +--- menu-ui-vert.xml.orig 2014-12-15 17:49:37.474734296 +0000 ++++ menu-ui-vert.xml 2014-12-15 17:51:03.670344843 +0000 @@ -18,6 +18,49 @@ <area>394,0,2,720</area> </shape> @@ -50,7 +50,7 @@ <statetype name="titles"> <state name="MAIN"> <textarea name="heading"> -@@ -123,6 +166,41 @@ +@@ -123,6 +166,51 @@ <value>Archive Utilities</value> </textarea> </state> @@ -74,6 +74,16 @@ + <value>Restore LinHES</value> + </textarea> + </state> ++ <state name="LH_TOOLS" from="MAIN"> ++ <textarea name="heading"> ++ <value>LinHES Tools</value> ++ </textarea> ++ </state> ++ <state name="LH_BACKEND" from="MAIN"> ++ <textarea name="heading"> ++ <value>MythBackend Control</value> ++ </textarea> ++ </state> + <state name="HOST_SETTINGS" from="MAIN"> + <textarea name="heading"> + <value>LinHES Settings</value> @@ -92,7 +102,34 @@ </statetype> <buttonlist name="menu"> -@@ -162,21 +240,6 @@ +@@ -136,9 +224,9 @@ + <buttonarea>0,0,100%,100%</buttonarea> + <statetype name="buttonitem"> + <state name="active"> +- <area>0,0,310,64</area> ++ <area>0,0,310,66</area> + <textarea name="buttontext"> +- <area>12,0,286,64</area> ++ <area>12,0,286,66</area> + <font>basemediumlightgrey</font> + <multiline>yes</multiline> + <align>allcenter</align> +@@ -147,12 +235,12 @@ + </textarea> + </state> + <state name="selectedactive"> +- <area>-10,0,330,64</area> ++ <area>-10,0,330,66</area> + <group name="select_bar" from="base_select_bar_selectedactive_group"> + <area>0,0,330,100%</area> + </group> + <textarea name="buttontext"> +- <area>5,0,320,64</area> ++ <area>5,0,320,66</area> + <font>basemediumlargerdarkyellow</font> + <multiline>yes</multiline> + <!-- cpu usage is very high +@@ -162,21 +250,6 @@ <cutdown>yes</cutdown> <case>upper</case> </textarea> diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch index 6c29161..104e145 100644 --- a/abs/core/linhes-theme/osd.xml.patch +++ b/abs/core/linhes-theme/osd.xml.patch @@ -1,5 +1,5 @@ --- osd.xml.orig 2014-10-26 18:47:55.853729172 +0000 -+++ osd.xml 2014-10-26 19:11:25.023453880 +0000 ++++ osd.xml 2014-11-24 14:41:20.269044512 +0000 @@ -7,13 +7,13 @@ <window name="osd_debug"> <area>0,0,1280,720</area> @@ -17,6 +17,132 @@ </fontdef> <shape name="osd-debug-backdrop"> +@@ -71,7 +71,7 @@ + </textarea> + + <textarea name="load"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>241,51,216,25</area> + <align>left,vcenter</align> + </textarea> +@@ -84,7 +84,7 @@ + </textarea> + + <textarea name="filename"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>515,51,685,25</area> + <align>left,vcenter</align> + </textarea> +@@ -97,7 +97,7 @@ + </textarea> + + <textarea name="storagerate"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>247,76,123,25</area> + <align>left,vcenter</align> + </textarea> +@@ -110,7 +110,7 @@ + </textarea> + + <textarea name="decoderrate"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>247,101,123,25</area> + <align>left,vcenter</align> + </textarea> +@@ -123,7 +123,7 @@ + </textarea> + + <textarea name="bufferavail"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>247,126,123,25</area> + <align>left,vcenter</align> + <template>%BUFFERAVAIL% of %BUFFERSIZE%Mb</template> +@@ -137,7 +137,7 @@ + </textarea> + + <textarea name="videowidth"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>515,76,250,25</area> + <align>left,vcenter</align> + <template>%VIDEOWIDTH%x%VIDEOHEIGHT%@%VIDEOFRAMERATE%fps</template> +@@ -151,7 +151,7 @@ + </textarea> + + <textarea name="videocodec"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>515,101,150,25</area> + <align>left,vcenter</align> + </textarea> +@@ -164,7 +164,7 @@ + </textarea> + + <textarea name="videodecoder"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>515,126,150,25</area> + <align>left,vcenter</align> + </textarea> +@@ -177,7 +177,7 @@ + </textarea> + + <textarea name="avsync"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>875,76,100,25</area> + <align>left,vcenter</align> + </textarea> +@@ -190,7 +190,7 @@ + </textarea> + + <textarea name="framerate"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>875,101,100,25</area> + <align>left,vcenter</align> + </textarea> +@@ -203,7 +203,7 @@ + </textarea> + + <textarea name="videoframes"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>875,126,100,25</area> + <align>left,vcenter</align> + </textarea> +@@ -216,7 +216,7 @@ + </textarea> + + <textarea name="audiocodec"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>1129,76,77,25</area> + <align>left,vcenter</align> + </textarea> +@@ -229,7 +229,7 @@ + </textarea> + + <textarea name="audiochannels"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>1129,101,77,25</area> + <align>left,vcenter</align> + </textarea> +@@ -242,7 +242,7 @@ + </textarea> + + <textarea name="samplerate"> +- <font>mediumblue</font> ++ <font>medium</font> + <area>1129,126,77,25</area> + <align>left,vcenter</align> + </textarea> @@ -252,8 +252,8 @@ <window name="osd_message"> <area>0,0,1280,720</area> @@ -52,7 +178,31 @@ </fontdef> <shape name="osd-status-backdrop"> -@@ -470,39 +470,39 @@ +@@ -436,12 +436,19 @@ + <align>left,vcenter</align> + </textarea> + +- <textarea name="description"> +- <area>90,658,1100,24</area> ++ <textarea name="value"> ++ <area>90,657,1100,24</area> + <font>small</font> + <align>allcenter</align> +- <template>%DESCRIPTION% +- %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template> ++ <template>%VALUE%%UNITS%</template> ++ </textarea> ++ ++ <textarea name="playedtime" depends="!value"> ++ <area>90,657,1100,24</area> ++ <font>small</font> ++ <align>allcenter</align> ++ <template>%PLAYEDTIME% of %TOTALTIME% ++ %(|REMAININGTIME| remains)%%(|BEHINDTIME| behind)%</template> + </textarea> + + <clock name="clock"> +@@ -470,39 +477,39 @@ <window name="program_info"> <area>0,0,1280,720</area> @@ -102,7 +252,7 @@ </fontdef> <shape name="program-info-backdrop"> -@@ -1015,25 +1015,30 @@ +@@ -1015,25 +1022,30 @@ <window name="browse_info"> <area>0,0,1280,720</area> @@ -139,7 +289,7 @@ </fontdef> <shape name="browse-info-backdrop"> -@@ -1084,7 +1089,7 @@ +@@ -1084,7 +1096,7 @@ </shape> <shape name="title-backdrop-line"> @@ -148,7 +298,7 @@ <type>roundbox</type> <fill color="#000000" alpha="0" /> <line color="#ffffff" alpha="45" width="2" /> -@@ -1092,11 +1097,11 @@ +@@ -1092,11 +1104,11 @@ </shape> <shape name="title-top-line" from="channel-top-line"> @@ -162,7 +312,7 @@ </shape> <shape name="title-left-line" from="channel-left-line"> -@@ -1104,30 +1109,6 @@ +@@ -1104,30 +1116,6 @@ </shape> <shape name="title-right-line" from="channel-left-line"> @@ -193,7 +343,7 @@ <area>1212,492,2,62</area> </shape> -@@ -1175,30 +1156,30 @@ +@@ -1175,30 +1163,30 @@ </textarea> <textarea name="title"> @@ -231,7 +381,7 @@ </clock> <textarea name="description"> -@@ -1214,9 +1195,9 @@ +@@ -1214,9 +1202,9 @@ <window name="ChannelEditor"> <area>0,0,1280,720</area> @@ -243,7 +393,7 @@ </fontdef> <fontdef name="smallblack" from="small"> -@@ -1224,7 +1205,7 @@ +@@ -1224,7 +1212,7 @@ </fontdef> <fontdef name="smallblue" from="small"> @@ -252,7 +402,7 @@ </fontdef> <fontdef name="smallgrey" from="small"> -@@ -1232,7 +1213,7 @@ +@@ -1232,7 +1220,7 @@ </fontdef> <fontdef name="medium" from="small"> @@ -261,7 +411,7 @@ </fontdef> <shape name="channel-editor-backdrop"> -@@ -1610,9 +1591,9 @@ +@@ -1610,9 +1598,9 @@ <window name="osd_program_editor"> <area>0,0,1280,720</area> @@ -273,7 +423,7 @@ </fontdef> <shape name="osd-program-editor-backdrop"> -@@ -1749,9 +1730,9 @@ +@@ -1749,9 +1737,9 @@ <window name="MythPopupBox"> <area>0,0,1280,720</area> @@ -285,7 +435,7 @@ </fontdef> <fontdef name="smallgrey" from="small"> -@@ -1759,7 +1740,7 @@ +@@ -1759,7 +1747,7 @@ </fontdef> <fontdef name="smallyellow" from="small"> diff --git a/abs/core/linhes-theme/osd_subtitle.xml b/abs/core/linhes-theme/osd_subtitle.xml new file mode 100644 index 0000000..7640654 --- /dev/null +++ b/abs/core/linhes-theme/osd_subtitle.xml @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd"> +<mythuitheme> + <window name="osd_subtitle"> + <!-- + This is a reference implementation of the system/provider + defaults specified in + SubtitleFormat:CreateProviderDefault(). + + Note that if all attributes/elements are simply inherited + from provider, then the specification is optional. E.g., + the following could be omitted: + + <fontdef name="sample" from="provider"></fontdef> + <shape name="sample" from="provider"></shape> + + Also note that these specific definitions are unnecessary + since they are the same as the defaults in the code. A + theme only needs to include the definitions that it wants + to change/override. + --> + + <!-- + Define a black background which is used below for 608 and + text subtitles. If a background is not used, it is + recommended to use a 2-pixel outline or shadow in the + fontdef, in order to provide sufficient contrast. Note + that 708 captions providers almost always specify an + explicit black background. + --> + <shape name="black_background" from="provider"> + <type>roundbox</type> + <cornerradius>8</cornerradius> + <fill color="#000000" alpha="140" /> + </shape> + + + <!-- + Subtitle type "text" generally comes from external text + files like .srt or .txt files. + --> + <fontdef name="text" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <shape name="text" from="black_background"> + </shape> + + + <!-- + Digital teletext text-based subtitles. Not to be confused + with bitmap teletext subtitles, or CEA-608 teletext + captions. A monospaced font should be used. + --> + <fontdef name="teletext" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + + <!-- + CEA-608 closed captions. These also apply to CEA-608 VBI + teletext captions. A monospaced font should be used. + --> + <fontdef name="608" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <shape name="608" from="black_background"> + </shape> + + + <!-- + CEA-708 closed captions. The spec defines 8 different + font tags, but in practice (at least in the U.S.), only + tags 0 and 3 are used by broadcasters. + --> + <!-- Font tag 0: "Default" --> + <fontdef name="708_0" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 1: "Monospaced Serif" --> + <fontdef name="708_1" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 2: "Proportional Serif" --> + <fontdef name="708_2" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 3: "Monospaced Sans Serif" --> + <fontdef name="708_3" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 4: "Proportional Sans Serif" --> + <fontdef name="708_4" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 5: "Casual" --> + <fontdef name="708_5" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 6: "Cursive" --> + <fontdef name="708_6" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + <!-- Font tag 7: "Small Capitals" --> + <!-- Note: The Qt property QFont::SmallCaps is automatically + applied to this font. --> + <fontdef name="708_7" face="Overlock" from="provider"> + <outlinecolor>#000000</outlinecolor> + <outlinesize>2</outlinesize> + <outlinealpha>255</outlinealpha> + </fontdef> + + </window> +</mythuitheme> diff --git a/abs/core/linux-api-headers/PKGBUILD b/abs/core/linux-api-headers/PKGBUILD index f5e4810..a9b1ea6 100644 --- a/abs/core/linux-api-headers/PKGBUILD +++ b/abs/core/linux-api-headers/PKGBUILD @@ -4,8 +4,8 @@ # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-api-headers -pkgver=3.13.2 -_basever=3.13 +pkgver=3.16.2 +_basever=3.16 pkgrel=1 pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64') @@ -13,16 +13,26 @@ url="http://www.gnu.org/software/libc" license=('GPL2') source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz) - # NOTE: signatures are not automatically verified by makepkg + + # NOTE: signatures are not automatically verified until pacman-4.2 #http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.sign #http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign -md5sums=('0ecbaf65c00374eb4a826c2f9f37606f' - '352993d23acc5760dafa10ffc9d8881a') -build() { +md5sums=('5c569ed649a0c9711879f333e90c5386' + '926e6e2ee0634ce53730701da749b040') + +prepare() { cd ${srcdir}/linux-${_basever} [[ $pkgver != $_basever ]] && patch -p1 -i ${srcdir}/patch-${pkgver} + # fix xattr.h dual inclusion issues + # https://github.com/torvalds/linux/commit/bfcfd44c + sed -i "/__UAPI_DEF_XATTR/s/ifdef/if/" include/uapi/linux/xattr.h +} + +build() { + cd ${srcdir}/linux-${_basever} + make mrproper make headers_check } diff --git a/abs/core/linux-firmware/PKGBUILD b/abs/core/linux-firmware/PKGBUILD index db3610c..b3bef4a 100644 --- a/abs/core/linux-firmware/PKGBUILD +++ b/abs/core/linux-firmware/PKGBUILD @@ -2,7 +2,9 @@ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=linux-firmware -pkgver=20130905 +# Commit date + git rev-parse --short origin/master +_rev=38e5405 +pkgver=20141201.${_rev} pkgrel=1 pkgdesc="Firmware files for Linux" makedepends=('git') @@ -35,21 +37,21 @@ replaces=('kernel26-firmware' 'rt2x00-rt71w-fw' 'amd-ucode') options=(!strip) -source=('git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#branch=master') +source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#commit=${_rev}") md5sums=('SKIP') -pkgver() { - date +%Y%m%d -} - package() { cd "${srcdir}/${pkgname}" - # remove not needed Makefile #35236 - rm Makefile - install -d -m755 "${pkgdir}/usr/lib/firmware" - cp -a * "${pkgdir}/usr/lib/firmware/" - install -d -m755 "${pkgdir}/usr/share/licenses/linux-firmware/" - rm -f "${pkgdir}/usr/lib/firmware/"{README*,configure,GPL*} - mv "${pkgdir}/usr/lib/firmware"/{LICEN*,WHENCE} "${pkgdir}/usr/share/licenses/linux-firmware/" + + make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware install + rm "${pkgdir}/usr/lib/firmware/"{Makefile,README,configure,GPL-3} + + install -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -Dm644 LICEN* WHENCE "${pkgdir}/usr/share/licenses/linux-firmware/" + + # Trigger a microcode reload for configurations not using early updates + install -d "${pkgdir}/usr/lib/tmpfiles.d" + echo 'w /sys/devices/system/cpu/microcode/reload - - - - 1' \ + >"${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" } # vim:set ts=2 sw=2 et: diff --git a/abs/core/linux/0001-Bluetooth-allocate-static-minor-for-vhci.patch b/abs/core/linux/0001-Bluetooth-allocate-static-minor-for-vhci.patch deleted file mode 100644 index 33a3fde..0000000 --- a/abs/core/linux/0001-Bluetooth-allocate-static-minor-for-vhci.patch +++ /dev/null @@ -1,76 +0,0 @@ -From a62207820fb65f168c8a7f9c0abb71d736f3d7e0 Mon Sep 17 00:00:00 2001 -From: Lucas De Marchi <lucas.demarchi@intel.com> -Date: Tue, 18 Feb 2014 02:19:26 -0300 -Subject: [PATCH] Bluetooth: allocate static minor for vhci -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit bfacbb9 (Bluetooth: Use devname:vhci module alias for virtual HCI -driver) added the module alias to hci_vhci module so it's possible to -create the /dev/vhci node. However creating an alias without -specifying the minor doesn't allow us to create the node ahead, -triggerring module auto-load when it's first accessed. - -Starting with depmod from kmod 16 we started to warn if there's a -devname alias without specifying the major and minor. - -Let's do the same done for uhid, kvm, fuse and others, specifying a -fixed minor. In systems with systemd as the init the following will -happen: on early boot systemd will call "kmod static-nodes" to read -/lib/modules/$(uname -r)/modules.devname and then create the nodes. When -first accessed these "dead" nodes will trigger the module loading. - -Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> -Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Signed-off-by: Marcel Holtmann <marcel@holtmann.org> ---- - Documentation/devices.txt | 1 + - drivers/bluetooth/hci_vhci.c | 3 ++- - include/linux/miscdevice.h | 1 + - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Documentation/devices.txt b/Documentation/devices.txt -index 80b7241..fce9398 100644 ---- a/Documentation/devices.txt -+++ b/Documentation/devices.txt -@@ -353,6 +353,7 @@ Your cooperation is appreciated. - 133 = /dev/exttrp External device trap - 134 = /dev/apm_bios Advanced Power Management BIOS - 135 = /dev/rtc Real Time Clock -+ 137 = /dev/vhci Bluetooth virtual HCI driver - 139 = /dev/openprom SPARC OpenBoot PROM - 140 = /dev/relay8 Berkshire Products Octal relay card - 141 = /dev/relay16 Berkshire Products ISO-16 relay card -diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c -index 7b16738..59095e6 100644 ---- a/drivers/bluetooth/hci_vhci.c -+++ b/drivers/bluetooth/hci_vhci.c -@@ -352,7 +352,7 @@ static const struct file_operations vhci_fops = { - static struct miscdevice vhci_miscdev= { - .name = "vhci", - .fops = &vhci_fops, -- .minor = MISC_DYNAMIC_MINOR, -+ .minor = VHCI_MINOR, - }; - - static int __init vhci_init(void) -@@ -378,3 +378,4 @@ MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION); - MODULE_VERSION(VERSION); - MODULE_LICENSE("GPL"); - MODULE_ALIAS("devname:vhci"); -+MODULE_ALIAS_MISCDEV(VHCI_MINOR); -diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h -index f7eaf2d..e5db611 100644 ---- a/include/linux/miscdevice.h -+++ b/include/linux/miscdevice.h -@@ -23,6 +23,7 @@ - #define TEMP_MINOR 131 /* Temperature Sensor */ - #define RTC_MINOR 135 - #define EFI_RTC_MINOR 136 /* EFI Time services */ -+#define VHCI_MINOR 137 - #define SUN_OPENPROM_MINOR 139 - #define DMAPI_MINOR 140 /* DMAPI */ - #define NVRAM_MINOR 144 --- -1.9.0 - diff --git a/abs/core/linux/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch b/abs/core/linux/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch deleted file mode 100644 index 2d39831..0000000 --- a/abs/core/linux/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch +++ /dev/null @@ -1,241 +0,0 @@ -From 4b9a445e3eeb8bd9278b1ae51c1b3a651e370cd6 Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@redhat.com> -Date: Thu, 14 Nov 2013 07:25:17 -0500 -Subject: [PATCH 1/6] sunrpc: create a new dummy pipe for gssd to hold open - -rpc.gssd will naturally hold open any pipe named */clnt*/gssd that shows -up under rpc_pipefs. That behavior gives us a reliable mechanism to tell -whether it's actually running or not. - -Create a new toplevel "gssd" directory in rpc_pipefs when it's mounted. -Under that directory create another directory called "clntXX", and then -within that a pipe called "gssd". - -We'll never send an upcall along that pipe, and any downcall written to -it will just return -EINVAL. - -Signed-off-by: Jeff Layton <jlayton@redhat.com> -Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> ---- - include/linux/sunrpc/rpc_pipe_fs.h | 3 +- - net/sunrpc/netns.h | 1 + - net/sunrpc/rpc_pipe.c | 93 ++++++++++++++++++++++++++++++++++++-- - net/sunrpc/sunrpc_syms.c | 8 +++- - 4 files changed, 100 insertions(+), 5 deletions(-) - -diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h -index a353e03..85f1342 100644 ---- a/include/linux/sunrpc/rpc_pipe_fs.h -+++ b/include/linux/sunrpc/rpc_pipe_fs.h -@@ -84,7 +84,8 @@ enum { - - extern struct dentry *rpc_d_lookup_sb(const struct super_block *sb, - const unsigned char *dir_name); --extern void rpc_pipefs_init_net(struct net *net); -+extern int rpc_pipefs_init_net(struct net *net); -+extern void rpc_pipefs_exit_net(struct net *net); - extern struct super_block *rpc_get_sb_net(const struct net *net); - extern void rpc_put_sb_net(const struct net *net); - -diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h -index 779742c..8a8e841 100644 ---- a/net/sunrpc/netns.h -+++ b/net/sunrpc/netns.h -@@ -14,6 +14,7 @@ struct sunrpc_net { - struct cache_detail *rsi_cache; - - struct super_block *pipefs_sb; -+ struct rpc_pipe *gssd_dummy; - struct mutex pipefs_sb_lock; - - struct list_head all_clients; -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index bf04b30..c23458b 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -38,7 +38,7 @@ - #define NET_NAME(net) ((net == &init_net) ? " (init_net)" : "") - - static struct file_system_type rpc_pipe_fs_type; -- -+static const struct rpc_pipe_ops gssd_dummy_pipe_ops; - - static struct kmem_cache *rpc_inode_cachep __read_mostly; - -@@ -1159,6 +1159,7 @@ enum { - RPCAUTH_nfsd4_cb, - RPCAUTH_cache, - RPCAUTH_nfsd, -+ RPCAUTH_gssd, - RPCAUTH_RootEOF - }; - -@@ -1195,6 +1196,10 @@ static const struct rpc_filelist files[] = { - .name = "nfsd", - .mode = S_IFDIR | S_IRUGO | S_IXUGO, - }, -+ [RPCAUTH_gssd] = { -+ .name = "gssd", -+ .mode = S_IFDIR | S_IRUGO | S_IXUGO, -+ }, - }; - - /* -@@ -1208,13 +1213,25 @@ struct dentry *rpc_d_lookup_sb(const struct super_block *sb, - } - EXPORT_SYMBOL_GPL(rpc_d_lookup_sb); - --void rpc_pipefs_init_net(struct net *net) -+int rpc_pipefs_init_net(struct net *net) - { - struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); - -+ sn->gssd_dummy = rpc_mkpipe_data(&gssd_dummy_pipe_ops, 0); -+ if (IS_ERR(sn->gssd_dummy)) -+ return PTR_ERR(sn->gssd_dummy); -+ - mutex_init(&sn->pipefs_sb_lock); - sn->gssd_running = 1; - sn->pipe_version = -1; -+ return 0; -+} -+ -+void rpc_pipefs_exit_net(struct net *net) -+{ -+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); -+ -+ rpc_destroy_pipe_data(sn->gssd_dummy); - } - - /* -@@ -1244,11 +1261,73 @@ void rpc_put_sb_net(const struct net *net) - } - EXPORT_SYMBOL_GPL(rpc_put_sb_net); - -+static const struct rpc_filelist gssd_dummy_clnt_dir[] = { -+ [0] = { -+ .name = "clntXX", -+ .mode = S_IFDIR | S_IRUGO | S_IXUGO, -+ }, -+}; -+ -+static ssize_t -+dummy_downcall(struct file *filp, const char __user *src, size_t len) -+{ -+ return -EINVAL; -+} -+ -+static const struct rpc_pipe_ops gssd_dummy_pipe_ops = { -+ .upcall = rpc_pipe_generic_upcall, -+ .downcall = dummy_downcall, -+}; -+ -+/** -+ * rpc_gssd_dummy_populate - create a dummy gssd pipe -+ * @root: root of the rpc_pipefs filesystem -+ * @pipe_data: pipe data created when netns is initialized -+ * -+ * Create a dummy set of directories and a pipe that gssd can hold open to -+ * indicate that it is up and running. -+ */ -+static struct dentry * -+rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data) -+{ -+ int ret = 0; -+ struct dentry *gssd_dentry; -+ struct dentry *clnt_dentry = NULL; -+ struct dentry *pipe_dentry = NULL; -+ struct qstr q = QSTR_INIT(files[RPCAUTH_gssd].name, -+ strlen(files[RPCAUTH_gssd].name)); -+ -+ /* We should never get this far if "gssd" doesn't exist */ -+ gssd_dentry = d_hash_and_lookup(root, &q); -+ if (!gssd_dentry) -+ return ERR_PTR(-ENOENT); -+ -+ ret = rpc_populate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1, NULL); -+ if (ret) { -+ pipe_dentry = ERR_PTR(ret); -+ goto out; -+ } -+ -+ q.name = gssd_dummy_clnt_dir[0].name; -+ q.len = strlen(gssd_dummy_clnt_dir[0].name); -+ clnt_dentry = d_hash_and_lookup(gssd_dentry, &q); -+ if (!clnt_dentry) { -+ pipe_dentry = ERR_PTR(-ENOENT); -+ goto out; -+ } -+ -+ pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data); -+out: -+ dput(clnt_dentry); -+ dput(gssd_dentry); -+ return pipe_dentry; -+} -+ - static int - rpc_fill_super(struct super_block *sb, void *data, int silent) - { - struct inode *inode; -- struct dentry *root; -+ struct dentry *root, *gssd_dentry; - struct net *net = data; - struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); - int err; -@@ -1266,6 +1345,13 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) - return -ENOMEM; - if (rpc_populate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF, NULL)) - return -ENOMEM; -+ -+ gssd_dentry = rpc_gssd_dummy_populate(root, sn->gssd_dummy); -+ if (IS_ERR(gssd_dentry)) { -+ __rpc_depopulate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF); -+ return PTR_ERR(gssd_dentry); -+ } -+ - dprintk("RPC: sending pipefs MOUNT notification for net %p%s\n", - net, NET_NAME(net)); - mutex_lock(&sn->pipefs_sb_lock); -@@ -1280,6 +1366,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) - return 0; - - err_depopulate: -+ dput(gssd_dentry); - blocking_notifier_call_chain(&rpc_pipefs_notifier_list, - RPC_PIPEFS_UMOUNT, - sb); -diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c -index 3d6498a..cd30120 100644 ---- a/net/sunrpc/sunrpc_syms.c -+++ b/net/sunrpc/sunrpc_syms.c -@@ -44,12 +44,17 @@ static __net_init int sunrpc_init_net(struct net *net) - if (err) - goto err_unixgid; - -- rpc_pipefs_init_net(net); -+ err = rpc_pipefs_init_net(net); -+ if (err) -+ goto err_pipefs; -+ - INIT_LIST_HEAD(&sn->all_clients); - spin_lock_init(&sn->rpc_client_lock); - spin_lock_init(&sn->rpcb_clnt_lock); - return 0; - -+err_pipefs: -+ unix_gid_cache_destroy(net); - err_unixgid: - ip_map_cache_destroy(net); - err_ipmap: -@@ -60,6 +65,7 @@ err_proc: - - static __net_exit void sunrpc_exit_net(struct net *net) - { -+ rpc_pipefs_exit_net(net); - unix_gid_cache_destroy(net); - ip_map_cache_destroy(net); - rpc_proc_exit(net); --- -1.8.5.3 - diff --git a/abs/core/linux/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch b/abs/core/linux/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch deleted file mode 100644 index c4242e0..0000000 --- a/abs/core/linux/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 83460ec8dcac14142e7860a01fa59c267ac4657c Mon Sep 17 00:00:00 2001 -From: Andi Kleen <ak@linux.intel.com> -Date: Tue, 12 Nov 2013 15:08:36 -0800 -Subject: [PATCH] syscalls.h: use gcc alias instead of assembler aliases for - syscalls - -Use standard gcc __attribute__((alias(foo))) to define the syscall aliases -instead of custom assembler macros. - -This is far cleaner, and also fixes my LTO kernel build. - -Signed-off-by: Andi Kleen <ak@linux.intel.com> -Cc: Al Viro <viro@ZenIV.linux.org.uk> -Cc: Geert Uytterhoeven <geert@linux-m68k.org> -Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---- - include/linux/compat.h | 4 ++-- - include/linux/syscalls.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/linux/compat.h b/include/linux/compat.h -index 345da00..ada34c9 100644 ---- a/include/linux/compat.h -+++ b/include/linux/compat.h -@@ -41,14 +41,14 @@ - COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__) - - #define COMPAT_SYSCALL_DEFINEx(x, name, ...) \ -- asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\ -+ asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\ -+ __attribute__((alias(__stringify(compat_SyS##name)))); \ - static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\ - asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));\ - asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))\ - { \ - return C_SYSC##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__)); \ - } \ -- SYSCALL_ALIAS(compat_sys##name, compat_SyS##name); \ - static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)) - - #ifndef compat_user_stack_pointer -diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h -index 7fac04e..c27f846 100644 ---- a/include/linux/syscalls.h -+++ b/include/linux/syscalls.h -@@ -184,7 +184,8 @@ extern struct trace_event_functions exit_syscall_print_funcs; - - #define __PROTECT(...) asmlinkage_protect(__VA_ARGS__) - #define __SYSCALL_DEFINEx(x, name, ...) \ -- asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \ -+ asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \ -+ __attribute__((alias(__stringify(SyS##name)))); \ - static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \ - asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \ - asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \ -@@ -194,7 +195,6 @@ extern struct trace_event_functions exit_syscall_print_funcs; - __PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__)); \ - return ret; \ - } \ -- SYSCALL_ALIAS(sys##name, SyS##name); \ - static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)) - - asmlinkage long sys_time(time_t __user *tloc); --- -1.8.5.3 - diff --git a/abs/core/linux/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch b/abs/core/linux/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch deleted file mode 100644 index 19e04da..0000000 --- a/abs/core/linux/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 89f842435c630f8426f414e6030bc2ffea0d6f81 Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@redhat.com> -Date: Thu, 14 Nov 2013 07:25:18 -0500 -Subject: [PATCH 2/6] sunrpc: replace sunrpc_net->gssd_running flag with a more - reliable check - -Now that we have a more reliable method to tell if gssd is running, we -can replace the sn->gssd_running flag with a function that will query to -see if it's up and running. - -There's also no need to attempt an upcall that we know will fail, so -just return -EACCES if gssd isn't running. Finally, fix the warn_gss() -message not to claim that that the upcall timed out since we don't -necesarily perform one now when gssd isn't running, and remove the -extraneous newline from the message. - -Signed-off-by: Jeff Layton <jlayton@redhat.com> -Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> ---- - include/linux/sunrpc/rpc_pipe_fs.h | 2 ++ - net/sunrpc/auth_gss/auth_gss.c | 17 +++++++---------- - net/sunrpc/netns.h | 2 -- - net/sunrpc/rpc_pipe.c | 14 ++++++++++---- - 4 files changed, 19 insertions(+), 16 deletions(-) - -diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h -index 85f1342..7f490be 100644 ---- a/include/linux/sunrpc/rpc_pipe_fs.h -+++ b/include/linux/sunrpc/rpc_pipe_fs.h -@@ -131,5 +131,7 @@ extern int rpc_unlink(struct dentry *); - extern int register_rpc_pipefs(void); - extern void unregister_rpc_pipefs(void); - -+extern bool gssd_running(struct net *net); -+ - #endif - #endif -diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c -index 42fdfc6..0a2aee0 100644 ---- a/net/sunrpc/auth_gss/auth_gss.c -+++ b/net/sunrpc/auth_gss/auth_gss.c -@@ -536,8 +536,7 @@ static void warn_gssd(void) - unsigned long now = jiffies; - - if (time_after(now, ratelimit)) { -- printk(KERN_WARNING "RPC: AUTH_GSS upcall timed out.\n" -- "Please check user daemon is running.\n"); -+ pr_warn("RPC: AUTH_GSS upcall failed. Please check user daemon is running.\n"); - ratelimit = now + 15*HZ; - } - } -@@ -600,7 +599,6 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred) - struct rpc_pipe *pipe; - struct rpc_cred *cred = &gss_cred->gc_base; - struct gss_upcall_msg *gss_msg; -- unsigned long timeout; - DEFINE_WAIT(wait); - int err; - -@@ -608,17 +606,16 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred) - __func__, from_kuid(&init_user_ns, cred->cr_uid)); - retry: - err = 0; -- /* Default timeout is 15s unless we know that gssd is not running */ -- timeout = 15 * HZ; -- if (!sn->gssd_running) -- timeout = HZ >> 2; -+ /* if gssd is down, just skip upcalling altogether */ -+ if (!gssd_running(net)) { -+ warn_gssd(); -+ return -EACCES; -+ } - gss_msg = gss_setup_upcall(gss_auth, cred); - if (PTR_ERR(gss_msg) == -EAGAIN) { - err = wait_event_interruptible_timeout(pipe_version_waitqueue, -- sn->pipe_version >= 0, timeout); -+ sn->pipe_version >= 0, 15 * HZ); - if (sn->pipe_version < 0) { -- if (err == 0) -- sn->gssd_running = 0; - warn_gssd(); - err = -EACCES; - } -diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h -index 8a8e841..94e506f 100644 ---- a/net/sunrpc/netns.h -+++ b/net/sunrpc/netns.h -@@ -33,8 +33,6 @@ struct sunrpc_net { - int pipe_version; - atomic_t pipe_users; - struct proc_dir_entry *use_gssp_proc; -- -- unsigned int gssd_running; - }; - - extern int sunrpc_net_id; -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index c23458b..5cd7ad1 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -216,14 +216,11 @@ rpc_destroy_inode(struct inode *inode) - static int - rpc_pipe_open(struct inode *inode, struct file *filp) - { -- struct net *net = inode->i_sb->s_fs_info; -- struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); - struct rpc_pipe *pipe; - int first_open; - int res = -ENXIO; - - mutex_lock(&inode->i_mutex); -- sn->gssd_running = 1; - pipe = RPC_I(inode)->pipe; - if (pipe == NULL) - goto out; -@@ -1222,7 +1219,6 @@ int rpc_pipefs_init_net(struct net *net) - return PTR_ERR(sn->gssd_dummy); - - mutex_init(&sn->pipefs_sb_lock); -- sn->gssd_running = 1; - sn->pipe_version = -1; - return 0; - } -@@ -1376,6 +1372,16 @@ err_depopulate: - return err; - } - -+bool -+gssd_running(struct net *net) -+{ -+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); -+ struct rpc_pipe *pipe = sn->gssd_dummy; -+ -+ return pipe->nreaders || pipe->nwriters; -+} -+EXPORT_SYMBOL_GPL(gssd_running); -+ - static struct dentry * - rpc_mount(struct file_system_type *fs_type, - int flags, const char *dev_name, void *data) --- -1.8.5.3 - diff --git a/abs/core/linux/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch b/abs/core/linux/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch deleted file mode 100644 index 87b54fc..0000000 --- a/abs/core/linux/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 6aa23d76a7b549521a03b63b6d5b7880ea87eab7 Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@redhat.com> -Date: Thu, 14 Nov 2013 07:25:19 -0500 -Subject: [PATCH 3/6] nfs: check if gssd is running before attempting to use - krb5i auth in SETCLIENTID call - -Currently, the client will attempt to use krb5i in the SETCLIENTID call -even if rpc.gssd isn't running. When that fails, it'll then fall back to -RPC_AUTH_UNIX. This introduced a delay when mounting if rpc.gssd isn't -running, and causes warning messages to pop up in the ring buffer. - -Check to see if rpc.gssd is running before even attempting to use krb5i -auth, and just silently skip trying to do so if it isn't. In the event -that the admin is actually trying to mount with krb5*, it will still -fail at a later stage of the mount attempt. - -Signed-off-by: Jeff Layton <jlayton@redhat.com> -Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> ---- - fs/nfs/nfs4client.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c -index b4a160a..c1b7a80 100644 ---- a/fs/nfs/nfs4client.c -+++ b/fs/nfs/nfs4client.c -@@ -10,6 +10,7 @@ - #include <linux/sunrpc/auth.h> - #include <linux/sunrpc/xprt.h> - #include <linux/sunrpc/bc_xprt.h> -+#include <linux/sunrpc/rpc_pipe_fs.h> - #include "internal.h" - #include "callback.h" - #include "delegation.h" -@@ -370,7 +371,11 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp, - __set_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags); - __set_bit(NFS_CS_DISCRTRY, &clp->cl_flags); - __set_bit(NFS_CS_NO_RETRANS_TIMEOUT, &clp->cl_flags); -- error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I); -+ -+ error = -EINVAL; -+ if (gssd_running(clp->cl_net)) -+ error = nfs_create_rpc_client(clp, timeparms, -+ RPC_AUTH_GSS_KRB5I); - if (error == -EINVAL) - error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX); - if (error < 0) --- -1.8.5.3 - diff --git a/abs/core/linux/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch b/abs/core/linux/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch deleted file mode 100644 index 5f2c3da..0000000 --- a/abs/core/linux/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3396f92f8be606ea485b0a82d4e7749a448b013b Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@redhat.com> -Date: Thu, 5 Dec 2013 07:33:49 -0500 -Subject: [PATCH 4/6] rpc_pipe: remove the clntXX dir if creating the pipe - fails - -In the event that we create the gssd/clntXX dir, but the pipe creation -subsequently fails, then we should remove the clntXX dir before -returning. - -Signed-off-by: Jeff Layton <jlayton@redhat.com> -Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> ---- - net/sunrpc/rpc_pipe.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index 5cd7ad1..0b74c61 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -1313,6 +1313,8 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data) - } - - pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data); -+ if (IS_ERR(pipe_dentry)) -+ __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1); - out: - dput(clnt_dentry); - dput(gssd_dentry); --- -1.8.5.3 - diff --git a/abs/core/linux/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch b/abs/core/linux/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch deleted file mode 100644 index 8ef6fe2..0000000 --- a/abs/core/linux/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch +++ /dev/null @@ -1,100 +0,0 @@ -From e2f0c83a9de331d9352185ca3642616c13127539 Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@redhat.com> -Date: Thu, 5 Dec 2013 07:34:44 -0500 -Subject: [PATCH 5/6] sunrpc: add an "info" file for the dummy gssd pipe - -rpc.gssd expects to see an "info" file in each clntXX dir. Since adding -the dummy gssd pipe, users that run rpc.gssd see a lot of these messages -spamming the logs: - - rpc.gssd[508]: ERROR: can't open /var/lib/nfs/rpc_pipefs/gssd/clntXX/info: No such file or directory - rpc.gssd[508]: ERROR: failed to read service info - -Add a dummy gssd/clntXX/info file to help silence these messages. - -Signed-off-by: Jeff Layton <jlayton@redhat.com> -Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> ---- - net/sunrpc/rpc_pipe.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 49 insertions(+), 1 deletion(-) - -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index 0b74c61..5d973b2 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -17,6 +17,7 @@ - #include <linux/fsnotify.h> - #include <linux/kernel.h> - #include <linux/rcupdate.h> -+#include <linux/utsname.h> - - #include <asm/ioctls.h> - #include <linux/poll.h> -@@ -1275,6 +1276,44 @@ static const struct rpc_pipe_ops gssd_dummy_pipe_ops = { - .downcall = dummy_downcall, - }; - -+/* -+ * Here we present a bogus "info" file to keep rpc.gssd happy. We don't expect -+ * that it will ever use this info to handle an upcall, but rpc.gssd expects -+ * that this file will be there and have a certain format. -+ */ -+static int -+rpc_show_dummy_info(struct seq_file *m, void *v) -+{ -+ seq_printf(m, "RPC server: %s\n", utsname()->nodename); -+ seq_printf(m, "service: foo (1) version 0\n"); -+ seq_printf(m, "address: 127.0.0.1\n"); -+ seq_printf(m, "protocol: tcp\n"); -+ seq_printf(m, "port: 0\n"); -+ return 0; -+} -+ -+static int -+rpc_dummy_info_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, rpc_show_dummy_info, NULL); -+} -+ -+static const struct file_operations rpc_dummy_info_operations = { -+ .owner = THIS_MODULE, -+ .open = rpc_dummy_info_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+static const struct rpc_filelist gssd_dummy_info_file[] = { -+ [0] = { -+ .name = "info", -+ .i_fop = &rpc_dummy_info_operations, -+ .mode = S_IFREG | S_IRUSR, -+ }, -+}; -+ - /** - * rpc_gssd_dummy_populate - create a dummy gssd pipe - * @root: root of the rpc_pipefs filesystem -@@ -1312,9 +1351,18 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data) - goto out; - } - -+ ret = rpc_populate(clnt_dentry, gssd_dummy_info_file, 0, 1, NULL); -+ if (ret) { -+ __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1); -+ pipe_dentry = ERR_PTR(ret); -+ goto out; -+ } -+ - pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data); -- if (IS_ERR(pipe_dentry)) -+ if (IS_ERR(pipe_dentry)) { -+ __rpc_depopulate(clnt_dentry, gssd_dummy_info_file, 0, 1); - __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1); -+ } - out: - dput(clnt_dentry); - dput(gssd_dentry); --- -1.8.5.3 - diff --git a/abs/core/linux/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch b/abs/core/linux/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch deleted file mode 100644 index 75505c3..0000000 --- a/abs/core/linux/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 23e66ba97127ff3b064d4c6c5138aa34eafc492f Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@redhat.com> -Date: Mon, 9 Dec 2013 09:38:00 -0500 -Subject: [PATCH 6/6] rpc_pipe: fix cleanup of dummy gssd directory when - notification fails - -Currently, it could leak dentry references in some cases. Make sure -we clean up properly. - -Signed-off-by: Jeff Layton <jlayton@redhat.com> -Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> ---- - net/sunrpc/rpc_pipe.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index 5d973b2..b185548 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -1369,6 +1369,18 @@ out: - return pipe_dentry; - } - -+static void -+rpc_gssd_dummy_depopulate(struct dentry *pipe_dentry) -+{ -+ struct dentry *clnt_dir = pipe_dentry->d_parent; -+ struct dentry *gssd_dir = clnt_dir->d_parent; -+ -+ __rpc_rmpipe(clnt_dir->d_inode, pipe_dentry); -+ __rpc_depopulate(clnt_dir, gssd_dummy_info_file, 0, 1); -+ __rpc_depopulate(gssd_dir, gssd_dummy_clnt_dir, 0, 1); -+ dput(pipe_dentry); -+} -+ - static int - rpc_fill_super(struct super_block *sb, void *data, int silent) - { -@@ -1412,7 +1424,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) - return 0; - - err_depopulate: -- dput(gssd_dentry); -+ rpc_gssd_dummy_depopulate(gssd_dentry); - blocking_notifier_call_chain(&rpc_pipefs_notifier_list, - RPC_PIPEFS_UMOUNT, - sb); --- -1.8.5.3 - diff --git a/abs/core/linux/PKGBUILD b/abs/core/linux/PKGBUILD index 5a4b9c3..3de6095 100644 --- a/abs/core/linux/PKGBUILD +++ b/abs/core/linux/PKGBUILD @@ -4,49 +4,36 @@ pkgbase=linux # Build stock -ARCH kernel #pkgbase=linux-custom # Build kernel with a different name -_srcname=linux-3.13 -pkgver=3.13.7 -pkgrel=2 +_srcname=linux-3.18 +pkgver=3.18.4 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz" + #"https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.sign" "https://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" + #"https://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign" # the main kernel config files 'config' 'config.x86_64' # standard config files for mkinitcpio ramdisk 'linux.preset' 'change-default-console-loglevel.patch' - 'criu-no-expert.patch' - '0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch' - '0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch' - '0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch' - '0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch' - '0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch' - '0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch' - '0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch' - '0001-Bluetooth-allocate-static-minor-for-vhci.patch' - 'i8042-fix-aliases.patch' ) -md5sums=('0ecbaf65c00374eb4a826c2f9f37606f' - 'cb33b329d3417846d310c7f58a2614b6' - 'ba4468d313adfaf22368add7f58204aa' - '035bb27dac306f5c028d96cad14bb249' - 'eb14dcfd80c00852ef81ded6e826826a' - '98beb36f9b8cf16e58de2483ea9985e3' - '989dc54ff8b179b0f80333cc97c0d43f' - 'dd2adb99cd3feed6f11022562901965c' - 'b00cc399d3797cb0793e18b5bf387a50' - '7cbd2349cdf046acc37b652c06ba36be' - '10dbaf863e22b2437e68f9190d65c861' - 'd5907a721b97299f0685c583499f7820' - 'a724515b350b29c53f20e631c6cf9a14' - 'e6fa278c092ad83780e2dd0568e24ca6' - '06f1751777e0772c18c3fa4fbae91aa5' - '93dbf73af819b77f03453a9c6de2bb47' - ) +sha256sums=('becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd' + #'SKIP' + '57c74ba5266bb10be335a89d30480739b3de67b5a72b3e0b0d37a27775b1862a' + #'SKIP' + 'd3794c8b2cd11b71914b41f7a4e861369d4fa3c29fdd9e1d677ff0c2167eeb52' + 'df7886f5d57f8f85e89987066dfa5c316e922dc0b22e6e6ad01331333db52377' + 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') +validpgpkeys=( + 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds + '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman + ) _kernelname=${pkgbase#linux} @@ -58,40 +45,12 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # allow Checkpoint/restore (for criu) without EXPERT=y - patch -p1 -i "${srcdir}/criu-no-expert.patch" - - # fix 15 seocnds nfs delay - # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=4b9a445e3eeb8bd9278b1ae51c1b3a651e370cd6 - patch -p1 -i "${srcdir}/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch" - # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=89f842435c630f8426f414e6030bc2ffea0d6f81 - patch -p1 -i "${srcdir}/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch" - # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=6aa23d76a7b549521a03b63b6d5b7880ea87eab7 - patch -p1 -i "${srcdir}/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch" - - # fix nfs kernel oops - # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=3396f92f8be606ea485b0a82d4e7749a448b013b - patch -p1 -i "${srcdir}/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch" - # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=e2f0c83a9de331d9352185ca3642616c13127539 - patch -p1 -i "${srcdir}/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch" - # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=23e66ba97127ff3b064d4c6c5138aa34eafc492f - patch -p1 -i "${srcdir}/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch" - - # Fix symbols: Revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=83460ec8dcac14142e7860a01fa59c267ac4657c - patch -Rp1 -i "${srcdir}/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch" - - # Fix i8042 aliases - patch -p1 -i "${srcdir}/i8042-fix-aliases.patch" - - # Fix vhci warning in kmod (to restore every kernel maintainer's sanity) - patch -p1 -i "${srcdir}/0001-Bluetooth-allocate-static-minor-for-vhci.patch" - if [ "${CARCH}" = "x86_64" ]; then cat "${srcdir}/config.x86_64" > ./.config else @@ -242,25 +201,6 @@ _package-headers() { cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/" - # add headers for lirc package - # pci - for i in bt8xx cx88 saa7134; do - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/pci/${i}" - cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/pci/${i}" - done - # usb - for i in cpia2 em28xx pwc sn9c102; do - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/${i}" - cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/${i}" - done - # i2c - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c" - cp drivers/media/i2c/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/" - for i in cx25840; do - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/${i}" - cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/${i}" - done - # add docbook makefile install -D -m644 Documentation/DocBook/Makefile \ "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile" @@ -292,6 +232,7 @@ _package-headers() { # http://bugs.archlinux.org/task/13146 mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" + mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/" cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/" # add dvb headers @@ -307,7 +248,8 @@ _package-headers() { # add xfs and shmem for aufs building mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs" mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/mm" - cp fs/xfs/xfs_sb.h "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs/xfs_sb.h" + # removed in 3.17 series + # cp fs/xfs/xfs_sb.h "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs/xfs_sb.h" # copy in Kconfig files for i in $(find . -name "Kconfig*"); do @@ -354,6 +296,7 @@ _package-docs() { pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs") for _p in ${pkgname[@]}; do eval "package_${_p}() { + $(declare -f "_package${_p#${pkgbase}}") _package${_p#${pkgbase}} }" done diff --git a/abs/core/linux/__changelog b/abs/core/linux/__changelog index 9a2e2b1..f470723 100644 --- a/abs/core/linux/__changelog +++ b/abs/core/linux/__changelog @@ -1 +1,2 @@ PKGBUILD: remove nouveau modules +PKGBUILD: comment out sign srcs diff --git a/abs/core/linux/change-default-console-loglevel.patch b/abs/core/linux/change-default-console-loglevel.patch index 22cd69a..11da2a9 100644 --- a/abs/core/linux/change-default-console-loglevel.patch +++ b/abs/core/linux/change-default-console-loglevel.patch @@ -1,12 +1,11 @@ -diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c ---- linux-3.0.orig/kernel/printk/printk.c 2011-07-22 05:17:23.000000000 +0300 -+++ linux-3.0/kernel/printk/printk.c 2011-07-27 14:43:07.000000000 +0300 -@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea - - /* We show everything that is MORE important than this.. */ - #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ --#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ - - DECLARE_WAIT_QUEUE_HEAD(log_wait); +--- linux-3.16/include/linux/printk.h.old 2014-08-04 18:48:30.686043266 +0200 ++++ linux-3.16/include/linux/printk.h 2014-08-04 18:48:47.706218528 +0200 +@@ -37,7 +37,7 @@ + #define CONSOLE_LOGLEVEL_SILENT 0 /* Mum's the word */ + #define CONSOLE_LOGLEVEL_MIN 1 /* Minimum loglevel we let people use */ + #define CONSOLE_LOGLEVEL_QUIET 4 /* Shhh ..., when booted with "quiet" */ +-#define CONSOLE_LOGLEVEL_DEFAULT 7 /* anything MORE serious than KERN_DEBUG */ ++#define CONSOLE_LOGLEVEL_DEFAULT 4 /* anything MORE serious than KERN_DEBUG */ + #define CONSOLE_LOGLEVEL_DEBUG 10 /* issue debug messages */ + #define CONSOLE_LOGLEVEL_MOTORMOUTH 15 /* You can't shut this one up */ diff --git a/abs/core/linux/config b/abs/core/linux/config index 02beec7..e05d7cf 100644 --- a/abs/core/linux/config +++ b/abs/core/linux/config @@ -1,11 +1,12 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.13.0 Kernel Configuration +# Linux/x86 3.18.0 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y +CONFIG_PERF_EVENTS_INTEL_UNCORE=y CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" CONFIG_LOCKDEP_SUPPORT=y @@ -22,7 +23,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_ARCH_HAS_CPU_AUTOPROBE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y @@ -39,6 +39,7 @@ CONFIG_X86_32_SMP=y CONFIG_X86_HT=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_FIX_EARLYCON_MEM=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -69,24 +70,27 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_FHANDLE=y -CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y +# CONFIG_USELIB is not set +# CONFIG_AUDIT is not set +CONFIG_HAVE_ARCH_AUDITSYSCALL=y # # IRQ subsystem # CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_KTIME_SCALAR=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y +CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y @@ -100,7 +104,7 @@ CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ_COMMON=y # CONFIG_HZ_PERIODIC is not set CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ=y +# CONFIG_NO_HZ is not set CONFIG_HIGH_RES_TIMERS=y # @@ -120,6 +124,7 @@ CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y +# CONFIG_TASKS_RCU is not set CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_FANOUT=32 CONFIG_RCU_FANOUT_LEAF=16 @@ -127,16 +132,13 @@ CONFIG_RCU_FANOUT_LEAF=16 CONFIG_RCU_FAST_NO_HZ=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_RCU_BOOST is not set -CONFIG_RCU_NOCB_CPU=y -CONFIG_RCU_NOCB_CPU_NONE=y -# CONFIG_RCU_NOCB_CPU_ZERO is not set -# CONFIG_RCU_NOCB_CPU_ALL is not set +# CONFIG_RCU_NOCB_CPU is not set +CONFIG_BUILD_BIN2C=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y -CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set CONFIG_CGROUP_FREEZER=y @@ -148,7 +150,7 @@ CONFIG_RESOURCE_COUNTERS=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y # CONFIG_MEMCG_SWAP_ENABLED is not set -CONFIG_MEMCG_KMEM=y +# CONFIG_MEMCG_KMEM is not set # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -157,16 +159,14 @@ CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set -CONFIG_CHECKPOINT_RESTORE=y +# CONFIG_CHECKPOINT_RESTORE is not set CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y # CONFIG_USER_NS is not set CONFIG_PID_NS=y CONFIG_NET_NS=y -# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set CONFIG_SCHED_AUTOGROUP=y -CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -183,8 +183,11 @@ CONFIG_ANON_INODES=y CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BPF=y # CONFIG_EXPERT is not set CONFIG_UID16=y +CONFIG_SGETMASK_SYSCALL=y +CONFIG_SYSFS_SYSCALL=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set @@ -198,8 +201,10 @@ CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y +# CONFIG_BPF_SYSCALL is not set CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_ADVISE_SYSCALLS=y CONFIG_PCI_QUIRKS=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -215,6 +220,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y +CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -240,6 +246,7 @@ CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y @@ -255,9 +262,13 @@ CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +# CONFIG_CC_STACKPROTECTOR_REGULAR is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_HAVE_ARCH_SOFT_DIRTY=y CONFIG_MODULES_USE_ELF_REL=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y @@ -271,7 +282,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -279,12 +289,13 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set +# CONFIG_MODULE_COMPRESS is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y -# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_CMDLINE_PARSER is not set @@ -328,6 +339,11 @@ CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUE_RWLOCK=y +CONFIG_QUEUE_RWLOCK=y CONFIG_FREEZER=y # @@ -335,10 +351,13 @@ CONFIG_FREEZER=y # CONFIG_ZONE_DMA=y CONFIG_SMP=y +CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_MPPARSE=y # CONFIG_X86_BIGSMP is not set # CONFIG_X86_EXTENDED_PLATFORM is not set -# CONFIG_X86_INTEL_LPSS is not set +CONFIG_X86_INTEL_LPSS=y +CONFIG_IOSF_MBI=m +# CONFIG_IOSF_MBI_DEBUG is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_X86_32_IRIS=m CONFIG_SCHED_OMIT_FRAME_POINTER=y @@ -346,10 +365,9 @@ CONFIG_HYPERVISOR_GUEST=y CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_DEBUG is not set # CONFIG_PARAVIRT_SPINLOCKS is not set -# CONFIG_XEN_PRIVILEGED_GUEST is not set CONFIG_KVM_GUEST=y # CONFIG_KVM_DEBUG_FS is not set -CONFIG_LGUEST_GUEST=y +# CONFIG_LGUEST_GUEST is not set CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y CONFIG_NO_BOOTMEM=y @@ -414,16 +432,18 @@ CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y CONFIG_VM86=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX32=y CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y -CONFIG_MICROCODE=m +CONFIG_MICROCODE=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y -CONFIG_MICROCODE_INTEL_LIB=y -# CONFIG_MICROCODE_INTEL_EARLY is not set -# CONFIG_MICROCODE_AMD_EARLY is not set +CONFIG_MICROCODE_INTEL_EARLY=y +CONFIG_MICROCODE_AMD_EARLY=y +CONFIG_MICROCODE_EARLY=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set @@ -448,6 +468,7 @@ CONFIG_MEMORY_ISOLATION=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MEMORY_BALLOON=y CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y @@ -457,20 +478,22 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y # CONFIG_CMA is not set -CONFIG_ZBUD=y CONFIG_ZSWAP=y -CONFIG_MEM_SOFT_DIRTY=y +CONFIG_ZPOOL=y +CONFIG_ZBUD=y +CONFIG_ZSMALLOC=y +# CONFIG_PGTABLE_MAPPING is not set +CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_HIGHPTE is not set CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y @@ -487,7 +510,6 @@ CONFIG_X86_SMAP=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y -CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=y @@ -496,11 +518,12 @@ CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set -# CONFIG_KEXEC_JUMP is not set +CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y +# CONFIG_RANDOMIZE_BASE is not set CONFIG_X86_NEED_RELOCS=y -CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set @@ -531,10 +554,13 @@ CONFIG_PM_SLEEP_DEBUG=y # CONFIG_DPM_WATCHDOG is not set CONFIG_PM_TRACE=y CONFIG_PM_TRACE_RTC=y -CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y +CONFIG_PM_CLK=y +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set CONFIG_ACPI=y +CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y +CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ACPI_SLEEP=y -# CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m @@ -557,6 +583,9 @@ CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m CONFIG_ACPI_BGRT=y +# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set +CONFIG_HAVE_ACPI_APEI=y +CONFIG_HAVE_ACPI_APEI_NMI=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y @@ -589,6 +618,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +# CONFIG_CPUFREQ_DT is not set # # x86 CPU frequency scaling drivers @@ -622,7 +652,6 @@ CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y # CPU Idle # CONFIG_CPU_IDLE=y -# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set @@ -711,8 +740,8 @@ CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m CONFIG_HOTPLUG_PCI_SHPC=m -CONFIG_RAPIDIO=y -CONFIG_RAPIDIO_TSI721=y +CONFIG_RAPIDIO=m +CONFIG_RAPIDIO_TSI721=m CONFIG_RAPIDIO_DISC_TIMEOUT=30 # CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set CONFIG_RAPIDIO_DMA_ENGINE=y @@ -722,10 +751,10 @@ CONFIG_RAPIDIO_ENUM_BASIC=m # # RapidIO Switch drivers # -CONFIG_RAPIDIO_TSI57X=y -CONFIG_RAPIDIO_CPS_XX=y -CONFIG_RAPIDIO_TSI568=y -CONFIG_RAPIDIO_CPS_GEN2=y +CONFIG_RAPIDIO_TSI57X=m +CONFIG_RAPIDIO_CPS_XX=m +CONFIG_RAPIDIO_TSI568=m +CONFIG_RAPIDIO_CPS_GEN2=m # CONFIG_X86_SYSFB is not set # @@ -736,10 +765,11 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_SCRIPT=y CONFIG_HAVE_AOUT=y -CONFIG_BINFMT_AOUT=m +# CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_PMC_ATOM=y CONFIG_NET=y # @@ -778,6 +808,9 @@ CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_SYN_COOKIES=y CONFIG_NET_IPVTI=m +CONFIG_NET_UDP_TUNNEL=m +CONFIG_NET_FOU=m +CONFIG_GENEVE=m CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m @@ -803,6 +836,7 @@ CONFIG_TCP_CONG_LP=m CONFIG_TCP_CONG_VENO=m CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" @@ -832,11 +866,12 @@ CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set CONFIG_NETLABEL=y CONFIG_NETWORK_SECMARK=y +CONFIG_NET_PTP_CLASSIFY=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=y +CONFIG_BRIDGE_NETFILTER=m # # Core Netfilter Configuration @@ -846,6 +881,7 @@ CONFIG_NETFILTER_NETLINK_ACCT=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_ZONES=y @@ -885,6 +921,7 @@ CONFIG_NF_NAT_SIP=m CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_SYNPROXY=m CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_INET=m CONFIG_NFT_EXTHDR=m CONFIG_NFT_META=m CONFIG_NFT_CT=m @@ -893,7 +930,11 @@ CONFIG_NFT_HASH=m CONFIG_NFT_COUNTER=m CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m +CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m +CONFIG_NFT_QUEUE=m +CONFIG_NFT_REJECT=m +CONFIG_NFT_REJECT_INET=m CONFIG_NFT_COMPAT=m CONFIG_NETFILTER_XTABLES=m @@ -907,7 +948,6 @@ CONFIG_NETFILTER_XT_SET=m # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_AUDIT=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m @@ -920,6 +960,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_NAT=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m @@ -938,6 +979,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m CONFIG_NETFILTER_XT_MATCH_BPF=m +CONFIG_NETFILTER_XT_MATCH_CGROUP=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m @@ -954,8 +996,10 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_L2TP=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m @@ -985,9 +1029,11 @@ CONFIG_IP_SET_BITMAP_IP=m CONFIG_IP_SET_BITMAP_IPMAC=m CONFIG_IP_SET_BITMAP_PORT=m CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPMARK=m CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_MAC=m CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NETNET=m @@ -995,7 +1041,7 @@ CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_VS=m -# CONFIG_IP_VS_IPV6 is not set +CONFIG_IP_VS_IPV6=y # CONFIG_IP_VS_DEBUG is not set CONFIG_IP_VS_TAB_BITS=12 @@ -1016,6 +1062,7 @@ CONFIG_IP_VS_RR=m CONFIG_IP_VS_WRR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_FO=m CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_DH=m @@ -1041,11 +1088,21 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m CONFIG_NF_TABLES_IPV4=m -CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_NF_REJECT_IPV4=m +CONFIG_NFT_REJECT_IPV4=m CONFIG_NF_TABLES_ARP=m +CONFIG_NF_NAT_IPV4=m +CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_NF_NAT_MASQUERADE_IPV4=m +CONFIG_NFT_MASQ_IPV4=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -1054,15 +1111,10 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT_IPV4=m +CONFIG_IP_NF_NAT=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -1080,7 +1132,13 @@ CONFIG_NF_DEFRAG_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NFT_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +CONFIG_NF_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NF_NAT_MASQUERADE_IPV6=m +CONFIG_NFT_MASQ_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1098,10 +1156,13 @@ CONFIG_IP6_NF_TARGET_SYNPROXY=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m -CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_NAT=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NF_LOG_BRIDGE=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1122,7 +1183,6 @@ CONFIG_BRIDGE_EBT_MARK_T=m CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_ULOG=m CONFIG_BRIDGE_EBT_NFLOG=m CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m @@ -1169,6 +1229,7 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_HAVE_NET_DSA=y CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_BRCM=y CONFIG_NET_DSA_TAG_DSA=y CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_DSA_TAG_TRAILER=y @@ -1178,19 +1239,12 @@ CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_LTPC=m -CONFIG_COPS=m -CONFIG_COPS_DAYNA=y -CONFIG_COPS_TANGENT=y -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y +# CONFIG_IPX is not set +# CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set CONFIG_PHONET=m +CONFIG_6LOWPAN=m CONFIG_IEEE802154=m CONFIG_IEEE802154_6LOWPAN=m CONFIG_MAC802154=m @@ -1220,6 +1274,8 @@ CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m CONFIG_NET_SCH_FQ=m +CONFIG_NET_SCH_HHF=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m @@ -1237,7 +1293,7 @@ CONFIG_NET_CLS_U32=m CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m -CONFIG_NET_CLS_CGROUP=y +CONFIG_NET_CLS_CGROUP=m CONFIG_NET_CLS_BPF=m # CONFIG_NET_EMATCH is not set CONFIG_NET_CLS_ACT=y @@ -1254,15 +1310,17 @@ CONFIG_NET_ACT_CSUM=m CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set -CONFIG_DNS_RESOLVER=y +CONFIG_DNS_RESOLVER=m CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_NC=y +CONFIG_BATMAN_ADV_MCAST=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m CONFIG_OPENVSWITCH_GRE=y CONFIG_OPENVSWITCH_VXLAN=y +CONFIG_OPENVSWITCH_GENEVE=y CONFIG_VSOCKETS=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_NETLINK_MMAP=y @@ -1272,7 +1330,8 @@ CONFIG_HSR=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y -CONFIG_NETPRIO_CGROUP=m +# CONFIG_CGROUP_NET_PRIO is not set +CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y CONFIG_NET_FLOW_LIMIT=y @@ -1282,7 +1341,7 @@ CONFIG_NET_FLOW_LIMIT=y # CONFIG_NET_PKTGEN=m CONFIG_NET_TCPPROBE=m -CONFIG_NET_DROP_MONITOR=y +CONFIG_NET_DROP_MONITOR=m CONFIG_HAMRADIO=y # @@ -1366,6 +1425,7 @@ CONFIG_VLSI_FIR=m CONFIG_VIA_FIR=m CONFIG_MCS_FIR=m CONFIG_BT=m +CONFIG_BT_6LOWPAN=m CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m @@ -1428,7 +1488,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set +CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_WIMAX=m @@ -1439,6 +1499,7 @@ CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_GPIO=m CONFIG_NET_9P=m CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_RDMA is not set # CONFIG_NET_9P_DEBUG is not set CONFIG_CAIF=m # CONFIG_CAIF_DEBUG is not set @@ -1459,6 +1520,7 @@ CONFIG_NFC_HCI=m # CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m +CONFIG_NFC_TRF7970A=m CONFIG_NFC_MEI_PHY=m CONFIG_NFC_SIM=m CONFIG_NFC_PORT100=m @@ -1466,6 +1528,11 @@ CONFIG_NFC_PN544=m CONFIG_NFC_PN544_MEI=m CONFIG_NFC_MICROREAD=m CONFIG_NFC_MICROREAD_MEI=m +CONFIG_NFC_MRVL=m +CONFIG_NFC_MRVL_USB=m +CONFIG_NFC_ST21NFCA=m +CONFIG_NFC_ST21NFCB=m +CONFIG_NFC_ST21NFCB_I2C=m # # Device Drivers @@ -1474,7 +1541,7 @@ CONFIG_NFC_MICROREAD_MEI=m # # Generic Driver Options # -CONFIG_UEVENT_HELPER_PATH="" +# CONFIG_UEVENT_HELPER is not set CONFIG_DEVTMPFS=y # CONFIG_DEVTMPFS_MOUNT is not set CONFIG_STANDALONE=y @@ -1483,15 +1550,20 @@ CONFIG_FW_LOADER=y # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_EXTRA_FIRMWARE="" CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_ALLOW_DEV_COREDUMP=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m -CONFIG_REGMAP_MMIO=m +CONFIG_REGMAP_SPI=m +CONFIG_REGMAP_MMIO=y CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_FENCE_TRACE is not set # # Bus devices @@ -1555,9 +1627,6 @@ CONFIG_MTD_ABSENT=m CONFIG_MTD_COMPLEX_MAPPINGS=y # CONFIG_MTD_PHYSMAP is not set CONFIG_MTD_PHYSMAP_OF=m -CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m -CONFIG_MTD_TS5500=m # CONFIG_MTD_SBC_GXX is not set # CONFIG_MTD_AMD76XROM is not set # CONFIG_MTD_ICHXROM is not set @@ -1580,9 +1649,8 @@ CONFIG_MTD_PMC551=m # CONFIG_MTD_PMC551_BUGFIX is not set # CONFIG_MTD_PMC551_DEBUG is not set # CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SST25L is not set -# CONFIG_MTD_SLRAM is not set +CONFIG_MTD_SLRAM=m CONFIG_MTD_PHRAM=m CONFIG_MTD_MTDRAM=m CONFIG_MTDRAM_TOTAL_SIZE=4096 @@ -1595,36 +1663,55 @@ CONFIG_MTD_BLOCK2MTD=m CONFIG_MTD_DOCG3=m CONFIG_BCH_CONST_M=14 CONFIG_BCH_CONST_T=4 -# CONFIG_MTD_NAND is not set +CONFIG_MTD_NAND_ECC=m +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_ECC_BCH is not set +CONFIG_MTD_SM_COMMON=m +# CONFIG_MTD_NAND_DENALI is not set +CONFIG_MTD_NAND_GPIO=m +# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +CONFIG_MTD_NAND_DOCG4=m +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_CS553X=m +CONFIG_MTD_NAND_NANDSIM=m +# CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_ONENAND is not set # -# LPDDR flash memory drivers +# LPDDR & LPDDR2 PCM memory drivers # CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m +# CONFIG_MTD_SPI_NOR is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_BLOCK is not set CONFIG_OF=y # # Device Tree and Open Firmware support # -CONFIG_PROC_DEVICETREE=y -# CONFIG_OF_SELFTEST is not set CONFIG_OF_PROMTREE=y CONFIG_OF_ADDRESS=y +CONFIG_OF_ADDRESS_PCI=y CONFIG_OF_IRQ=y CONFIG_OF_NET=y CONFIG_OF_MDIO=m CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y CONFIG_OF_MTD=y -CONFIG_PARPORT=m CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set @@ -1648,6 +1735,9 @@ CONFIG_BLK_DEV=y CONFIG_BLK_DEV_FD=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_ZRAM=m +CONFIG_ZRAM_LZ4_COMPRESS=y +# CONFIG_ZRAM_DEBUG is not set CONFIG_BLK_CPQ_CISS_DA=m # CONFIG_CISS_SCSI_TAPE is not set CONFIG_BLK_DEV_DAC960=m @@ -1689,7 +1779,6 @@ CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m -# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_CS5535_MFGPT=m CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 @@ -1709,7 +1798,7 @@ CONFIG_VMWARE_BALLOON=m CONFIG_BMP085=y CONFIG_BMP085_I2C=m # CONFIG_BMP085_SPI is not set -# CONFIG_PCH_PHUB is not set +CONFIG_PCH_PHUB=m CONFIG_USB_SWITCH_FSA9480=m # CONFIG_LATTICE_ECP3_CONFIG is not set # CONFIG_SRAM is not set @@ -1741,15 +1830,22 @@ CONFIG_SENSORS_LIS3_I2C=m CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m +CONFIG_INTEL_MEI_TXE=m CONFIG_VMWARE_VMCI=m # +# Intel MIC Bus Driver +# + +# # Intel MIC Host Driver # # # Intel MIC Card Driver # +CONFIG_ECHO=m +# CONFIG_CXL_BASE is not set CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1760,8 +1856,8 @@ CONFIG_SCSI_MOD=m CONFIG_RAID_ATTRS=m CONFIG_SCSI=m CONFIG_SCSI_DMA=y -CONFIG_SCSI_TGT=m CONFIG_SCSI_NETLINK=y +# CONFIG_SCSI_MQ_DEFAULT is not set CONFIG_SCSI_PROC_FS=y # @@ -1775,7 +1871,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_ENCLOSURE=m -CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set CONFIG_SCSI_SCAN_ASYNC=y @@ -1785,14 +1880,12 @@ CONFIG_SCSI_SCAN_ASYNC=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_FC_TGT_ATTRS is not set CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y CONFIG_SCSI_SAS_HOST_SMP=y CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_SRP_TGT_ATTRS=y CONFIG_SCSI_LOWLEVEL=y CONFIG_ISCSI_TCP=m CONFIG_ISCSI_BOOT_SYSFS=m @@ -1816,7 +1909,6 @@ CONFIG_AIC7XXX_RESET_DELAY_MS=15000 # CONFIG_AIC7XXX_DEBUG_ENABLE is not set CONFIG_AIC7XXX_DEBUG_MASK=0 CONFIG_AIC7XXX_REG_PRETTY_PRINT=y -# CONFIG_SCSI_AIC7XXX_OLD is not set CONFIG_SCSI_AIC79XX=m CONFIG_AIC79XX_CMDS_PER_DEVICE=32 CONFIG_AIC79XX_RESET_DELAY_MS=15000 @@ -1907,7 +1999,6 @@ CONFIG_SCSI_NSP32=m # CONFIG_SCSI_DEBUG is not set CONFIG_SCSI_PMCRAID=m CONFIG_SCSI_PM8001=m -CONFIG_SCSI_SRP=m CONFIG_SCSI_BFA_FC=m CONFIG_SCSI_VIRTIO=m CONFIG_SCSI_CHELSIO_FCOE=m @@ -1955,11 +2046,9 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=m -CONFIG_SATA_HIGHBANK=m CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PROMISE=m -CONFIG_SATA_RCAR=m CONFIG_SATA_SIL=m CONFIG_SATA_SIS=m CONFIG_SATA_SVW=m @@ -1972,7 +2061,6 @@ CONFIG_SATA_VITESSE=m # CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m -CONFIG_PATA_ARASAN_CF=m CONFIG_PATA_ARTOP=m CONFIG_PATA_ATIIXP=m CONFIG_PATA_ATP867X=m @@ -2042,18 +2130,20 @@ CONFIG_MD_FAULTY=m CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m CONFIG_DM_BIO_PRISON=m CONFIG_DM_PERSISTENT_DATA=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m -# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set CONFIG_DM_CACHE=m CONFIG_DM_CACHE_MQ=m CONFIG_DM_CACHE_CLEANER=m +CONFIG_DM_ERA=m CONFIG_DM_MIRROR=m CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_RAID=m @@ -2070,6 +2160,7 @@ CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m CONFIG_TCM_PSCSI=m +# CONFIG_TCM_USER is not set CONFIG_LOOPBACK_TARGET=m CONFIG_TCM_FC=m CONFIG_ISCSI_TARGET=m @@ -2100,7 +2191,7 @@ CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m CONFIG_MACINTOSH_DRIVERS=y -CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_MAC_EMUMOUSEBTN=m CONFIG_NETDEVICES=y CONFIG_MII=m CONFIG_NET_CORE=y @@ -2121,7 +2212,6 @@ CONFIG_VXLAN=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set CONFIG_NET_POLL_CONTROLLER=y CONFIG_RIONET=m CONFIG_RIONET_TX_SIZE=128 @@ -2184,6 +2274,8 @@ CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y CONFIG_NET_DSA_MV88E6131=m CONFIG_NET_DSA_MV88E6123_61_65=m +CONFIG_NET_DSA_MV88E6171=m +CONFIG_NET_DSA_BCM_SF2=m CONFIG_ETHERNET=y CONFIG_MDIO=m CONFIG_NET_VENDOR_3COM=y @@ -2195,16 +2287,22 @@ CONFIG_VORTEX=m CONFIG_TYPHOON=m CONFIG_NET_VENDOR_ADAPTEC=y CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_AGERE=y +CONFIG_ET131X=m CONFIG_NET_VENDOR_ALTEON=y CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_ALTERA_TSE=m CONFIG_NET_VENDOR_AMD=y CONFIG_AMD8111_ETH=m CONFIG_LANCE=m CONFIG_PCNET32=m CONFIG_PCMCIA_NMCLAN=m CONFIG_NI65=m +CONFIG_AMD_XGBE=m +CONFIG_NET_XGENE=m CONFIG_NET_VENDOR_ARC=y +CONFIG_ARC_EMAC_CORE=m CONFIG_ARC_EMAC=m CONFIG_NET_VENDOR_ATHEROS=y CONFIG_ATL2=m @@ -2212,22 +2310,20 @@ CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m CONFIG_ALX=m -CONFIG_NET_CADENCE=y -CONFIG_ARM_AT91_ETHER=m -CONFIG_MACB=m CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y CONFIG_B44_PCICORE_AUTOSELECT=y CONFIG_B44_PCI=y +CONFIG_BCMGENET=m CONFIG_BNX2=m CONFIG_CNIC=m CONFIG_TIGON3=m CONFIG_BNX2X=m CONFIG_BNX2X_SRIOV=y +CONFIG_SYSTEMPORT=m CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m -CONFIG_NET_CALXEDA_XGMAC=m CONFIG_NET_VENDOR_CHELSIO=y CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y @@ -2239,6 +2335,7 @@ CONFIG_CS89x0=m # CONFIG_CS89x0_PLATFORM is not set CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m +CONFIG_CX_ECAT=m CONFIG_DNET=m CONFIG_NET_VENDOR_DEC=y CONFIG_NET_TULIP=y @@ -2259,6 +2356,7 @@ CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_NET_VENDOR_EMULEX=y CONFIG_BE2NET=m +CONFIG_BE2NET_VXLAN=y CONFIG_NET_VENDOR_EXAR=y CONFIG_S2IO=m CONFIG_VXGE=m @@ -2281,6 +2379,10 @@ CONFIG_IXGBE_HWMON=y CONFIG_IXGBE_DCA=y CONFIG_IXGBEVF=m CONFIG_I40E=m +CONFIG_I40E_VXLAN=y +CONFIG_I40EVF=m +CONFIG_FM10K=m +# CONFIG_FM10K_VXLAN is not set CONFIG_NET_VENDOR_I825XX=y CONFIG_IP1000=m CONFIG_JME=m @@ -2293,16 +2395,18 @@ CONFIG_SKY2=m # CONFIG_SKY2_DEBUG is not set CONFIG_NET_VENDOR_MELLANOX=y CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_VXLAN=y CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y -# CONFIG_MLX5_CORE is not set +CONFIG_MLX5_CORE=m CONFIG_NET_VENDOR_MICREL=y CONFIG_KS8842=m -# CONFIG_KS8851 is not set +CONFIG_KS8851=m CONFIG_KS8851_MLL=m CONFIG_KSZ884X_PCI=m CONFIG_NET_VENDOR_MICROCHIP=y -# CONFIG_ENC28J60 is not set +CONFIG_ENC28J60=m +# CONFIG_ENC28J60_WRITEVERIFY is not set CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y @@ -2329,8 +2433,12 @@ CONFIG_NET_VENDOR_QLOGIC=y CONFIG_QLA3XXX=m CONFIG_QLCNIC=m CONFIG_QLCNIC_SRIOV=y +CONFIG_QLCNIC_VXLAN=y +CONFIG_QLCNIC_HWMON=y CONFIG_QLGE=m CONFIG_NETXEN_NIC=m +CONFIG_NET_VENDOR_QUALCOMM=y +CONFIG_QCA7000=m CONFIG_NET_VENDOR_REALTEK=y CONFIG_ATP=m CONFIG_8139CP=m @@ -2340,9 +2448,10 @@ CONFIG_8139TOO_TUNE_TWISTER=y CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_R8169=m -CONFIG_SH_ETH=m CONFIG_NET_VENDOR_RDC=y CONFIG_R6040=m +CONFIG_NET_VENDOR_SAMSUNG=y +CONFIG_SXGBE_ETH=m CONFIG_NET_VENDOR_SEEQ=y CONFIG_NET_VENDOR_SILAN=y CONFIG_SC92031=m @@ -2397,6 +2506,7 @@ CONFIG_PHYLIB=m # CONFIG_AT803X_PHY=m CONFIG_AMD_PHY=m +CONFIG_AMD_XGBE_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m CONFIG_QSEMI_PHY=m @@ -2405,6 +2515,7 @@ CONFIG_CICADA_PHY=m CONFIG_VITESSE_PHY=m CONFIG_SMSC_PHY=m CONFIG_BROADCOM_PHY=m +CONFIG_BCM7XXX_PHY=m CONFIG_BCM87XX_PHY=m CONFIG_ICPLUS_PHY=m CONFIG_REALTEK_PHY=m @@ -2417,6 +2528,7 @@ CONFIG_MDIO_BITBANG=m CONFIG_MDIO_BUS_MUX=m CONFIG_MDIO_BUS_MUX_GPIO=m CONFIG_MDIO_BUS_MUX_MMIOREG=m +CONFIG_MDIO_BCM_UNIMAC=m # CONFIG_MICREL_KS8995MA is not set CONFIG_PLIP=m CONFIG_PPP=m @@ -2438,8 +2550,9 @@ CONFIG_SLHC=m # CONFIG_SLIP_MODE_SLIP6 is not set # -# USB Network Adapters +# Host-side USB support is needed for USB Network Adapter support # +CONFIG_USB_NET_DRIVERS=m CONFIG_USB_CATC=m CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m @@ -2455,6 +2568,7 @@ CONFIG_USB_NET_HUAWEI_CDC_NCM=m CONFIG_USB_NET_CDC_MBIM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_SR9700=m +CONFIG_USB_NET_SR9800=m CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_GL620A=m @@ -2513,13 +2627,17 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y -# CONFIG_ATH9K_DEBUGFS is not set -# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set +CONFIG_ATH9K_DEBUGFS=y +CONFIG_ATH9K_STATION_STATISTICS=y +# CONFIG_ATH9K_DYNACK is not set +CONFIG_ATH9K_WOW=y CONFIG_ATH9K_RFKILL=y +# CONFIG_ATH9K_CHANNEL_CONTEXT is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m CONFIG_CARL9170_LEDS=y +# CONFIG_CARL9170_DEBUGFS is not set CONFIG_CARL9170_WPC=y # CONFIG_CARL9170_HWRNG is not set CONFIG_ATH6KL=m @@ -2541,12 +2659,16 @@ CONFIG_WCN36XX=m CONFIG_B43=m CONFIG_B43_BCMA=y CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y +CONFIG_B43_PHY_G=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y CONFIG_B43_PHY_HT=y @@ -2567,8 +2689,11 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y CONFIG_BRCMUTIL=m CONFIG_BRCMSMAC=m CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_PROTO_BCDC=y +CONFIG_BRCMFMAC_PROTO_MSGBUF=y CONFIG_BRCMFMAC_SDIO=y CONFIG_BRCMFMAC_USB=y +CONFIG_BRCMFMAC_PCIE=y # CONFIG_BRCM_TRACING is not set # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m @@ -2589,14 +2714,18 @@ CONFIG_IPW2200_QOS=y CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y CONFIG_IWLDVM=m CONFIG_IWLMVM=m CONFIG_IWLWIFI_OPMODE_MODULAR=y +# CONFIG_IWLWIFI_BCAST_FILTERING is not set +# CONFIG_IWLWIFI_UAPSD is not set # # Debugging Options # # CONFIG_IWLWIFI_DEBUG is not set +# CONFIG_IWLWIFI_DEBUGFS is not set CONFIG_IWLWIFI_DEVICE_TRACING=y CONFIG_IWLEGACY=m CONFIG_IWL4965=m @@ -2606,11 +2735,12 @@ CONFIG_IWL3945=m # iwl3945 / iwl4965 Debugging Options # # CONFIG_IWLEGACY_DEBUG is not set +# CONFIG_IWLEGACY_DEBUGFS is not set CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m -# CONFIG_LIBERTAS_SPI is not set +CONFIG_LIBERTAS_SPI=m # CONFIG_LIBERTAS_DEBUG is not set CONFIG_LIBERTAS_MESH=y CONFIG_HERMES=m @@ -2626,7 +2756,8 @@ CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m -# CONFIG_P54_SPI is not set +CONFIG_P54_SPI=m +# CONFIG_P54_SPI_DEFAULT_EEPROM is not set CONFIG_P54_LEDS=y CONFIG_RT2X00=m CONFIG_RT2400PCI=m @@ -2655,19 +2786,25 @@ CONFIG_RT2X00_LIB=m CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_LIB_DEBUGFS is not set # CONFIG_RT2X00_DEBUG is not set CONFIG_RTL_CARDS=m CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m CONFIG_RTL8723AE=m +CONFIG_RTL8723BE=m CONFIG_RTL8188EE=m +CONFIG_RTL8192EE=m +CONFIG_RTL8821AE=m CONFIG_RTL8192CU=m CONFIG_RTLWIFI=m CONFIG_RTLWIFI_PCI=m CONFIG_RTLWIFI_USB=m # CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8723_COMMON=m +CONFIG_RTLBTCOEXIST=m CONFIG_WL_TI=y CONFIG_WL1251=m # CONFIG_WL1251_SPI is not set @@ -2687,6 +2824,10 @@ CONFIG_MWIFIEX_USB=m CONFIG_CW1200=m CONFIG_CW1200_WLAN_SDIO=m CONFIG_CW1200_WLAN_SPI=m +CONFIG_RSI_91X=m +# CONFIG_RSI_DEBUGFS is not set +CONFIG_RSI_SDIO=m +CONFIG_RSI_USB=m # # WiMAX Wireless Broadband devices @@ -2700,6 +2841,7 @@ CONFIG_IEEE802154_FAKEHARD=m CONFIG_IEEE802154_FAKELB=m CONFIG_IEEE802154_AT86RF230=m # CONFIG_IEEE802154_MRF24J40 is not set +# CONFIG_IEEE802154_CC2520 is not set CONFIG_VMXNET3=m CONFIG_HYPERV_NET=m CONFIG_ISDN=y @@ -2795,11 +2937,11 @@ CONFIG_ISDN_DRV_PCBIT=m CONFIG_ISDN_DRV_SC=m CONFIG_ISDN_DRV_ACT2000=m CONFIG_ISDN_CAPI=m -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y CONFIG_CAPI_TRACE=y -CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPIDRV=m +# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set # # CAPI hardware drivers @@ -2891,9 +3033,13 @@ CONFIG_KEYBOARD_MCS=m CONFIG_KEYBOARD_MPR121=m # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_SAMSUNG is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_OMAP4 is not set # CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_CROS_EC is not set +# CONFIG_KEYBOARD_CAP1106 is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ALPS=y @@ -2904,7 +3050,7 @@ CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y -# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_PS2_TOUCHKIT=y CONFIG_MOUSE_PS2_OLPC=y CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_APPLETOUCH=m @@ -2955,13 +3101,15 @@ CONFIG_TABLET_USB_AIPTEK=m CONFIG_TABLET_USB_GTCO=m CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m -CONFIG_TABLET_USB_WACOM=m +CONFIG_TABLET_SERIAL_WACOM4=m CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_OF_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m # CONFIG_TOUCHSCREEN_AD7879_SPI is not set +# CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_AUO_PIXCIR=m CONFIG_TOUCHSCREEN_BU21013=m @@ -3039,6 +3187,7 @@ CONFIG_INPUT_MMA8450=m CONFIG_INPUT_MPU3050=m CONFIG_INPUT_APANEL=m CONFIG_INPUT_GP2A=m +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_TILT_POLLED is not set CONFIG_INPUT_WISTRON_BTNS=m CONFIG_INPUT_ATLAS_BTNS=m @@ -3053,6 +3202,7 @@ CONFIG_INPUT_RETU_PWRBUTTON=m CONFIG_INPUT_UINPUT=m CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_PWM_BEEPER=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m @@ -3061,11 +3211,14 @@ CONFIG_INPUT_ADXL34X_SPI=m CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m +# CONFIG_INPUT_DRV260X_HAPTICS is not set +# CONFIG_INPUT_DRV2667_HAPTICS is not set # # Hardware I/O ports # CONFIG_SERIO=m +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y CONFIG_SERIO_I8042=m CONFIG_SERIO_SERPORT=m CONFIG_SERIO_CT82C710=m @@ -3118,11 +3271,11 @@ CONFIG_TRACE_SINK=m # # Serial drivers # +CONFIG_SERIAL_EARLYCON=y CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_CS=m @@ -3130,18 +3283,21 @@ CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DW=m +# CONFIG_SERIAL_8250_FINTEK is not set # # Non-8250 serial port support # # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set +# CONFIG_SERIAL_MRST_MAX3110 is not set CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m CONFIG_SERIAL_OF_PLATFORM=m CONFIG_SERIAL_SCCNXP=m +CONFIG_SERIAL_SC16IS7XX=m # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m @@ -3159,14 +3315,15 @@ CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m CONFIG_HVC_DRIVER=y -CONFIG_VIRTIO_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m +# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m -CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m @@ -3190,7 +3347,8 @@ CONFIG_IPWIRELESS=m CONFIG_MWAVE=m CONFIG_PC8736x_GPIO=m CONFIG_NSC_GPIO=m -# CONFIG_RAW_DRIVER is not set +CONFIG_RAW_DRIVER=m +CONFIG_MAX_RAW_DEVS=256 CONFIG_HPET=y CONFIG_HPET_MMAP=y CONFIG_HPET_MMAP_DEFAULT=y @@ -3206,6 +3364,11 @@ CONFIG_TCG_INFINEON=m CONFIG_TCG_ST33_I2C=m CONFIG_TELCLOCK=m CONFIG_DEVPORT=y +# CONFIG_XILLYBUS is not set + +# +# I2C support +# CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y @@ -3219,6 +3382,7 @@ CONFIG_I2C_MUX=m # CONFIG_I2C_MUX_GPIO is not set CONFIG_I2C_MUX_PCA9541=m CONFIG_I2C_MUX_PCA954x=m +# CONFIG_I2C_MUX_PINCTRL is not set CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m @@ -3259,6 +3423,7 @@ CONFIG_I2C_SCMI=m # # CONFIG_I2C_CBUS_GPIO is not set CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_DESIGNWARE_PCI=m CONFIG_I2C_EG20T=m # CONFIG_I2C_GPIO is not set @@ -3266,6 +3431,7 @@ CONFIG_I2C_OCORES=m CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PXA=m CONFIG_I2C_PXA_PCI=y +CONFIG_I2C_RK3X=m CONFIG_I2C_SIMTEC=m CONFIG_I2C_XILINX=m @@ -3275,6 +3441,7 @@ CONFIG_I2C_XILINX=m CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_PARPORT=m CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_ROBOTFUZZ_OSIF=m CONFIG_I2C_TAOS_EVM=m CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIPERBOARD=m @@ -3283,6 +3450,7 @@ CONFIG_I2C_VIPERBOARD=m # Other I2C/SMBus bus drivers # CONFIG_I2C_PCA_ISA=m +# CONFIG_I2C_CROS_EC_TUNNEL is not set CONFIG_SCx200_ACB=m # CONFIG_I2C_STUB is not set # CONFIG_I2C_DEBUG_CORE is not set @@ -3295,26 +3463,31 @@ CONFIG_SPI_MASTER=y # # SPI Master Controller Drivers # -# CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_BUTTERFLY is not set -# CONFIG_SPI_GPIO is not set -# CONFIG_SPI_LM70_LLP is not set +CONFIG_SPI_ALTERA=m +CONFIG_SPI_BITBANG=m +CONFIG_SPI_BUTTERFLY=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_LM70_LLP=m # CONFIG_SPI_FSL_SPI is not set -# CONFIG_SPI_OC_TINY is not set -# CONFIG_SPI_PXA2XX is not set -# CONFIG_SPI_PXA2XX_PCI is not set -# CONFIG_SPI_SC18IS602 is not set -# CONFIG_SPI_TOPCLIFF_PCH is not set -# CONFIG_SPI_XCOMM is not set -# CONFIG_SPI_XILINX is not set -# CONFIG_SPI_DESIGNWARE is not set +CONFIG_SPI_OC_TINY=m +CONFIG_SPI_PXA2XX_DMA=y +CONFIG_SPI_PXA2XX=m +CONFIG_SPI_PXA2XX_PCI=m +CONFIG_SPI_SC18IS602=m +CONFIG_SPI_TOPCLIFF_PCH=m +CONFIG_SPI_XCOMM=m +CONFIG_SPI_XILINX=m +CONFIG_SPI_DESIGNWARE=m +CONFIG_SPI_DW_PCI=m +# CONFIG_SPI_DW_MID_DMA is not set +CONFIG_SPI_DW_MMIO=m # # SPI Protocol Masters # -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TLE62X0 is not set +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m +CONFIG_SPMI=m # CONFIG_HSI is not set # @@ -3322,6 +3495,7 @@ CONFIG_SPI_MASTER=y # CONFIG_PPS=m # CONFIG_PPS_DEBUG is not set +# CONFIG_NTP_PPS is not set # # PPS clients support @@ -3341,11 +3515,20 @@ CONFIG_PPS_CLIENT_GPIO=m CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_PINCTRL=y + +# +# Pin controllers +# +# CONFIG_DEBUG_PINCTRL is not set +# CONFIG_PINCTRL_BAYTRAIL is not set +# CONFIG_PINCTRL_SINGLE is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y CONFIG_GPIO_DEVRES=y CONFIG_OF_GPIO=y CONFIG_GPIO_ACPI=y +CONFIG_GPIOLIB_IRQCHIP=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y @@ -3353,19 +3536,22 @@ CONFIG_GPIO_SYSFS=y # Memory mapped GPIO drivers: # # CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_DWAPB is not set # CONFIG_GPIO_IT8761E is not set # CONFIG_GPIO_F7188X is not set -# CONFIG_GPIO_TS5500 is not set +CONFIG_GPIO_SCH311X=m +# CONFIG_GPIO_SYSCON is not set CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set -# CONFIG_GPIO_LYNXPOINT is not set +CONFIG_GPIO_LYNXPOINT=m # CONFIG_GPIO_GRGPIO is not set # # I2C GPIO expanders: # CONFIG_GPIO_ARIZONA=m +CONFIG_GPIO_LP3943=m # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX732X is not set # CONFIG_GPIO_PCA953X is not set @@ -3404,7 +3590,6 @@ CONFIG_GPIO_UCB1400=m # # MODULbus GPIO expanders: # -# CONFIG_GPIO_BCM_KONA is not set # # USB GPIO expanders: @@ -3414,6 +3599,7 @@ CONFIG_GPIO_VIPERBOARD=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=m +# CONFIG_GENERIC_ADC_BATTERY is not set CONFIG_TEST_POWER=m # CONFIG_BATTERY_DS2780 is not set # CONFIG_BATTERY_DS2781 is not set @@ -3434,8 +3620,11 @@ CONFIG_CHARGER_BQ24735=m # CONFIG_CHARGER_SMB347 is not set CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y +# CONFIG_POWER_RESET_GPIO_RESTART is not set +# CONFIG_POWER_RESET_LTC2952 is not set +# CONFIG_POWER_RESET_SYSCON is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=y +CONFIG_HWMON=m CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3444,10 +3633,9 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m -# CONFIG_SENSORS_AD7314 is not set +CONFIG_SENSORS_AD7314=m CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m -# CONFIG_SENSORS_ADCXX is not set CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m @@ -3465,6 +3653,7 @@ CONFIG_SENSORS_ASC7621=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_APPLESMC=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS620=m @@ -3473,22 +3662,43 @@ CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m CONFIG_SENSORS_F71882FG=m CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_MC13783_ADC=m CONFIG_SENSORS_FSCHMD=m -CONFIG_SENSORS_G760A=m -CONFIG_SENSORS_G762=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m -# CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_G762=m +CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_HIH6130=m -CONFIG_SENSORS_HTU21=m -CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m +# CONFIG_SENSORS_IIO_HWMON is not set +CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_POWR1220=m CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LTC2945=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4222=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4260=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m +CONFIG_SENSORS_HTU21=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_ADCXX=m CONFIG_SENSORS_LM63=m -# CONFIG_SENSORS_LM70 is not set +CONFIG_SENSORS_LM70=m CONFIG_SENSORS_LM73=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m @@ -3500,26 +3710,14 @@ CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m CONFIG_SENSORS_LM93=m -CONFIG_SENSORS_LTC4151=m -CONFIG_SENSORS_LTC4215=m -CONFIG_SENSORS_LTC4245=m -CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95234=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m -# CONFIG_SENSORS_MAX1111 is not set -CONFIG_SENSORS_MAX16065=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_MAX1668=m -CONFIG_SENSORS_MAX197=m -CONFIG_SENSORS_MAX6639=m -CONFIG_SENSORS_MAX6642=m -CONFIG_SENSORS_MAX6650=m -CONFIG_SENSORS_MAX6697=m -CONFIG_SENSORS_MCP3021=m -CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6683=m +CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m @@ -3529,13 +3727,15 @@ CONFIG_SENSORS_LTC2978=m CONFIG_SENSORS_MAX16064=m CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_TPS40422=m CONFIG_SENSORS_UCD9000=m CONFIG_SENSORS_UCD9200=m CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_PWM_FAN=m CONFIG_SENSORS_SHT15=m CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SHTC1=m CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_SMM665=m CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_EMC1403=m CONFIG_SENSORS_EMC2103=m @@ -3546,14 +3746,17 @@ CONFIG_SENSORS_SMSC47B397=m CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_ADC128D818=m CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m -# CONFIG_SENSORS_ADS7871 is not set +CONFIG_SENSORS_ADS7871=m CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_INA209=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP103=m CONFIG_SENSORS_TMP401=m CONFIG_SENSORS_TMP421=m CONFIG_SENSORS_VIA_CPUTEMP=m @@ -3570,8 +3773,6 @@ CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_APPLESMC=m -CONFIG_SENSORS_MC13783_ADC=m # # ACPI drivers @@ -3579,17 +3780,21 @@ CONFIG_SENSORS_MC13783_ADC=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y -CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_OF=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_GOV_BANG_BANG=y CONFIG_THERMAL_GOV_USER_SPACE=y # CONFIG_CPU_THERMAL is not set # CONFIG_THERMAL_EMULATION is not set CONFIG_INTEL_POWERCLAMP=m CONFIG_X86_PKG_TEMP_THERMAL=m +CONFIG_INTEL_SOC_DTS_THERMAL=m +CONFIG_INT340X_THERMAL=m +CONFIG_ACPI_THERMAL_REL=m # # Texas Instruments thermal drivers @@ -3602,6 +3807,10 @@ CONFIG_WATCHDOG_CORE=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_GPIO_WATCHDOG=m +CONFIG_XILINX_WATCHDOG=m +CONFIG_DW_WATCHDOG=m +# CONFIG_RN5T618_WATCHDOG is not set CONFIG_RETU_WATCHDOG=m CONFIG_ACQUIRE_WDT=m CONFIG_ADVANTECH_WDT=m @@ -3610,7 +3819,6 @@ CONFIG_ALIM7101_WDT=m CONFIG_F71808E_WDT=m CONFIG_SP5100_TCO=m CONFIG_GEODE_WDT=m -CONFIG_SC520_WDT=m CONFIG_SBC_FITPC2_WATCHDOG=m CONFIG_EUROTECH_WDT=m CONFIG_IB700_WDT=m @@ -3635,8 +3843,6 @@ CONFIG_SMSC_SCH311X_WDT=m CONFIG_SMSC37B787_WDT=m CONFIG_VIA_WDT=m CONFIG_W83627HF_WDT=m -CONFIG_W83697HF_WDT=m -CONFIG_W83697UG_WDT=m CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m @@ -3698,17 +3904,21 @@ CONFIG_BCMA_DRIVER_GPIO=y # CONFIG_MFD_CORE=y CONFIG_MFD_CS5535=m -# CONFIG_MFD_CROS_EC is not set +CONFIG_MFD_BCM590XX=m +CONFIG_MFD_CROS_EC=m +CONFIG_MFD_CROS_EC_I2C=m +CONFIG_MFD_CROS_EC_SPI=m # CONFIG_MFD_DA9052_SPI is not set -CONFIG_MFD_MC13783=m CONFIG_MFD_MC13XXX=m # CONFIG_MFD_MC13XXX_SPI is not set CONFIG_MFD_MC13XXX_I2C=m +# CONFIG_MFD_HI6421_PMIC is not set CONFIG_HTC_PASIC3=m CONFIG_LPC_ICH=m CONFIG_LPC_SCH=m # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_MENF21BMC is not set # CONFIG_EZX_PCAP is not set CONFIG_MFD_VIPERBOARD=m CONFIG_MFD_RETU=m @@ -3718,17 +3928,22 @@ CONFIG_PCF50633_GPIO=m CONFIG_UCB1400_CORE=m CONFIG_MFD_RDC321X=m CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_RTSX_USB=m +CONFIG_MFD_RK808=m +CONFIG_MFD_RN5T618=m CONFIG_MFD_SI476X_CORE=m CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y CONFIG_ABX500_CORE=y # CONFIG_MFD_STMPE is not set -# CONFIG_MFD_SYSCON is not set +CONFIG_MFD_SYSCON=y CONFIG_MFD_TI_AM335X_TSCADC=m +CONFIG_MFD_LP3943=m # CONFIG_TPS6105X is not set CONFIG_TPS65010=m CONFIG_TPS6507X=m CONFIG_MFD_TPS65217=m +CONFIG_MFD_TPS65218=m # CONFIG_MFD_TPS65912 is not set # CONFIG_MFD_TPS65912_SPI is not set CONFIG_MFD_WL1273_CORE=m @@ -3743,6 +3958,7 @@ CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y # CONFIG_MFD_WM8997 is not set # CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_WM8994 is not set # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m @@ -3753,6 +3969,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_ANALOG_TV_SUPPORT=y CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_SDR_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m @@ -3771,7 +3988,7 @@ CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_VIDEOBUF2_DMA_SG=m -# CONFIG_VIDEO_V4L2_INT_DEVICE is not set +CONFIG_VIDEOBUF2_DVB=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y CONFIG_TTPCI_EEPROM=m @@ -3791,12 +4008,14 @@ CONFIG_IR_RC5_DECODER=m CONFIG_IR_RC6_DECODER=m CONFIG_IR_JVC_DECODER=m CONFIG_IR_SONY_DECODER=m -CONFIG_IR_RC5_SZ_DECODER=m CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_XMP_DECODER=m CONFIG_RC_DEVICES=y CONFIG_RC_ATI_REMOTE=m CONFIG_IR_ENE=m +CONFIG_IR_HIX5HD2=m CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m CONFIG_IR_ITE_CIR=m @@ -3807,6 +4026,14 @@ CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m CONFIG_IR_IGUANA=m CONFIG_IR_TTUSBIR=m +CONFIG_IR_IMG=m +# CONFIG_IR_IMG_RAW is not set +CONFIG_IR_IMG_HW=y +CONFIG_IR_IMG_NEC=y +CONFIG_IR_IMG_JVC=y +CONFIG_IR_IMG_SONY=y +CONFIG_IR_IMG_SHARP=y +CONFIG_IR_IMG_SANYO=y CONFIG_RC_LOOPBACK=m CONFIG_IR_GPIO_CIR=m CONFIG_MEDIA_USB_SUPPORT=y @@ -3823,6 +4050,7 @@ CONFIG_USB_GL860=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_DTCS033=m CONFIG_USB_GSPCA_ETOMS=m CONFIG_USB_GSPCA_FINEPIX=m CONFIG_USB_GSPCA_JEILINJ=m @@ -3871,7 +4099,6 @@ CONFIG_VIDEO_CPIA2=m CONFIG_USB_ZR364XX=m CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m -CONFIG_USB_SN9C102=m CONFIG_VIDEO_USBTV=m # @@ -3887,12 +4114,17 @@ CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160_AC97=y CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set # # Analog/digital TV USB devices # CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828_V4L2=y +CONFIG_VIDEO_AU0828_RC=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3940,23 +4172,32 @@ CONFIG_DVB_USB_AZ6007=m CONFIG_DVB_USB_CE6230=m CONFIG_DVB_USB_EC168=m CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_IT913X=m CONFIG_DVB_USB_LME2510=m CONFIG_DVB_USB_MXL111SF=m CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_USB_DVBSKY=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m CONFIG_SMS_USB_DRV=m CONFIG_DVB_B2C2_FLEXCOP_USB=m # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set +CONFIG_DVB_AS102=m # # Webcam, TV (analog/digital) USB devices # CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_V4L2=m CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m CONFIG_VIDEO_EM28XX_RC=m + +# +# Software defined radio USB devices +# +CONFIG_USB_AIRSPY=m +CONFIG_USB_HACKRF=m +CONFIG_USB_MSI2500=m CONFIG_MEDIA_PCI_SUPPORT=y # @@ -3981,6 +4222,8 @@ CONFIG_VIDEO_ZORAN_AVS6EYES=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_SOLO6X10=m +CONFIG_VIDEO_TW68=m # # Media capture/analog/hybrid TV support @@ -4004,11 +4247,13 @@ CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7134_GO7007=m CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # +CONFIG_DVB_AV7110_IR=y CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_CORE=m @@ -4021,6 +4266,7 @@ CONFIG_DVB_B2C2_FLEXCOP_PCI=m CONFIG_DVB_PLUTO2=m CONFIG_DVB_DM1105=m CONFIG_DVB_PT1=m +CONFIG_DVB_PT3=m CONFIG_MANTIS_CORE=m CONFIG_DVB_MANTIS=m CONFIG_DVB_HOPPER=m @@ -4030,8 +4276,9 @@ CONFIG_DVB_DDBRIDGE=m CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m CONFIG_VIDEO_SH_VEU=m -CONFIG_VIDEO_RENESAS_VSP1=m -# CONFIG_V4L_TEST_DRIVERS is not set +CONFIG_V4L_TEST_DRIVERS=y +# CONFIG_VIDEO_VIVID is not set +CONFIG_VIDEO_MEM2MEM_TESTDEV=m # # Supported MMC/SDIO adapters @@ -4047,14 +4294,17 @@ CONFIG_RADIO_TEA575X=m CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_SI4713=m +CONFIG_PLATFORM_SI4713=m +CONFIG_I2C_SI4713=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SHARK=m CONFIG_RADIO_SHARK2=m -CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI4713=m CONFIG_USB_KEENE=m +CONFIG_USB_RAREMONO=m CONFIG_USB_MA901=m CONFIG_RADIO_TEA5764=m CONFIG_RADIO_SAA7706H=m @@ -4086,6 +4336,7 @@ CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) @@ -4162,6 +4413,11 @@ CONFIG_VIDEO_UPD64031A=m CONFIG_VIDEO_UPD64083=m # +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m + +# # Miscellaneous helper chips # CONFIG_VIDEO_M52790=m @@ -4177,6 +4433,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m CONFIG_MEDIA_TUNER_TDA9887=m CONFIG_MEDIA_TUNER_TEA5761=m CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MSI001=m CONFIG_MEDIA_TUNER_MT20XX=m CONFIG_MEDIA_TUNER_MT2060=m CONFIG_MEDIA_TUNER_MT2063=m @@ -4197,9 +4454,13 @@ CONFIG_MEDIA_TUNER_FC0013=m CONFIG_MEDIA_TUNER_TDA18212=m CONFIG_MEDIA_TUNER_E4000=m CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_M88TS2022=m CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m CONFIG_MEDIA_TUNER_IT913X=m CONFIG_MEDIA_TUNER_R820T=m +CONFIG_MEDIA_TUNER_MXL301RF=m +CONFIG_MEDIA_TUNER_QM1D1C0042=m # # Multistandard (satellite) frontends @@ -4208,12 +4469,14 @@ CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m +CONFIG_DVB_M88DS3103=m # # Multistandard (cable + terrestrial) frontends # CONFIG_DVB_DRXK=m CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_SI2165=m # # DVB-S (satellite) frontends @@ -4269,6 +4532,9 @@ CONFIG_DVB_STV0367=m CONFIG_DVB_CXD2820R=m CONFIG_DVB_RTL2830=m CONFIG_DVB_RTL2832=m +CONFIG_DVB_RTL2832_SDR=m +CONFIG_DVB_SI2168=m +CONFIG_DVB_AS102_FE=m # # DVB-C (cable) frontends @@ -4300,6 +4566,7 @@ CONFIG_DVB_S5H1411=m CONFIG_DVB_S921=m CONFIG_DVB_DIB8000=m CONFIG_DVB_MB86A20S=m +CONFIG_DVB_TC90522=m # # Digital terrestrial only tuners/PLL @@ -4311,6 +4578,7 @@ CONFIG_DVB_TUNER_DIB0090=m # # SEC control devices for DVB-S # +CONFIG_DVB_DRX39XYJ=m CONFIG_DVB_LNBP21=m CONFIG_DVB_LNBP22=m CONFIG_DVB_ISL6405=m @@ -4321,7 +4589,6 @@ CONFIG_DVB_LGS8GXX=m CONFIG_DVB_ATBM8830=m CONFIG_DVB_TDA665x=m CONFIG_DVB_IX2505V=m -CONFIG_DVB_IT913X_FE=m CONFIG_DVB_M88RS2000=m CONFIG_DVB_AF9033=m @@ -4344,11 +4611,15 @@ CONFIG_AGP_SIS=m CONFIG_AGP_SWORKS=m CONFIG_AGP_VIA=m CONFIG_AGP_EFFICEON=m +CONFIG_INTEL_GTT=m CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VGA_SWITCHEROO=y + +# +# Direct Rendering Manager +# CONFIG_DRM=m -CONFIG_DRM_USB=m CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y @@ -4360,6 +4631,7 @@ CONFIG_DRM_TTM=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_PTN3460=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m @@ -4386,11 +4658,14 @@ CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_QXL=m -CONFIG_VGASTATE=m -CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_HDMI=y +CONFIG_DRM_BOCHS=m + +# +# Frame buffer Devices +# CONFIG_FB=y CONFIG_FIRMWARE_EDID=y +CONFIG_FB_CMDLINE=y CONFIG_FB_DDC=m CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y @@ -4424,6 +4699,7 @@ CONFIG_FB_VESA=y CONFIG_FB_EFI=y # CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set +CONFIG_FB_OPENCORES=m # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_RIVA is not set @@ -4452,11 +4728,9 @@ CONFIG_FB_VOODOO1=m # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set # CONFIG_FB_GEODE is not set -# CONFIG_FB_TMIO is not set # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m -# CONFIG_FB_GOLDFISH is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -4464,7 +4738,7 @@ CONFIG_FB_VIRTUAL=m # CONFIG_FB_AUO_K190X is not set CONFIG_FB_HYPERV=m # CONFIG_FB_SIMPLE is not set -# CONFIG_EXYNOS_VIDEO is not set +CONFIG_FB_SSD1307=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m # CONFIG_LCD_L4F00242T03 is not set @@ -4497,6 +4771,8 @@ CONFIG_BACKLIGHT_LM3630A=m # CONFIG_BACKLIGHT_GPIO is not set # CONFIG_BACKLIGHT_LV5207LP is not set # CONFIG_BACKLIGHT_BD6107 is not set +CONFIG_VGASTATE=m +CONFIG_HDMI=y # # Console display driver support @@ -4509,7 +4785,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_LOGO is not set -CONFIG_FB_SSD1307=m CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set @@ -4530,7 +4805,7 @@ CONFIG_SND_HRTIMER=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_MAX_CARDS=32 -CONFIG_SND_SUPPORT_OLD_API=y +# CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set @@ -4646,30 +4921,6 @@ CONFIG_SND_ES1968_INPUT=y CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_DSP_LOADER=y -CONFIG_SND_HDA_PREALLOC_SIZE=4096 -CONFIG_SND_HDA_HWDEP=y -CONFIG_SND_HDA_RECONFIG=y -CONFIG_SND_HDA_INPUT_BEEP=y -CONFIG_SND_HDA_INPUT_BEEP_MODE=1 -CONFIG_SND_HDA_INPUT_JACK=y -CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_CODEC_REALTEK=y -CONFIG_SND_HDA_CODEC_ANALOG=y -CONFIG_SND_HDA_CODEC_SIGMATEL=y -CONFIG_SND_HDA_CODEC_VIA=y -CONFIG_SND_HDA_CODEC_HDMI=y -CONFIG_SND_HDA_I915=y -CONFIG_SND_HDA_CODEC_CIRRUS=y -CONFIG_SND_HDA_CODEC_CONEXANT=y -CONFIG_SND_HDA_CODEC_CA0110=y -CONFIG_SND_HDA_CODEC_CA0132=y -CONFIG_SND_HDA_CODEC_CA0132_DSP=y -CONFIG_SND_HDA_CODEC_CMEDIA=y -CONFIG_SND_HDA_CODEC_SI3054=y -CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m CONFIG_SND_ICE1712=m @@ -4696,6 +4947,35 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m + +# +# HD-Audio +# +CONFIG_SND_HDA=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_PREALLOC_SIZE=4096 +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=m +CONFIG_SND_HDA_CODEC_ANALOG=m +CONFIG_SND_HDA_CODEC_SIGMATEL=m +CONFIG_SND_HDA_CODEC_VIA=m +CONFIG_SND_HDA_CODEC_HDMI=m +CONFIG_SND_HDA_I915=y +CONFIG_SND_HDA_CODEC_CIRRUS=m +CONFIG_SND_HDA_CODEC_CONEXANT=m +CONFIG_SND_HDA_CODEC_CA0110=m +CONFIG_SND_HDA_CODEC_CA0132=m +CONFIG_SND_HDA_CODEC_CA0132_DSP=y +CONFIG_SND_HDA_CODEC_CMEDIA=m +CONFIG_SND_HDA_CODEC_SI3054=m +CONFIG_SND_HDA_GENERIC=m +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m @@ -4706,12 +4986,15 @@ CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_US122L=m CONFIG_SND_USB_6FIRE=m CONFIG_SND_USB_HIFACE=m +CONFIG_SND_BCD2000=m CONFIG_SND_FIREWIRE=y CONFIG_SND_FIREWIRE_LIB=m CONFIG_SND_DICE=m CONFIG_SND_FIREWIRE_SPEAKERS=m CONFIG_SND_ISIGHT=m CONFIG_SND_SCS1X=m +CONFIG_SND_FIREWORKS=m +CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m @@ -4740,6 +5023,7 @@ CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_DRAGONRISE_FF=y @@ -4749,6 +5033,7 @@ CONFIG_HID_ELO=m CONFIG_HID_EZKEY=m CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y +CONFIG_HID_GT683R=m CONFIG_HID_HUION=m CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m @@ -4759,7 +5044,7 @@ CONFIG_HID_ICADE=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m CONFIG_HID_LCPOWER=m -CONFIG_HID_LENOVO_TPKBD=m +CONFIG_HID_LENOVO=m CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH_DJ=m CONFIG_LOGITECH_FF=y @@ -4774,6 +5059,7 @@ CONFIG_HID_NTRIG=m CONFIG_HID_ORTEK=m CONFIG_HID_PANTHERLORD=m CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PENMOUNT=m CONFIG_HID_PETALYNX=m CONFIG_HID_PICOLCD=m CONFIG_HID_PICOLCD_FB=y @@ -4790,6 +5076,7 @@ CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y CONFIG_HID_HYPERV_MOUSE=m @@ -4824,7 +5111,6 @@ CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=m -# CONFIG_USB_DEBUG is not set # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set # @@ -4833,6 +5119,8 @@ CONFIG_USB=m CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DYNAMIC_MINORS=y # CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_FSM is not set CONFIG_USB_MON=m CONFIG_USB_WUSB=m CONFIG_USB_WUSB_CBAF=m @@ -4843,6 +5131,7 @@ CONFIG_USB_WUSB_CBAF=m # CONFIG_USB_C67X00_HCD=m CONFIG_USB_XHCI_HCD=m +CONFIG_USB_XHCI_PCI=m CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y @@ -4853,7 +5142,8 @@ CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m CONFIG_USB_FUSBH200_HCD=m -CONFIG_USB_FOTG210_HCD=m +# CONFIG_USB_FOTG210_HCD is not set +CONFIG_USB_MAX3421_HCD=m CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_PCI=m # CONFIG_USB_OHCI_HCD_SSB is not set @@ -4864,23 +5154,11 @@ CONFIG_USB_SL811_HCD=m # CONFIG_USB_SL811_HCD_ISO is not set CONFIG_USB_SL811_CS=m CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_RENESAS_USBHS_HCD=m CONFIG_USB_WHCI_HCD=m CONFIG_USB_HWA_HCD=m # CONFIG_USB_HCD_BCMA is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_HCD_TEST_MODE is not set -CONFIG_USB_MUSB_HDRC=m -# CONFIG_USB_MUSB_HOST is not set -# CONFIG_USB_MUSB_GADGET is not set -CONFIG_USB_MUSB_DUAL_ROLE=y -CONFIG_USB_MUSB_TUSB6010=m -CONFIG_USB_MUSB_DSPS=m -CONFIG_USB_MUSB_UX500=m -CONFIG_USB_MUSB_AM335X_CHILD=m -# CONFIG_USB_UX500_DMA is not set -CONFIG_MUSB_PIO_ONLY=y -CONFIG_USB_RENESAS_USBHS=m # # USB Device Class drivers @@ -4913,13 +5191,29 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m # # USB Imaging devices # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_HOST=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_USB_MUSB_HDRC=m +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_GADGET is not set +CONFIG_USB_MUSB_DUAL_ROLE=y +CONFIG_USB_MUSB_TUSB6010=m +CONFIG_USB_MUSB_DSPS=m +CONFIG_USB_MUSB_UX500=m +CONFIG_USB_MUSB_AM335X_CHILD=m +# CONFIG_USB_UX500_DMA is not set +CONFIG_MUSB_PIO_ONLY=y # CONFIG_USB_DWC3 is not set +# CONFIG_USB_DWC2 is not set # CONFIG_USB_CHIPIDEA is not set # @@ -4957,6 +5251,7 @@ CONFIG_USB_SERIAL_METRO=m CONFIG_USB_SERIAL_MOS7720=m CONFIG_USB_SERIAL_MOS7715_PARPORT=y CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MXUPORT=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_OTI6858=m @@ -4976,7 +5271,6 @@ CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_WISHBONE=m -CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m # CONFIG_USB_SERIAL_DEBUG is not set @@ -5008,6 +5302,7 @@ CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m CONFIG_USB_HSIC_USB3503=m +CONFIG_USB_LINK_LAYER_TEST=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m @@ -5019,12 +5314,10 @@ CONFIG_USB_XUSBATM=m # CONFIG_USB_PHY=y CONFIG_NOP_USB_XCEIV=m -CONFIG_SAMSUNG_USBPHY=m -CONFIG_SAMSUNG_USB2PHY=m -CONFIG_SAMSUNG_USB3PHY=m # CONFIG_USB_GPIO_VBUS is not set +CONFIG_TAHVO_USB=m +# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -5036,9 +5329,9 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # USB Peripheral Controller # CONFIG_USB_FUSB300=m -CONFIG_USB_FOTG210_UDC=m +# CONFIG_USB_FOTG210_UDC is not set +CONFIG_USB_GR_UDC=m CONFIG_USB_R8A66597=m -CONFIG_USB_RENESAS_USBHS_UDC=m CONFIG_USB_PXA27X=m CONFIG_USB_MV_UDC=m CONFIG_USB_MV_U3D=m @@ -5049,12 +5342,12 @@ CONFIG_USB_NET2272_DMA=y CONFIG_USB_NET2280=m CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m +CONFIG_USB_GADGET_XILINX=m CONFIG_USB_DUMMY_HCD=m CONFIG_USB_LIBCOMPOSITE=m CONFIG_USB_F_ACM=m CONFIG_USB_U_SERIAL=m CONFIG_USB_U_ETHER=m -CONFIG_USB_U_RNDIS=m CONFIG_USB_F_SERIAL=m CONFIG_USB_F_OBEX=m CONFIG_USB_F_NCM=m @@ -5062,6 +5355,9 @@ CONFIG_USB_F_ECM=m CONFIG_USB_F_SUBSET=m CONFIG_USB_F_RNDIS=m CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_FS=m +CONFIG_USB_F_UAC2=m +CONFIG_USB_F_UVC=m # CONFIG_USB_CONFIGFS is not set # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m @@ -5089,13 +5385,13 @@ CONFIG_USB_G_DBGP=m # CONFIG_USB_G_DBGP_PRINTK is not set CONFIG_USB_G_DBGP_SERIAL=y CONFIG_USB_G_WEBCAM=m +CONFIG_USB_LED_TRIG=y CONFIG_UWB=m CONFIG_UWB_HWA=m CONFIG_UWB_WHCI=m CONFIG_UWB_I1480U=m CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set # CONFIG_MMC_CLKGATE is not set # @@ -5115,6 +5411,9 @@ CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_RICOH_MMC=y CONFIG_MMC_SDHCI_ACPI=m CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_SDHCI_OF_ARASAN=m +CONFIG_MMC_SDHCI_PXAV3=m +CONFIG_MMC_SDHCI_PXAV2=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m CONFIG_MMC_SDRICOH_CS=m @@ -5122,7 +5421,9 @@ CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m +CONFIG_MMC_USDHI6ROL0=m CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -5131,7 +5432,7 @@ CONFIG_MEMSTICK=m # # CONFIG_MEMSTICK_UNSAFE_RESUME is not set CONFIG_MSPRO_BLOCK=m -# CONFIG_MS_BLOCK is not set +CONFIG_MS_BLOCK=m # # MemoryStick Host Controller Drivers @@ -5140,8 +5441,9 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS=m # # LED drivers @@ -5151,19 +5453,18 @@ CONFIG_LEDS_LM3533=m CONFIG_LEDS_LM3642=m CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set -# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_GPIO=m CONFIG_LEDS_LP3944=m CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m CONFIG_LEDS_LP5562=m -# CONFIG_LEDS_LP8501 is not set +CONFIG_LEDS_LP8501=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m -# CONFIG_LEDS_PCA963X is not set -CONFIG_LEDS_PCA9685=m -# CONFIG_LEDS_DAC124S085 is not set -# CONFIG_LEDS_PWM is not set +CONFIG_LEDS_PCA963X=m +CONFIG_LEDS_DAC124S085=m +CONFIG_LEDS_PWM=m CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -5172,6 +5473,10 @@ CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# CONFIG_LEDS_BLINKM=m # @@ -5182,7 +5487,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m -# CONFIG_LEDS_TRIGGER_CPU is not set +CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -5193,7 +5498,32 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=m CONFIG_LEDS_TRIGGER_CAMERA=m CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_AMSO1100=m +# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_CXGB4=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_INFINIBAND_OCRDMA=m +CONFIG_INFINIBAND_USNIC=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +CONFIG_INFINIBAND_IPOIB_DEBUG=y +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_SRPT=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_ISERT=m CONFIG_EDAC=y CONFIG_EDAC_LEGACY_SYSFS=y # CONFIG_EDAC_DEBUG is not set @@ -5207,6 +5537,7 @@ CONFIG_EDAC_I82875P=m CONFIG_EDAC_I82975X=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I3200=m +CONFIG_EDAC_IE31200=m CONFIG_EDAC_X38=m CONFIG_EDAC_I5400=m CONFIG_EDAC_I7CORE=m @@ -5238,14 +5569,18 @@ CONFIG_RTC_DRV_DS1307=m CONFIG_RTC_DRV_DS1374=m CONFIG_RTC_DRV_DS1672=m CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_HYM8563=m CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RK808=m CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_ISL12057=m CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF85063=m CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80_WDT=y @@ -5263,6 +5598,8 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_M41T93 is not set # CONFIG_RTC_DRV_M41T94 is not set # CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1343 is not set +# CONFIG_RTC_DRV_DS1347 is not set # CONFIG_RTC_DRV_DS1390 is not set # CONFIG_RTC_DRV_MAX6902 is not set # CONFIG_RTC_DRV_R9701 is not set @@ -5270,6 +5607,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_DS3234 is not set # CONFIG_RTC_DRV_PCF2123 is not set # CONFIG_RTC_DRV_RX4581 is not set +# CONFIG_RTC_DRV_MCP795 is not set # # Platform RTC drivers @@ -5279,6 +5617,7 @@ CONFIG_RTC_DRV_DS1286=m CONFIG_RTC_DRV_DS1511=m CONFIG_RTC_DRV_DS1553=m CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_STK17TA8=m CONFIG_RTC_DRV_M48T86=m CONFIG_RTC_DRV_M48T35=m @@ -5287,7 +5626,6 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_PCF50633=m # @@ -5295,7 +5633,7 @@ CONFIG_RTC_DRV_PCF50633=m # CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_SNVS=m -# CONFIG_RTC_DRV_MOXART is not set +# CONFIG_RTC_DRV_XGENE is not set # # HID Sensor RTC drivers @@ -5312,9 +5650,10 @@ CONFIG_INTEL_IOATDMA=m CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m -CONFIG_TIMB_DMA=m CONFIG_PCH_DMA=m +CONFIG_FSL_EDMA=m CONFIG_DMA_ENGINE=y +CONFIG_DMA_VIRTUAL_CHANNELS=m CONFIG_DMA_ACPI=y CONFIG_DMA_OF=y @@ -5345,7 +5684,7 @@ CONFIG_VFIO=m CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y CONFIG_VIRT_DRIVERS=y -CONFIG_VIRTIO=y +CONFIG_VIRTIO=m # # Virtio drivers @@ -5362,26 +5701,17 @@ CONFIG_HYPERV=m CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_BALLOON=m CONFIG_STAGING=y -CONFIG_ET131X=m CONFIG_SLICOSS=m -CONFIG_USBIP_CORE=m -CONFIG_USBIP_VHCI_HCD=m -CONFIG_USBIP_HOST=m -# CONFIG_USBIP_DEBUG is not set -CONFIG_W35UND=m CONFIG_PRISM2_USB=m -CONFIG_ECHO=m CONFIG_COMEDI=m # CONFIG_COMEDI_DEBUG is not set CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 CONFIG_COMEDI_MISC_DRIVERS=y -CONFIG_COMEDI_KCOMEDILIB=m CONFIG_COMEDI_BOND=m CONFIG_COMEDI_TEST=m CONFIG_COMEDI_PARPORT=m CONFIG_COMEDI_SERIAL2002=m -CONFIG_COMEDI_SKEL=m CONFIG_COMEDI_SSV_DNP=m CONFIG_COMEDI_ISA_DRIVERS=y CONFIG_COMEDI_PCL711=m @@ -5397,6 +5727,7 @@ CONFIG_COMEDI_AMPLC_PC236_ISA=m CONFIG_COMEDI_AMPLC_PC263_ISA=m CONFIG_COMEDI_RTI800=m CONFIG_COMEDI_RTI802=m +CONFIG_COMEDI_DAC02=m CONFIG_COMEDI_DAS16M1=m CONFIG_COMEDI_DAS08_ISA=m CONFIG_COMEDI_DAS16=m @@ -5428,7 +5759,6 @@ CONFIG_COMEDI_PCMDA12=m CONFIG_COMEDI_PCMMIO=m CONFIG_COMEDI_PCMUIO=m CONFIG_COMEDI_MULTIQ3=m -CONFIG_COMEDI_POC=m CONFIG_COMEDI_S526=m CONFIG_COMEDI_PCI_DRIVERS=y CONFIG_COMEDI_8255_PCI=m @@ -5463,6 +5793,7 @@ CONFIG_COMEDI_DAS08_PCI=m CONFIG_COMEDI_DT3000=m CONFIG_COMEDI_DYNA_PCI10XX=m CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_MF6X4=m CONFIG_COMEDI_ICP_MULTI=m CONFIG_COMEDI_DAQBOARD2000=m CONFIG_COMEDI_JR3_PCI=m @@ -5495,21 +5826,23 @@ CONFIG_COMEDI_NI_MIO_CS=m CONFIG_COMEDI_QUATECH_DAQP_CS=m CONFIG_COMEDI_USB_DRIVERS=y CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_NI_USB6501=m CONFIG_COMEDI_USBDUX=m CONFIG_COMEDI_USBDUXFAST=m CONFIG_COMEDI_USBDUXSIGMA=m CONFIG_COMEDI_VMK80XX=m CONFIG_COMEDI_8255=m -CONFIG_COMEDI_FC=m +CONFIG_COMEDI_KCOMEDILIB=m CONFIG_COMEDI_AMPLC_DIO200=m CONFIG_COMEDI_AMPLC_PC236=m CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_LABPC_ISADMA=m CONFIG_COMEDI_NI_TIO=m -# CONFIG_FB_OLPC_DCON is not set +CONFIG_FB_OLPC_DCON=m +CONFIG_FB_OLPC_DCON_1=y +CONFIG_FB_OLPC_DCON_1_5=y # CONFIG_PANEL is not set -CONFIG_R8187SE=m CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m @@ -5519,27 +5852,105 @@ CONFIG_RTL8192E=m CONFIG_R8712U=m CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y -CONFIG_88EU_P2P=y -CONFIG_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set -# CONFIG_TRANZPORT is not set -CONFIG_IDE_PHISON=m +CONFIG_R8723AU=m +CONFIG_8723AU_AP_MODE=y +CONFIG_8723AU_BT_COEXIST=y +CONFIG_RTS5208=m CONFIG_LINE6_USB=m # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set -CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m -CONFIG_DX_SEP=m -CONFIG_ZSMALLOC=y -CONFIG_ZRAM=m -# CONFIG_ZRAM_DEBUG is not set -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m -CONFIG_FB_SM7XX=m -CONFIG_CRYSTALHD=m + +# +# IIO staging drivers +# + +# +# Accelerometers +# +# CONFIG_ADIS16201 is not set +# CONFIG_ADIS16203 is not set +# CONFIG_ADIS16204 is not set +# CONFIG_ADIS16209 is not set +# CONFIG_ADIS16220 is not set +# CONFIG_ADIS16240 is not set +# CONFIG_LIS3L02DQ is not set +# CONFIG_SCA3000 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7606 is not set +# CONFIG_AD7780 is not set +# CONFIG_AD7816 is not set +# CONFIG_AD7192 is not set +# CONFIG_AD7280 is not set + +# +# Analog digital bi-direction converters +# +# CONFIG_ADT7316 is not set + +# +# Capacitance to digital converters +# +# CONFIG_AD7150 is not set +# CONFIG_AD7152 is not set +# CONFIG_AD7746 is not set + +# +# Direct Digital Synthesis +# +# CONFIG_AD9832 is not set +# CONFIG_AD9834 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16060 is not set + +# +# Network Analyzer, Impedance Converters +# +# CONFIG_AD5933 is not set + +# +# Light sensors +# +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_SENSORS_ISL29028 is not set +# CONFIG_TSL2583 is not set +# CONFIG_TSL2x7x is not set + +# +# Magnetometer sensors +# +CONFIG_SENSORS_HMC5843=m +CONFIG_SENSORS_HMC5843_I2C=m +CONFIG_SENSORS_HMC5843_SPI=m + +# +# Active energy metering IC +# +# CONFIG_ADE7753 is not set +# CONFIG_ADE7754 is not set +# CONFIG_ADE7758 is not set +# CONFIG_ADE7759 is not set +# CONFIG_ADE7854 is not set + +# +# Resolver to digital converters +# +# CONFIG_AD2S90 is not set +# CONFIG_AD2S1200 is not set +# CONFIG_AD2S1210 is not set + +# +# Triggers - standalone +# +# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set +# CONFIG_IIO_SIMPLE_DUMMY is not set CONFIG_FB_XGI=m -CONFIG_ACPI_QUICKSTART=m -CONFIG_USB_ENESTORAGE=m CONFIG_BCM_WIMAX=m CONFIG_FT1000=m CONFIG_FT1000_USB=m @@ -5567,17 +5978,13 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m CONFIG_STAGING_MEDIA=y -CONFIG_DVB_AS102=m +CONFIG_I2C_BCM2048=m CONFIG_DVB_CXD2099=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set -# CONFIG_USB_MSI3101 is not set -CONFIG_SOLO6X10=m +CONFIG_VIDEO_V4L2_INT_DEVICE=m +CONFIG_VIDEO_TCM825X=m CONFIG_LIRC_STAGING=y CONFIG_LIRC_BT829=m CONFIG_LIRC_IGORPLUGUSB=m @@ -5601,38 +6008,38 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y -# CONFIG_LTE_GDM724X is not set -CONFIG_NET_VENDOR_SILICOM=y -CONFIG_SBYPASS=m -CONFIG_BPCTL=m -CONFIG_CED1401=m -CONFIG_DGRP=m +CONFIG_LTE_GDM724X=m CONFIG_FIREWIRE_SERIAL=m -# CONFIG_USB_DWC2 is not set +CONFIG_FWTTY_MAX_TOTAL_PORTS=64 +CONFIG_FWTTY_MAX_CARD_PORTS=32 +# CONFIG_MTD_SPINAND_MT29F is not set CONFIG_LUSTRE_FS=m CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192 # CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set -CONFIG_LUSTRE_LLITE_LLOOP=y +CONFIG_LUSTRE_LLITE_LLOOP=m CONFIG_LNET=m CONFIG_LNET_MAX_PAYLOAD=1048576 CONFIG_LNET_SELFTEST=m -CONFIG_USB_BTMTK=m -# CONFIG_XILLYBUS is not set +CONFIG_LNET_XPRT_IB=m CONFIG_DGNC=m CONFIG_DGAP=m +CONFIG_GS_FPGABOOT=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m +CONFIG_ALIENWARE_WMI=m CONFIG_ASUS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m +CONFIG_DELL_SMO8800=m CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_FUJITSU_TABLET=m CONFIG_AMILO_RFKILL=m CONFIG_TC1100_WMI=m CONFIG_HP_ACCEL=m +CONFIG_HP_WIRELESS=m CONFIG_HP_WMI=m CONFIG_MSI_LAPTOP=m CONFIG_PANASONIC_LAPTOP=m @@ -5658,6 +6065,7 @@ CONFIG_MSI_WMI=m CONFIG_TOPSTAR_LAPTOP=m CONFIG_ACPI_TOSHIBA=m CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_TOSHIBA_HAPS=m CONFIG_ACPI_CMPC=m CONFIG_INTEL_IPS=m CONFIG_IBM_RTL=m @@ -5668,19 +6076,46 @@ CONFIG_MXM_WMI=m CONFIG_INTEL_OAKTRAIL=m CONFIG_SAMSUNG_Q10=m CONFIG_APPLE_GMUX=m -CONFIG_INTEL_RST=y +CONFIG_INTEL_RST=m CONFIG_INTEL_SMARTCONNECT=y CONFIG_PVPANIC=m CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_LAPTOP=m +CONFIG_CHROMEOS_PSTORE=m + +# +# SOC (System On Chip) specific Drivers +# +# CONFIG_SOC_TI is not set +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +CONFIG_COMMON_CLK_RK808=m +# CONFIG_COMMON_CLK_SI5351 is not set +# CONFIG_COMMON_CLK_SI570 is not set +# CONFIG_COMMON_CLK_PXA is not set +# CONFIG_COMMON_CLK_QCOM is not set # # Hardware Spinlock drivers # + +# +# Clock Source drivers +# CONFIG_CLKSRC_I8253=y CONFIG_CLKEVT_I8253=y CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y +# CONFIG_ATMEL_PIT is not set +# CONFIG_SH_TIMER_CMT is not set +# CONFIG_SH_TIMER_MTU2 is not set +# CONFIG_SH_TIMER_TMU is not set +# CONFIG_EM_TIMER_STI is not set # CONFIG_MAILBOX is not set CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y @@ -5699,26 +6134,231 @@ CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers # -# CONFIG_PM_DEVFREQ is not set + +# +# SOC (System On Chip) specific Drivers +# +CONFIG_PM_DEVFREQ=y + +# +# DEVFREQ Governors +# +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m +CONFIG_DEVFREQ_GOV_PERFORMANCE=m +CONFIG_DEVFREQ_GOV_POWERSAVE=m +CONFIG_DEVFREQ_GOV_USERSPACE=m + +# +# DEVFREQ Drivers +# CONFIG_EXTCON=m # # Extcon Device Drivers # -CONFIG_OF_EXTCON=m +# CONFIG_EXTCON_ADC_JACK is not set CONFIG_EXTCON_GPIO=m +# CONFIG_EXTCON_RT8973A is not set +CONFIG_EXTCON_SM5502=m CONFIG_MEMORY=y -# CONFIG_IIO is not set +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=y +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 + +# +# Accelerometers +# +# CONFIG_BMA180 is not set +# CONFIG_BMC150_ACCEL is not set +CONFIG_HID_SENSOR_ACCEL_3D=m +CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m +CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +# CONFIG_KXSD9 is not set +# CONFIG_MMA8452 is not set +CONFIG_KXCJK1013=m + +# +# Analog to digital converters +# +# CONFIG_AD7266 is not set +# CONFIG_AD7291 is not set +# CONFIG_AD7298 is not set +# CONFIG_AD7476 is not set +# CONFIG_AD7791 is not set +# CONFIG_AD7793 is not set +# CONFIG_AD7887 is not set +# CONFIG_AD7923 is not set +# CONFIG_AD799X is not set +# CONFIG_MAX1027 is not set +# CONFIG_MAX1363 is not set +# CONFIG_MCP320X is not set +# CONFIG_MCP3422 is not set +# CONFIG_NAU7802 is not set +# CONFIG_TI_ADC081C is not set +# CONFIG_TI_ADC128S052 is not set +# CONFIG_TI_AM335X_ADC is not set +# CONFIG_VF610_ADC is not set +# CONFIG_VIPERBOARD_ADC is not set + +# +# Amplifiers +# +# CONFIG_AD8366 is not set + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# Digital to analog converters +# +# CONFIG_AD5064 is not set +# CONFIG_AD5360 is not set +# CONFIG_AD5380 is not set +# CONFIG_AD5421 is not set +# CONFIG_AD5446 is not set +# CONFIG_AD5449 is not set +# CONFIG_AD5504 is not set +# CONFIG_AD5624R_SPI is not set +# CONFIG_AD5686 is not set +# CONFIG_AD5755 is not set +# CONFIG_AD5764 is not set +# CONFIG_AD5791 is not set +# CONFIG_AD7303 is not set +# CONFIG_MAX517 is not set +# CONFIG_MAX5821 is not set +# CONFIG_MCP4725 is not set +# CONFIG_MCP4922 is not set + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +# CONFIG_AD9523 is not set + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +# CONFIG_ADF4350 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16080 is not set +# CONFIG_ADIS16130 is not set +# CONFIG_ADIS16136 is not set +# CONFIG_ADIS16260 is not set +# CONFIG_ADXRS450 is not set +# CONFIG_BMG160 is not set +CONFIG_HID_SENSOR_GYRO_3D=m +CONFIG_IIO_ST_GYRO_3AXIS=m +CONFIG_IIO_ST_GYRO_I2C_3AXIS=m +CONFIG_IIO_ST_GYRO_SPI_3AXIS=m +# CONFIG_ITG3200 is not set + +# +# Humidity sensors +# +# CONFIG_DHT11 is not set +# CONFIG_SI7005 is not set + +# +# Inertial measurement units +# +# CONFIG_ADIS16400 is not set +# CONFIG_ADIS16480 is not set +# CONFIG_INV_MPU6050_IIO is not set + +# +# Light sensors +# +# CONFIG_ADJD_S311 is not set +# CONFIG_AL3320A is not set +# CONFIG_APDS9300 is not set +# CONFIG_CM32181 is not set +# CONFIG_CM36651 is not set +# CONFIG_GP2AP020A00F is not set +# CONFIG_ISL29125 is not set +CONFIG_HID_SENSOR_ALS=m +# CONFIG_HID_SENSOR_PROX is not set +# CONFIG_SENSORS_LM3533 is not set +# CONFIG_LTR501 is not set +# CONFIG_TCS3414 is not set +# CONFIG_TCS3472 is not set +# CONFIG_SENSORS_TSL2563 is not set +# CONFIG_TSL4531 is not set +# CONFIG_VCNL4000 is not set + +# +# Magnetometer sensors +# +# CONFIG_AK8975 is not set +# CONFIG_AK09911 is not set +# CONFIG_MAG3110 is not set +CONFIG_HID_SENSOR_MAGNETOMETER_3D=m +CONFIG_IIO_ST_MAGN_3AXIS=m +CONFIG_IIO_ST_MAGN_I2C_3AXIS=m +CONFIG_IIO_ST_MAGN_SPI_3AXIS=m + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m + +# +# Triggers - standalone +# +CONFIG_IIO_INTERRUPT_TRIGGER=m +# CONFIG_IIO_SYSFS_TRIGGER is not set + +# +# Pressure sensors +# +# CONFIG_HID_SENSOR_PRESS is not set +# CONFIG_MPL115 is not set +# CONFIG_MPL3115 is not set +# CONFIG_IIO_ST_PRESS is not set +# CONFIG_T5403 is not set + +# +# Lightning sensors +# +# CONFIG_AS3935 is not set + +# +# Temperature sensors +# +# CONFIG_MLX90614 is not set +# CONFIG_TMP006 is not set # CONFIG_NTB is not set # CONFIG_VME_BUS is not set CONFIG_PWM=y CONFIG_PWM_SYSFS=y +CONFIG_PWM_FSL_FTM=m +# CONFIG_PWM_LP3943 is not set +CONFIG_PWM_LPSS=m +CONFIG_PWM_LPSS_PCI=m +CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_PWM_PCA9685 is not set CONFIG_IRQCHIP=y CONFIG_IPACK_BUS=m CONFIG_BOARD_TPCI200=m CONFIG_SERIAL_IPOCTAL=m -# CONFIG_RESET_CONTROLLER is not set +CONFIG_RESET_CONTROLLER=y CONFIG_FMC=m CONFIG_FMC_FAKEDEV=m CONFIG_FMC_TRIVIAL=m @@ -5728,11 +6368,13 @@ CONFIG_FMC_CHARDEV=m # # PHY Subsystem # -CONFIG_GENERIC_PHY=m -CONFIG_PHY_EXYNOS_MIPI_VIDEO=m -CONFIG_PHY_EXYNOS_DP_VIDEO=m +CONFIG_GENERIC_PHY=y +CONFIG_BCM_KONA_USB2_PHY=m CONFIG_POWERCAP=y CONFIG_INTEL_RAPL=m +# CONFIG_MCB is not set +CONFIG_RAS=y +CONFIG_THUNDERBOLT=m # # Firmware Drivers @@ -5744,6 +6386,7 @@ CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y CONFIG_DMI_SYSFS=m +CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m # CONFIG_GOOGLE_FIRMWARE is not set @@ -5752,6 +6395,8 @@ CONFIG_ISCSI_IBFT=m # EFI (Extensible Firmware Interface) Support # # CONFIG_EFI_VARS is not set +CONFIG_EFI_RUNTIME_MAP=y +CONFIG_EFI_RUNTIME_WRAPPERS=y CONFIG_UEFI_CPER=y # @@ -5819,7 +6464,7 @@ CONFIG_QUOTACTL=y CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m -CONFIG_GENERIC_ACL=y +CONFIG_OVERLAY_FS=m # # Caches @@ -5861,6 +6506,7 @@ CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_SYSCTL=y CONFIG_PROC_PAGE_MONITOR=y +CONFIG_KERNFS=y CONFIG_SYSFS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y @@ -5916,7 +6562,11 @@ CONFIG_OMFS_FS=m # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set -# CONFIG_ROMFS_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y CONFIG_PSTORE=y # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_FTRACE is not set @@ -5961,6 +6611,7 @@ CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_V4_SECURITY_LABEL=y # CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_GRACE_PERIOD=m CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_ACL_SUPPORT=m @@ -5971,8 +6622,11 @@ CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m +CONFIG_SUNRPC_XPRT_RDMA_SERVER=m CONFIG_CEPH_FS=m CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set @@ -6028,7 +6682,7 @@ CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_3=m CONFIG_NLS_ISO8859_4=m @@ -6065,7 +6719,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y # printk and dmesg options # CONFIG_PRINTK_TIME=y -CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_BOOT_PRINTK_DELAY is not set CONFIG_DYNAMIC_DEBUG=y @@ -6124,8 +6778,10 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 CONFIG_SCHED_DEBUG=y CONFIG_SCHEDSTATS=y +# CONFIG_SCHED_STACK_END_CHECK is not set CONFIG_TIMER_STATS=y # CONFIG_DEBUG_PREEMPT is not set @@ -6133,20 +6789,20 @@ CONFIG_TIMER_STATS=y # Lock Debugging (spinlocks, mutexes, etc...) # # CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set -CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_MUTEXES is not set # CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_LOCK_TORTURE_TEST is not set CONFIG_STACKTRACE=y # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_WRITECOUNT is not set # CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_PI_LIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_DEBUG_CREDENTIALS is not set @@ -6154,8 +6810,8 @@ CONFIG_DEBUG_BUGVERBOSE=y # # RCU Debugging # -# CONFIG_PROVE_RCU_DELAY is not set # CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_TORTURE_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set @@ -6172,7 +6828,6 @@ CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y -CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y @@ -6211,6 +6866,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -6228,9 +6884,14 @@ CONFIG_PERCPU_TEST=m CONFIG_ASYNC_RAID6_TEST=m # CONFIG_TEST_STRING_HELPERS is not set CONFIG_TEST_KSTRTOX=m +# CONFIG_TEST_RHASHTABLE is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DMA_API_DEBUG is not set +# CONFIG_TEST_LKM is not set +# CONFIG_TEST_USER_COPY is not set +# CONFIG_TEST_BPF is not set +# CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_UDELAY is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set @@ -6242,7 +6903,7 @@ CONFIG_EARLY_PRINTK_EFI=y # CONFIG_X86_PTDUMP is not set CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_SET_MODULE_RONX is not set +CONFIG_DEBUG_SET_MODULE_RONX=y # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set @@ -6276,36 +6937,18 @@ CONFIG_ENCRYPTED_KEYS=m # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_NETWORK_XFRM is not set +# CONFIG_SECURITY_NETWORK is not set CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -# CONFIG_SECURITY_SELINUX_DISABLE is not set -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 -# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set -CONFIG_SECURITY_SMACK=y -CONFIG_SECURITY_TOMOYO=y -CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 -CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 -# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set -CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 -CONFIG_SECURITY_APPARMOR_HASH=y +# CONFIG_SECURITY_SMACK is not set +# CONFIG_SECURITY_TOMOYO is not set +# CONFIG_SECURITY_APPARMOR is not set CONFIG_SECURITY_YAMA=y CONFIG_SECURITY_YAMA_STACKED=y +CONFIG_INTEGRITY=y +# CONFIG_INTEGRITY_SIGNATURE is not set # CONFIG_IMA is not set -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_SMACK is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +# CONFIG_EVM is not set # CONFIG_DEFAULT_SECURITY_YAMA is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" @@ -6332,7 +6975,7 @@ CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP=m CONFIG_CRYPTO_PCOMP2=y -CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y @@ -6341,6 +6984,7 @@ CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_ABLK_HELPER=m @@ -6379,7 +7023,7 @@ CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRC32_PCLMUL=m -CONFIG_CRYPTO_CRCT10DIF=m +CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -6388,7 +7032,7 @@ CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m @@ -6434,6 +7078,7 @@ CONFIG_CRYPTO_LZ4HC=m # Random Number Generation # CONFIG_CRYPTO_ANSI_CPRNG=m +# CONFIG_CRYPTO_DRBG_MENU is not set CONFIG_CRYPTO_USER_API=m CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m @@ -6445,12 +7090,20 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m CONFIG_CRYPTO_DEV_GEODE=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_CCP=y +CONFIG_CRYPTO_DEV_CCP_DD=m +CONFIG_CRYPTO_DEV_CCP_CRYPTO=m +CONFIG_CRYPTO_DEV_QAT=m +CONFIG_CRYPTO_DEV_QAT_DH895xCC=m CONFIG_ASYMMETRIC_KEY_TYPE=m CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m CONFIG_PUBLIC_KEY_ALGO_RSA=m CONFIG_X509_CERTIFICATE_PARSER=m +CONFIG_PKCS7_MESSAGE_PARSER=m +CONFIG_PKCS7_TEST_KEY=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQFD=y CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_APIC_ARCHITECTURE=y @@ -6465,7 +7118,7 @@ CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_KVM_MMU_AUDIT=y CONFIG_KVM_DEVICE_ASSIGNMENT=y -CONFIG_LGUEST=m +# CONFIG_LGUEST is not set CONFIG_BINARY_PRINTF=y # @@ -6481,9 +7134,10 @@ CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IO=y CONFIG_PERCPU_RWSEM=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m -CONFIG_CRC_T10DIF=m +CONFIG_CRC_T10DIF=y CONFIG_CRC_ITU_T=m CONFIG_CRC32=y # CONFIG_CRC32_SELFTEST is not set @@ -6494,7 +7148,7 @@ CONFIG_CRC32_SLICEBY8=y CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_CRC8=m -CONFIG_AUDIT_GENERIC=y +# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set # CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y @@ -6522,6 +7176,7 @@ CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_ENC8=y CONFIG_REED_SOLOMON_DEC8=y +CONFIG_REED_SOLOMON_DEC16=y CONFIG_BCH=m CONFIG_BCH_CONST_PARAMS=y CONFIG_TEXTSEARCH=y @@ -6529,13 +7184,16 @@ CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y +CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_CPU_RMAP=y CONFIG_DQL=y +CONFIG_GLOB=y +# CONFIG_GLOB_SELFTEST is not set CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_LRU_CACHE=m @@ -6555,7 +7213,9 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_ACORN_8x8 is not set # CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_6x10 is not set # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set CONFIG_FONT_AUTOSELECT=y +CONFIG_ARCH_HAS_SG_CHAIN=y diff --git a/abs/core/linux/config.x86_64 b/abs/core/linux/config.x86_64 index 8a0e906..895756e 100644 --- a/abs/core/linux/config.x86_64 +++ b/abs/core/linux/config.x86_64 @@ -1,11 +1,12 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.13.0 Kernel Configuration +# Linux/x86 3.18.0 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y +CONFIG_PERF_EVENTS_INTEL_UNCORE=y CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" CONFIG_LOCKDEP_SUPPORT=y @@ -23,7 +24,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_ARCH_HAS_CPU_AUTOPROBE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y @@ -40,6 +40,7 @@ CONFIG_X86_64_SMP=y CONFIG_X86_HT=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_FIX_EARLYCON_MEM=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -70,17 +71,18 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_FHANDLE=y -CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y +# CONFIG_USELIB is not set +# CONFIG_AUDIT is not set +CONFIG_HAVE_ARCH_AUDITSYSCALL=y # # IRQ subsystem # CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set @@ -88,6 +90,7 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -103,7 +106,7 @@ CONFIG_NO_HZ_COMMON=y # CONFIG_HZ_PERIODIC is not set CONFIG_NO_HZ_IDLE=y # CONFIG_NO_HZ_FULL is not set -CONFIG_NO_HZ=y +# CONFIG_NO_HZ is not set CONFIG_HIGH_RES_TIMERS=y # @@ -124,6 +127,7 @@ CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y +# CONFIG_TASKS_RCU is not set CONFIG_RCU_STALL_COMMON=y # CONFIG_RCU_USER_QS is not set CONFIG_RCU_FANOUT=64 @@ -132,18 +136,15 @@ CONFIG_RCU_FANOUT_LEAF=16 CONFIG_RCU_FAST_NO_HZ=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_RCU_BOOST is not set -CONFIG_RCU_NOCB_CPU=y -CONFIG_RCU_NOCB_CPU_NONE=y -# CONFIG_RCU_NOCB_CPU_ZERO is not set -# CONFIG_RCU_NOCB_CPU_ALL is not set +# CONFIG_RCU_NOCB_CPU is not set +CONFIG_BUILD_BIN2C=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_SUPPORTS_INT128=y -CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y -CONFIG_ARCH_USES_NUMA_PROT_NONE=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NUMA_BALANCING=y CONFIG_CGROUPS=y @@ -157,7 +158,7 @@ CONFIG_RESOURCE_COUNTERS=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y # CONFIG_MEMCG_SWAP_ENABLED is not set -CONFIG_MEMCG_KMEM=y +# CONFIG_MEMCG_KMEM is not set # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -166,16 +167,14 @@ CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set -CONFIG_CHECKPOINT_RESTORE=y +# CONFIG_CHECKPOINT_RESTORE is not set CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y # CONFIG_USER_NS is not set CONFIG_PID_NS=y CONFIG_NET_NS=y -# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set CONFIG_SCHED_AUTOGROUP=y -CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -192,8 +191,11 @@ CONFIG_ANON_INODES=y CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BPF=y # CONFIG_EXPERT is not set CONFIG_UID16=y +CONFIG_SGETMASK_SYSCALL=y +CONFIG_SYSFS_SYSCALL=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set @@ -207,8 +209,10 @@ CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y +# CONFIG_BPF_SYSCALL is not set CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_ADVISE_SYSCALLS=y CONFIG_PCI_QUIRKS=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -224,6 +228,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y +CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -246,8 +251,10 @@ CONFIG_HAVE_OPTPROBES=y CONFIG_HAVE_KPROBES_ON_FTRACE=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y @@ -264,6 +271,11 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +# CONFIG_CC_STACKPROTECTOR_REGULAR is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -282,7 +294,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -290,11 +301,12 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set +# CONFIG_MODULE_COMPRESS is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y -# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_CMDLINE_PARSER is not set @@ -339,6 +351,11 @@ CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUE_RWLOCK=y +CONFIG_QUEUE_RWLOCK=y CONFIG_FREEZER=y # @@ -346,10 +363,13 @@ CONFIG_FREEZER=y # CONFIG_ZONE_DMA=y CONFIG_SMP=y +CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y # CONFIG_X86_EXTENDED_PLATFORM is not set -# CONFIG_X86_INTEL_LPSS is not set +CONFIG_X86_INTEL_LPSS=y +CONFIG_IOSF_MBI=m +# CONFIG_IOSF_MBI_DEBUG is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_HYPERVISOR_GUEST=y @@ -358,11 +378,11 @@ CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_SPINLOCKS is not set CONFIG_XEN=y CONFIG_XEN_DOM0=y -CONFIG_XEN_PRIVILEGED_GUEST=y CONFIG_XEN_PVHVM=y CONFIG_XEN_MAX_DOMAIN_MEMORY=500 CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set +CONFIG_XEN_PVH=y CONFIG_KVM_GUEST=y # CONFIG_KVM_DEBUG_FS is not set CONFIG_PARAVIRT_TIME_ACCOUNTING=y @@ -409,14 +429,16 @@ CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX64=y CONFIG_I8K=m -CONFIG_MICROCODE=m +CONFIG_MICROCODE=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y -CONFIG_MICROCODE_INTEL_LIB=y -# CONFIG_MICROCODE_INTEL_EARLY is not set -# CONFIG_MICROCODE_AMD_EARLY is not set +CONFIG_MICROCODE_INTEL_EARLY=y +CONFIG_MICROCODE_AMD_EARLY=y +CONFIG_MICROCODE_EARLY=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m CONFIG_ARCH_PHYS_ADDR_T_64BIT=y @@ -455,29 +477,33 @@ CONFIG_MEMORY_HOTREMOVE=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_MEMORY_BALLOON=y CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y +CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y # CONFIG_CMA is not set -CONFIG_ZBUD=y CONFIG_ZSWAP=y -CONFIG_MEM_SOFT_DIRTY=y +CONFIG_ZPOOL=y +CONFIG_ZBUD=y +CONFIG_ZSMALLOC=y +# CONFIG_PGTABLE_MAPPING is not set +CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_RESERVE_LOW=64 @@ -491,8 +517,8 @@ CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y CONFIG_EFI=y CONFIG_EFI_STUB=y +CONFIG_EFI_MIXED=y CONFIG_SECCOMP=y -CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=y @@ -504,6 +530,7 @@ CONFIG_KEXEC=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y +# CONFIG_RANDOMIZE_BASE is not set CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set @@ -538,10 +565,13 @@ CONFIG_PM_SLEEP_DEBUG=y # CONFIG_DPM_WATCHDOG is not set CONFIG_PM_TRACE=y CONFIG_PM_TRACE_RTC=y +CONFIG_PM_CLK=y # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set CONFIG_ACPI=y +CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y +CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ACPI_SLEEP=y -# CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m @@ -566,6 +596,9 @@ CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m CONFIG_ACPI_BGRT=y +# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set +CONFIG_HAVE_ACPI_APEI=y +CONFIG_HAVE_ACPI_APEI_NMI=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y @@ -613,7 +646,6 @@ CONFIG_X86_SPEEDSTEP_LIB=m # CPU Idle # CONFIG_CPU_IDLE=y -# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set @@ -686,8 +718,8 @@ CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m CONFIG_HOTPLUG_PCI_SHPC=m -CONFIG_RAPIDIO=y -CONFIG_RAPIDIO_TSI721=y +CONFIG_RAPIDIO=m +CONFIG_RAPIDIO_TSI721=m CONFIG_RAPIDIO_DISC_TIMEOUT=30 # CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set CONFIG_RAPIDIO_DMA_ENGINE=y @@ -697,10 +729,10 @@ CONFIG_RAPIDIO_ENUM_BASIC=m # # RapidIO Switch drivers # -CONFIG_RAPIDIO_TSI57X=y -CONFIG_RAPIDIO_CPS_XX=y -CONFIG_RAPIDIO_TSI568=y -CONFIG_RAPIDIO_CPS_GEN2=y +CONFIG_RAPIDIO_TSI57X=m +CONFIG_RAPIDIO_CPS_XX=m +CONFIG_RAPIDIO_TSI568=m +CONFIG_RAPIDIO_CPS_GEN2=m # CONFIG_X86_SYSFB is not set # @@ -715,13 +747,14 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y CONFIG_IA32_EMULATION=y -CONFIG_IA32_AOUT=m -CONFIG_X86_X32=y +# CONFIG_IA32_AOUT is not set +# CONFIG_X86_X32 is not set CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y CONFIG_KEYS_COMPAT=y CONFIG_X86_DEV_DMA_OPS=y +CONFIG_PMC_ATOM=y CONFIG_NET=y CONFIG_COMPAT_NETLINK_MESSAGES=y @@ -761,6 +794,9 @@ CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_SYN_COOKIES=y CONFIG_NET_IPVTI=m +CONFIG_NET_UDP_TUNNEL=m +CONFIG_NET_FOU=m +CONFIG_GENEVE=m CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m @@ -786,6 +822,7 @@ CONFIG_TCP_CONG_LP=m CONFIG_TCP_CONG_VENO=m CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" @@ -815,11 +852,12 @@ CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set CONFIG_NETLABEL=y CONFIG_NETWORK_SECMARK=y +CONFIG_NET_PTP_CLASSIFY=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=y +CONFIG_BRIDGE_NETFILTER=m # # Core Netfilter Configuration @@ -829,6 +867,7 @@ CONFIG_NETFILTER_NETLINK_ACCT=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_ZONES=y @@ -868,6 +907,7 @@ CONFIG_NF_NAT_SIP=m CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_SYNPROXY=m CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_INET=m CONFIG_NFT_EXTHDR=m CONFIG_NFT_META=m CONFIG_NFT_CT=m @@ -876,7 +916,11 @@ CONFIG_NFT_HASH=m CONFIG_NFT_COUNTER=m CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m +CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m +CONFIG_NFT_QUEUE=m +CONFIG_NFT_REJECT=m +CONFIG_NFT_REJECT_INET=m CONFIG_NFT_COMPAT=m CONFIG_NETFILTER_XTABLES=m @@ -890,7 +934,6 @@ CONFIG_NETFILTER_XT_SET=m # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_AUDIT=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m @@ -903,6 +946,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_NAT=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m @@ -921,6 +965,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m CONFIG_NETFILTER_XT_MATCH_BPF=m +CONFIG_NETFILTER_XT_MATCH_CGROUP=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m @@ -937,8 +982,10 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_L2TP=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m @@ -968,9 +1015,11 @@ CONFIG_IP_SET_BITMAP_IP=m CONFIG_IP_SET_BITMAP_IPMAC=m CONFIG_IP_SET_BITMAP_PORT=m CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPMARK=m CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_MAC=m CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NETNET=m @@ -978,7 +1027,7 @@ CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_VS=m -# CONFIG_IP_VS_IPV6 is not set +CONFIG_IP_VS_IPV6=y # CONFIG_IP_VS_DEBUG is not set CONFIG_IP_VS_TAB_BITS=12 @@ -999,6 +1048,7 @@ CONFIG_IP_VS_RR=m CONFIG_IP_VS_WRR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_FO=m CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_DH=m @@ -1024,11 +1074,21 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m CONFIG_NF_TABLES_IPV4=m -CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_NF_REJECT_IPV4=m +CONFIG_NFT_REJECT_IPV4=m CONFIG_NF_TABLES_ARP=m +CONFIG_NF_NAT_IPV4=m +CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_NF_NAT_MASQUERADE_IPV4=m +CONFIG_NFT_MASQ_IPV4=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -1037,15 +1097,10 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT_IPV4=m +CONFIG_IP_NF_NAT=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -1063,7 +1118,13 @@ CONFIG_NF_DEFRAG_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NFT_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +CONFIG_NF_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NF_NAT_MASQUERADE_IPV6=m +CONFIG_NFT_MASQ_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1081,10 +1142,13 @@ CONFIG_IP6_NF_TARGET_SYNPROXY=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m -CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_NAT=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NF_LOG_BRIDGE=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1105,7 +1169,6 @@ CONFIG_BRIDGE_EBT_MARK_T=m CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_ULOG=m CONFIG_BRIDGE_EBT_NFLOG=m CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m @@ -1152,6 +1215,7 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_HAVE_NET_DSA=y CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_BRCM=y CONFIG_NET_DSA_TAG_DSA=y CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_DSA_TAG_TRAILER=y @@ -1161,15 +1225,12 @@ CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y +# CONFIG_IPX is not set +# CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set CONFIG_PHONET=m +CONFIG_6LOWPAN=m CONFIG_IEEE802154=m CONFIG_IEEE802154_6LOWPAN=m CONFIG_MAC802154=m @@ -1199,6 +1260,8 @@ CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m CONFIG_NET_SCH_FQ=m +CONFIG_NET_SCH_HHF=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m @@ -1216,7 +1279,7 @@ CONFIG_NET_CLS_U32=m CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m -CONFIG_NET_CLS_CGROUP=y +CONFIG_NET_CLS_CGROUP=m CONFIG_NET_CLS_BPF=m # CONFIG_NET_EMATCH is not set CONFIG_NET_CLS_ACT=y @@ -1233,15 +1296,17 @@ CONFIG_NET_ACT_CSUM=m CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set -CONFIG_DNS_RESOLVER=y +CONFIG_DNS_RESOLVER=m CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_NC=y +CONFIG_BATMAN_ADV_MCAST=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m CONFIG_OPENVSWITCH_GRE=y CONFIG_OPENVSWITCH_VXLAN=y +CONFIG_OPENVSWITCH_GENEVE=y CONFIG_VSOCKETS=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_NETLINK_MMAP=y @@ -1251,7 +1316,8 @@ CONFIG_HSR=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y -CONFIG_NETPRIO_CGROUP=m +# CONFIG_CGROUP_NET_PRIO is not set +CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y CONFIG_BPF_JIT=y @@ -1262,7 +1328,7 @@ CONFIG_NET_FLOW_LIMIT=y # CONFIG_NET_PKTGEN=m CONFIG_NET_TCPPROBE=m -CONFIG_NET_DROP_MONITOR=y +CONFIG_NET_DROP_MONITOR=m CONFIG_HAMRADIO=y # @@ -1341,6 +1407,7 @@ CONFIG_VLSI_FIR=m CONFIG_VIA_FIR=m CONFIG_MCS_FIR=m CONFIG_BT=m +CONFIG_BT_6LOWPAN=m CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m @@ -1403,7 +1470,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set +CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_WIMAX=m @@ -1414,6 +1481,7 @@ CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_GPIO=m CONFIG_NET_9P=m CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_RDMA is not set # CONFIG_NET_9P_DEBUG is not set CONFIG_CAIF=m # CONFIG_CAIF_DEBUG is not set @@ -1434,6 +1502,7 @@ CONFIG_NFC_HCI=m # CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m +CONFIG_NFC_TRF7970A=m CONFIG_NFC_MEI_PHY=m CONFIG_NFC_SIM=m CONFIG_NFC_PORT100=m @@ -1441,6 +1510,11 @@ CONFIG_NFC_PN544=m CONFIG_NFC_PN544_MEI=m CONFIG_NFC_MICROREAD=m CONFIG_NFC_MICROREAD_MEI=m +CONFIG_NFC_MRVL=m +CONFIG_NFC_MRVL_USB=m +CONFIG_NFC_ST21NFCA=m +CONFIG_NFC_ST21NFCB=m +CONFIG_NFC_ST21NFCB_I2C=m CONFIG_HAVE_BPF_JIT=y # @@ -1450,7 +1524,7 @@ CONFIG_HAVE_BPF_JIT=y # # Generic Driver Options # -CONFIG_UEVENT_HELPER_PATH="" +# CONFIG_UEVENT_HELPER is not set CONFIG_DEVTMPFS=y # CONFIG_DEVTMPFS_MOUNT is not set CONFIG_STANDALONE=y @@ -1459,15 +1533,20 @@ CONFIG_FW_LOADER=y # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_EXTRA_FIRMWARE="" CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_ALLOW_DEV_COREDUMP=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set CONFIG_SYS_HYPERVISOR=y # CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m -CONFIG_REGMAP_MMIO=m +CONFIG_REGMAP_SPI=m +CONFIG_REGMAP_MMIO=y CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_FENCE_TRACE is not set # # Bus devices @@ -1529,9 +1608,6 @@ CONFIG_MTD_ABSENT=m # CONFIG_MTD_COMPLEX_MAPPINGS=y # CONFIG_MTD_PHYSMAP is not set -CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m -CONFIG_MTD_TS5500=m # CONFIG_MTD_SBC_GXX is not set # CONFIG_MTD_AMD76XROM is not set # CONFIG_MTD_ICHXROM is not set @@ -1554,9 +1630,8 @@ CONFIG_MTD_PMC551=m # CONFIG_MTD_PMC551_BUGFIX is not set # CONFIG_MTD_PMC551_DEBUG is not set # CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SST25L is not set -# CONFIG_MTD_SLRAM is not set +CONFIG_MTD_SLRAM=m CONFIG_MTD_PHRAM=m CONFIG_MTD_MTDRAM=m CONFIG_MTDRAM_TOTAL_SIZE=4096 @@ -1569,21 +1644,40 @@ CONFIG_MTD_BLOCK2MTD=m CONFIG_MTD_DOCG3=m CONFIG_BCH_CONST_M=14 CONFIG_BCH_CONST_T=4 -# CONFIG_MTD_NAND is not set +CONFIG_MTD_NAND_ECC=m +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_ECC_BCH is not set +CONFIG_MTD_SM_COMMON=m +# CONFIG_MTD_NAND_DENALI is not set +CONFIG_MTD_NAND_GPIO=m +# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +CONFIG_MTD_NAND_DOCG4=m +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_NANDSIM=m +# CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_ONENAND is not set # -# LPDDR flash memory drivers +# LPDDR & LPDDR2 PCM memory drivers # CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m +# CONFIG_MTD_SPI_NOR is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set -CONFIG_PARPORT=m +# CONFIG_MTD_UBI_BLOCK is not set CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set @@ -1605,6 +1699,9 @@ CONFIG_BLK_DEV=y CONFIG_BLK_DEV_FD=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_ZRAM=m +CONFIG_ZRAM_LZ4_COMPRESS=y +# CONFIG_ZRAM_DEBUG is not set CONFIG_BLK_CPQ_CISS_DA=m # CONFIG_CISS_SCSI_TAPE is not set CONFIG_BLK_DEV_DAC960=m @@ -1649,11 +1746,7 @@ CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m -# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m -CONFIG_CS5535_MFGPT=m -CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 -CONFIG_CS5535_CLOCK_EVENT_SRC=m CONFIG_HP_ILO=m CONFIG_APDS9802ALS=m CONFIG_ISL29003=m @@ -1669,7 +1762,6 @@ CONFIG_VMWARE_BALLOON=m CONFIG_BMP085=y CONFIG_BMP085_I2C=m # CONFIG_BMP085_SPI is not set -CONFIG_PCH_PHUB=m CONFIG_USB_SWITCH_FSA9480=m # CONFIG_LATTICE_ECP3_CONFIG is not set # CONFIG_SRAM is not set @@ -1701,9 +1793,15 @@ CONFIG_SENSORS_LIS3_I2C=m CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m +CONFIG_INTEL_MEI_TXE=m CONFIG_VMWARE_VMCI=m # +# Intel MIC Bus Driver +# +CONFIG_INTEL_MIC_BUS=m + +# # Intel MIC Host Driver # CONFIG_INTEL_MIC_HOST=m @@ -1712,6 +1810,10 @@ CONFIG_INTEL_MIC_HOST=m # Intel MIC Card Driver # CONFIG_INTEL_MIC_CARD=m +CONFIG_GENWQE=m +CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0 +CONFIG_ECHO=m +# CONFIG_CXL_BASE is not set CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1722,8 +1824,8 @@ CONFIG_SCSI_MOD=m CONFIG_RAID_ATTRS=m CONFIG_SCSI=m CONFIG_SCSI_DMA=y -CONFIG_SCSI_TGT=m CONFIG_SCSI_NETLINK=y +# CONFIG_SCSI_MQ_DEFAULT is not set CONFIG_SCSI_PROC_FS=y # @@ -1737,7 +1839,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_ENCLOSURE=m -CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set CONFIG_SCSI_SCAN_ASYNC=y @@ -1747,14 +1848,12 @@ CONFIG_SCSI_SCAN_ASYNC=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_FC_TGT_ATTRS is not set CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y CONFIG_SCSI_SAS_HOST_SMP=y CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_SRP_TGT_ATTRS=y CONFIG_SCSI_LOWLEVEL=y CONFIG_ISCSI_TCP=m CONFIG_ISCSI_BOOT_SYSFS=m @@ -1775,7 +1874,6 @@ CONFIG_AIC7XXX_RESET_DELAY_MS=15000 # CONFIG_AIC7XXX_DEBUG_ENABLE is not set CONFIG_AIC7XXX_DEBUG_MASK=0 CONFIG_AIC7XXX_REG_PRETTY_PRINT=y -# CONFIG_SCSI_AIC7XXX_OLD is not set CONFIG_SCSI_AIC79XX=m CONFIG_AIC79XX_CMDS_PER_DEVICE=32 CONFIG_AIC79XX_RESET_DELAY_MS=15000 @@ -1810,6 +1908,7 @@ CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m CONFIG_SCSI_FLASHPOINT=y CONFIG_VMWARE_PVSCSI=m +# CONFIG_XEN_SCSI_FRONTEND is not set CONFIG_HYPERV_STORAGE=m CONFIG_LIBFC=m CONFIG_LIBFCOE=m @@ -1850,7 +1949,6 @@ CONFIG_SCSI_DC390T=m # CONFIG_SCSI_DEBUG is not set CONFIG_SCSI_PMCRAID=m CONFIG_SCSI_PM8001=m -CONFIG_SCSI_SRP=m CONFIG_SCSI_BFA_FC=m CONFIG_SCSI_VIRTIO=m CONFIG_SCSI_CHELSIO_FCOE=m @@ -1897,11 +1995,9 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=m -CONFIG_SATA_HIGHBANK=m CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PROMISE=m -CONFIG_SATA_RCAR=m CONFIG_SATA_SIL=m CONFIG_SATA_SIS=m CONFIG_SATA_SVW=m @@ -1914,14 +2010,10 @@ CONFIG_SATA_VITESSE=m # CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m -CONFIG_PATA_ARASAN_CF=m CONFIG_PATA_ARTOP=m CONFIG_PATA_ATIIXP=m CONFIG_PATA_ATP867X=m CONFIG_PATA_CMD64X=m -CONFIG_PATA_CS5520=m -CONFIG_PATA_CS5530=m -CONFIG_PATA_CS5536=m CONFIG_PATA_CYPRESS=m CONFIG_PATA_EFAR=m CONFIG_PATA_HPT366=m @@ -1942,7 +2034,6 @@ CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC_OLD=m CONFIG_PATA_RADISYS=m CONFIG_PATA_RDC=m -CONFIG_PATA_SC1200=m CONFIG_PATA_SCH=m CONFIG_PATA_SERVERWORKS=m CONFIG_PATA_SIL680=m @@ -1980,18 +2071,20 @@ CONFIG_MD_FAULTY=m CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m CONFIG_DM_BIO_PRISON=m CONFIG_DM_PERSISTENT_DATA=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m -# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set CONFIG_DM_CACHE=m CONFIG_DM_CACHE_MQ=m CONFIG_DM_CACHE_CLEANER=m +CONFIG_DM_ERA=m CONFIG_DM_MIRROR=m CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_RAID=m @@ -2008,6 +2101,7 @@ CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m CONFIG_TCM_PSCSI=m +# CONFIG_TCM_USER is not set CONFIG_LOOPBACK_TARGET=m CONFIG_TCM_FC=m CONFIG_ISCSI_TARGET=m @@ -2039,7 +2133,7 @@ CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m CONFIG_MACINTOSH_DRIVERS=y -CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_MAC_EMUMOUSEBTN=m CONFIG_NETDEVICES=y CONFIG_MII=m CONFIG_NET_CORE=y @@ -2060,7 +2154,6 @@ CONFIG_VXLAN=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set CONFIG_NET_POLL_CONTROLLER=y CONFIG_RIONET=m CONFIG_RIONET_TX_SIZE=128 @@ -2123,6 +2216,8 @@ CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y CONFIG_NET_DSA_MV88E6131=m CONFIG_NET_DSA_MV88E6123_61_65=m +CONFIG_NET_DSA_MV88E6171=m +CONFIG_NET_DSA_BCM_SF2=m CONFIG_ETHERNET=y CONFIG_MDIO=m CONFIG_NET_VENDOR_3COM=y @@ -2132,13 +2227,17 @@ CONFIG_VORTEX=m CONFIG_TYPHOON=m CONFIG_NET_VENDOR_ADAPTEC=y CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_AGERE=y +CONFIG_ET131X=m CONFIG_NET_VENDOR_ALTEON=y CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_ALTERA_TSE=m CONFIG_NET_VENDOR_AMD=y CONFIG_AMD8111_ETH=m CONFIG_PCNET32=m CONFIG_PCMCIA_NMCLAN=m +# CONFIG_NET_XGENE is not set CONFIG_NET_VENDOR_ARC=y CONFIG_NET_VENDOR_ATHEROS=y CONFIG_ATL2=m @@ -2146,9 +2245,6 @@ CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m CONFIG_ALX=m -CONFIG_NET_CADENCE=y -CONFIG_ARM_AT91_ETHER=m -CONFIG_MACB=m CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y @@ -2161,7 +2257,6 @@ CONFIG_BNX2X=m CONFIG_BNX2X_SRIOV=y CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m -CONFIG_NET_CALXEDA_XGMAC=m CONFIG_NET_VENDOR_CHELSIO=y CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y @@ -2170,6 +2265,7 @@ CONFIG_CHELSIO_T4=m CONFIG_CHELSIO_T4VF=m CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m +CONFIG_CX_ECAT=m CONFIG_DNET=m CONFIG_NET_VENDOR_DEC=y CONFIG_NET_TULIP=y @@ -2190,6 +2286,7 @@ CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_NET_VENDOR_EMULEX=y CONFIG_BE2NET=m +CONFIG_BE2NET_VXLAN=y CONFIG_NET_VENDOR_EXAR=y CONFIG_S2IO=m CONFIG_VXGE=m @@ -2212,6 +2309,10 @@ CONFIG_IXGBE_HWMON=y CONFIG_IXGBE_DCA=y CONFIG_IXGBEVF=m CONFIG_I40E=m +CONFIG_I40E_VXLAN=y +CONFIG_I40EVF=m +CONFIG_FM10K=m +# CONFIG_FM10K_VXLAN is not set CONFIG_NET_VENDOR_I825XX=y CONFIG_IP1000=m CONFIG_JME=m @@ -2224,16 +2325,18 @@ CONFIG_SKY2=m # CONFIG_SKY2_DEBUG is not set CONFIG_NET_VENDOR_MELLANOX=y CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_VXLAN=y CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y -# CONFIG_MLX5_CORE is not set +CONFIG_MLX5_CORE=m CONFIG_NET_VENDOR_MICREL=y CONFIG_KS8842=m -# CONFIG_KS8851 is not set +CONFIG_KS8851=m CONFIG_KS8851_MLL=m CONFIG_KSZ884X_PCI=m CONFIG_NET_VENDOR_MICROCHIP=y -# CONFIG_ENC28J60 is not set +CONFIG_ENC28J60=m +# CONFIG_ENC28J60_WRITEVERIFY is not set CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y @@ -2248,7 +2351,6 @@ CONFIG_PCMCIA_PCNET=m CONFIG_NET_VENDOR_NVIDIA=y CONFIG_FORCEDETH=m CONFIG_NET_VENDOR_OKI=y -CONFIG_PCH_GBE=m CONFIG_ETHOC=m CONFIG_NET_PACKET_ENGINE=y CONFIG_HAMACHI=m @@ -2257,8 +2359,11 @@ CONFIG_NET_VENDOR_QLOGIC=y CONFIG_QLA3XXX=m CONFIG_QLCNIC=m CONFIG_QLCNIC_SRIOV=y +CONFIG_QLCNIC_VXLAN=y +CONFIG_QLCNIC_HWMON=y CONFIG_QLGE=m CONFIG_NETXEN_NIC=m +CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_NET_VENDOR_REALTEK=y CONFIG_ATP=m CONFIG_8139CP=m @@ -2268,9 +2373,10 @@ CONFIG_8139TOO_TUNE_TWISTER=y CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_R8169=m -CONFIG_SH_ETH=m CONFIG_NET_VENDOR_RDC=y CONFIG_R6040=m +CONFIG_NET_VENDOR_SAMSUNG=y +CONFIG_SXGBE_ETH=m CONFIG_NET_VENDOR_SEEQ=y CONFIG_NET_VENDOR_SILAN=y CONFIG_SC92031=m @@ -2332,6 +2438,7 @@ CONFIG_CICADA_PHY=m CONFIG_VITESSE_PHY=m CONFIG_SMSC_PHY=m CONFIG_BROADCOM_PHY=m +CONFIG_BCM7XXX_PHY=m CONFIG_BCM87XX_PHY=m CONFIG_ICPLUS_PHY=m CONFIG_REALTEK_PHY=m @@ -2341,6 +2448,7 @@ CONFIG_LSI_ET1011C_PHY=m CONFIG_MICREL_PHY=m CONFIG_MDIO_BITBANG=m # CONFIG_MDIO_GPIO is not set +CONFIG_MDIO_BCM_UNIMAC=m # CONFIG_MICREL_KS8995MA is not set CONFIG_PLIP=m CONFIG_PPP=m @@ -2362,8 +2470,9 @@ CONFIG_SLHC=m # CONFIG_SLIP_MODE_SLIP6 is not set # -# USB Network Adapters +# Host-side USB support is needed for USB Network Adapter support # +CONFIG_USB_NET_DRIVERS=m CONFIG_USB_CATC=m CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m @@ -2379,6 +2488,7 @@ CONFIG_USB_NET_HUAWEI_CDC_NCM=m CONFIG_USB_NET_CDC_MBIM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_SR9700=m +CONFIG_USB_NET_SR9800=m CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_GL620A=m @@ -2437,13 +2547,17 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y -# CONFIG_ATH9K_DEBUGFS is not set -# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set +CONFIG_ATH9K_DEBUGFS=y +CONFIG_ATH9K_STATION_STATISTICS=y +# CONFIG_ATH9K_DYNACK is not set +CONFIG_ATH9K_WOW=y CONFIG_ATH9K_RFKILL=y +# CONFIG_ATH9K_CHANNEL_CONTEXT is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m CONFIG_CARL9170_LEDS=y +# CONFIG_CARL9170_DEBUGFS is not set CONFIG_CARL9170_WPC=y # CONFIG_CARL9170_HWRNG is not set CONFIG_ATH6KL=m @@ -2465,12 +2579,16 @@ CONFIG_WCN36XX=m CONFIG_B43=m CONFIG_B43_BCMA=y CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y +CONFIG_B43_PHY_G=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y CONFIG_B43_PHY_HT=y @@ -2491,8 +2609,11 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y CONFIG_BRCMUTIL=m CONFIG_BRCMSMAC=m CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_PROTO_BCDC=y +CONFIG_BRCMFMAC_PROTO_MSGBUF=y CONFIG_BRCMFMAC_SDIO=y CONFIG_BRCMFMAC_USB=y +CONFIG_BRCMFMAC_PCIE=y # CONFIG_BRCM_TRACING is not set # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m @@ -2513,14 +2634,18 @@ CONFIG_IPW2200_QOS=y CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y CONFIG_IWLDVM=m CONFIG_IWLMVM=m CONFIG_IWLWIFI_OPMODE_MODULAR=y +# CONFIG_IWLWIFI_BCAST_FILTERING is not set +# CONFIG_IWLWIFI_UAPSD is not set # # Debugging Options # # CONFIG_IWLWIFI_DEBUG is not set +# CONFIG_IWLWIFI_DEBUGFS is not set CONFIG_IWLWIFI_DEVICE_TRACING=y CONFIG_IWLEGACY=m CONFIG_IWL4965=m @@ -2530,11 +2655,12 @@ CONFIG_IWL3945=m # iwl3945 / iwl4965 Debugging Options # # CONFIG_IWLEGACY_DEBUG is not set +# CONFIG_IWLEGACY_DEBUGFS is not set CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m -# CONFIG_LIBERTAS_SPI is not set +CONFIG_LIBERTAS_SPI=m # CONFIG_LIBERTAS_DEBUG is not set CONFIG_LIBERTAS_MESH=y CONFIG_HERMES=m @@ -2550,7 +2676,8 @@ CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m -# CONFIG_P54_SPI is not set +CONFIG_P54_SPI=m +# CONFIG_P54_SPI_DEFAULT_EEPROM is not set CONFIG_P54_LEDS=y CONFIG_RT2X00=m CONFIG_RT2400PCI=m @@ -2579,19 +2706,25 @@ CONFIG_RT2X00_LIB=m CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_LIB_DEBUGFS is not set # CONFIG_RT2X00_DEBUG is not set CONFIG_RTL_CARDS=m CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m CONFIG_RTL8723AE=m +CONFIG_RTL8723BE=m CONFIG_RTL8188EE=m +CONFIG_RTL8192EE=m +CONFIG_RTL8821AE=m CONFIG_RTL8192CU=m CONFIG_RTLWIFI=m CONFIG_RTLWIFI_PCI=m CONFIG_RTLWIFI_USB=m # CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8723_COMMON=m +CONFIG_RTLBTCOEXIST=m CONFIG_WL_TI=y CONFIG_WL1251=m # CONFIG_WL1251_SPI is not set @@ -2611,6 +2744,10 @@ CONFIG_MWIFIEX_USB=m CONFIG_CW1200=m CONFIG_CW1200_WLAN_SDIO=m CONFIG_CW1200_WLAN_SPI=m +CONFIG_RSI_91X=m +# CONFIG_RSI_DEBUGFS is not set +CONFIG_RSI_SDIO=m +CONFIG_RSI_USB=m # # WiMAX Wireless Broadband devices @@ -2624,6 +2761,7 @@ CONFIG_IEEE802154_FAKEHARD=m CONFIG_IEEE802154_FAKELB=m CONFIG_IEEE802154_AT86RF230=m # CONFIG_IEEE802154_MRF24J40 is not set +# CONFIG_IEEE802154_CC2520 is not set CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_NETDEV_BACKEND=m CONFIG_VMXNET3=m @@ -2707,11 +2845,11 @@ CONFIG_HISAX_FRITZ_PCIPNP=m # Active cards # CONFIG_ISDN_CAPI=m -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y CONFIG_CAPI_TRACE=y -CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPIDRV=m +# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set # # CAPI hardware drivers @@ -2801,9 +2939,11 @@ CONFIG_KEYBOARD_MCS=m CONFIG_KEYBOARD_MPR121=m # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_SAMSUNG is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_CROS_EC is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ALPS=y @@ -2860,7 +3000,7 @@ CONFIG_TABLET_USB_AIPTEK=m CONFIG_TABLET_USB_GTCO=m CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m -CONFIG_TABLET_USB_WACOM=m +CONFIG_TABLET_SERIAL_WACOM4=m CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_AD7877 is not set @@ -2942,6 +3082,7 @@ CONFIG_INPUT_MMA8450=m CONFIG_INPUT_MPU3050=m CONFIG_INPUT_APANEL=m CONFIG_INPUT_GP2A=m +# CONFIG_INPUT_GPIO_BEEPER is not set # CONFIG_INPUT_GPIO_TILT_POLLED is not set CONFIG_INPUT_ATLAS_BTNS=m CONFIG_INPUT_ATI_REMOTE2=m @@ -2964,11 +3105,14 @@ CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m +# CONFIG_INPUT_DRV260X_HAPTICS is not set +# CONFIG_INPUT_DRV2667_HAPTICS is not set # # Hardware I/O ports # CONFIG_SERIO=m +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y CONFIG_SERIO_I8042=m CONFIG_SERIO_SERPORT=m CONFIG_SERIO_CT82C710=m @@ -3019,11 +3163,11 @@ CONFIG_TRACE_SINK=m # # Serial drivers # +CONFIG_SERIAL_EARLYCON=y CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_CS=m @@ -3031,24 +3175,25 @@ CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DW=m +# CONFIG_SERIAL_8250_FINTEK is not set # # Non-8250 serial port support # # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set +# CONFIG_SERIAL_MRST_MAX3110 is not set CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m CONFIG_SERIAL_SCCNXP=m -# CONFIG_SERIAL_TIMBERDALE is not set +CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 # CONFIG_SERIAL_IFX6X60 is not set -CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_SERIAL_RP2=m @@ -3066,9 +3211,10 @@ CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m +# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m -CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m @@ -3087,7 +3233,8 @@ CONFIG_CARDMAN_4000=m CONFIG_CARDMAN_4040=m CONFIG_IPWIRELESS=m CONFIG_MWAVE=m -# CONFIG_RAW_DRIVER is not set +CONFIG_RAW_DRIVER=m +CONFIG_MAX_RAW_DEVS=256 CONFIG_HPET=y CONFIG_HPET_MMAP=y CONFIG_HPET_MMAP_DEFAULT=y @@ -3101,9 +3248,14 @@ CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m CONFIG_TCG_ST33_I2C=m -# CONFIG_TCG_XEN is not set +CONFIG_TCG_XEN=m CONFIG_TELCLOCK=m CONFIG_DEVPORT=y +# CONFIG_XILLYBUS is not set + +# +# I2C support +# CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y @@ -3116,6 +3268,7 @@ CONFIG_I2C_MUX=m # CONFIG_I2C_MUX_GPIO is not set CONFIG_I2C_MUX_PCA9541=m CONFIG_I2C_MUX_PCA954x=m +# CONFIG_I2C_MUX_PINCTRL is not set CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m @@ -3156,8 +3309,8 @@ CONFIG_I2C_SCMI=m # # CONFIG_I2C_CBUS_GPIO is not set CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_DESIGNWARE_PCI=m -CONFIG_I2C_EG20T=m # CONFIG_I2C_GPIO is not set CONFIG_I2C_OCORES=m CONFIG_I2C_PCA_PLATFORM=m @@ -3171,6 +3324,7 @@ CONFIG_I2C_XILINX=m CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_PARPORT=m CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_ROBOTFUZZ_OSIF=m CONFIG_I2C_TAOS_EVM=m CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIPERBOARD=m @@ -3178,6 +3332,7 @@ CONFIG_I2C_VIPERBOARD=m # # Other I2C/SMBus bus drivers # +# CONFIG_I2C_CROS_EC_TUNNEL is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set @@ -3189,26 +3344,29 @@ CONFIG_SPI_MASTER=y # # SPI Master Controller Drivers # -# CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_BUTTERFLY is not set -# CONFIG_SPI_GPIO is not set -# CONFIG_SPI_LM70_LLP is not set -# CONFIG_SPI_OC_TINY is not set +CONFIG_SPI_ALTERA=m +CONFIG_SPI_BITBANG=m +CONFIG_SPI_BUTTERFLY=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_OC_TINY=m CONFIG_SPI_PXA2XX_DMA=y CONFIG_SPI_PXA2XX=m CONFIG_SPI_PXA2XX_PCI=m -# CONFIG_SPI_SC18IS602 is not set -# CONFIG_SPI_TOPCLIFF_PCH is not set -# CONFIG_SPI_XCOMM is not set -# CONFIG_SPI_XILINX is not set -# CONFIG_SPI_DESIGNWARE is not set +CONFIG_SPI_SC18IS602=m +CONFIG_SPI_XCOMM=m +CONFIG_SPI_XILINX=m +CONFIG_SPI_DESIGNWARE=m +CONFIG_SPI_DW_PCI=m +# CONFIG_SPI_DW_MID_DMA is not set +CONFIG_SPI_DW_MMIO=m # # SPI Protocol Masters # -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TLE62X0 is not set +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m +CONFIG_SPMI=m # CONFIG_HSI is not set # @@ -3216,6 +3374,7 @@ CONFIG_SPI_PXA2XX_PCI=m # CONFIG_PPS=m # CONFIG_PPS_DEBUG is not set +# CONFIG_NTP_PPS is not set # # PPS clients support @@ -3234,11 +3393,18 @@ CONFIG_PPS_CLIENT_GPIO=m # CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m -CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_PINCTRL=y + +# +# Pin controllers +# +# CONFIG_DEBUG_PINCTRL is not set +# CONFIG_PINCTRL_BAYTRAIL is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y CONFIG_GPIO_DEVRES=y CONFIG_GPIO_ACPI=y +CONFIG_GPIOLIB_IRQCHIP=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y @@ -3246,18 +3412,20 @@ CONFIG_GPIO_SYSFS=y # Memory mapped GPIO drivers: # # CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_DWAPB is not set # CONFIG_GPIO_IT8761E is not set # CONFIG_GPIO_F7188X is not set -# CONFIG_GPIO_TS5500 is not set +CONFIG_GPIO_SCH311X=m CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set -# CONFIG_GPIO_LYNXPOINT is not set +CONFIG_GPIO_LYNXPOINT=m # # I2C GPIO expanders: # CONFIG_GPIO_ARIZONA=m +CONFIG_GPIO_LP3943=m # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX732X is not set # CONFIG_GPIO_PCA953X is not set @@ -3267,10 +3435,8 @@ CONFIG_GPIO_ARIZONA=m # # PCI GPIO expanders: # -CONFIG_GPIO_CS5535=m CONFIG_GPIO_AMD8111=m # CONFIG_GPIO_INTEL_MID is not set -# CONFIG_GPIO_PCH is not set # CONFIG_GPIO_ML_IOH is not set # CONFIG_GPIO_RDC321X is not set @@ -3280,7 +3446,6 @@ CONFIG_GPIO_AMD8111=m # CONFIG_GPIO_MAX7301 is not set # CONFIG_GPIO_MCP23S08 is not set # CONFIG_GPIO_MC33880 is not set -# CONFIG_GPIO_74X164 is not set # # AC97 GPIO expanders: @@ -3303,6 +3468,7 @@ CONFIG_GPIO_VIPERBOARD=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=m +# CONFIG_GENERIC_ADC_BATTERY is not set CONFIG_TEST_POWER=m # CONFIG_BATTERY_DS2780 is not set # CONFIG_BATTERY_DS2781 is not set @@ -3322,7 +3488,7 @@ CONFIG_CHARGER_BQ24735=m # CONFIG_CHARGER_SMB347 is not set CONFIG_POWER_RESET=y CONFIG_POWER_AVS=y -CONFIG_HWMON=y +CONFIG_HWMON=m CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3331,10 +3497,9 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m -# CONFIG_SENSORS_AD7314 is not set +CONFIG_SENSORS_AD7314=m CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m -# CONFIG_SENSORS_ADCXX is not set CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m @@ -3352,6 +3517,7 @@ CONFIG_SENSORS_ASC7621=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_APPLESMC=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS620=m @@ -3360,22 +3526,43 @@ CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m CONFIG_SENSORS_F71882FG=m CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_MC13783_ADC=m CONFIG_SENSORS_FSCHMD=m -CONFIG_SENSORS_G760A=m -CONFIG_SENSORS_G762=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m -# CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_G762=m +CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_HIH6130=m -CONFIG_SENSORS_HTU21=m -CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m +# CONFIG_SENSORS_IIO_HWMON is not set +CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_POWR1220=m CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LTC2945=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4222=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4260=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m +CONFIG_SENSORS_HTU21=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_ADCXX=m CONFIG_SENSORS_LM63=m -# CONFIG_SENSORS_LM70 is not set +CONFIG_SENSORS_LM70=m CONFIG_SENSORS_LM73=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m @@ -3387,27 +3574,14 @@ CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m CONFIG_SENSORS_LM93=m -CONFIG_SENSORS_LTC4151=m -CONFIG_SENSORS_LTC4215=m -CONFIG_SENSORS_LTC4245=m -CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95234=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m -# CONFIG_SENSORS_MAX1111 is not set -CONFIG_SENSORS_MAX16065=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_MAX1668=m -CONFIG_SENSORS_MAX197=m -CONFIG_SENSORS_MAX6639=m -CONFIG_SENSORS_MAX6642=m -CONFIG_SENSORS_MAX6650=m -CONFIG_SENSORS_MAX6697=m -CONFIG_SENSORS_MCP3021=m -CONFIG_SENSORS_NCT6775=m -CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6683=m +CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m @@ -3417,13 +3591,14 @@ CONFIG_SENSORS_LTC2978=m CONFIG_SENSORS_MAX16064=m CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_TPS40422=m CONFIG_SENSORS_UCD9000=m CONFIG_SENSORS_UCD9200=m CONFIG_SENSORS_ZL6100=m CONFIG_SENSORS_SHT15=m CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SHTC1=m CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_SMM665=m CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_EMC1403=m CONFIG_SENSORS_EMC2103=m @@ -3434,14 +3609,17 @@ CONFIG_SENSORS_SMSC47B397=m CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_ADC128D818=m CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m -# CONFIG_SENSORS_ADS7871 is not set +CONFIG_SENSORS_ADS7871=m CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_INA209=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP103=m CONFIG_SENSORS_TMP401=m CONFIG_SENSORS_TMP421=m CONFIG_SENSORS_VIA_CPUTEMP=m @@ -3458,8 +3636,6 @@ CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_APPLESMC=m -CONFIG_SENSORS_MC13783_ADC=m # # ACPI drivers @@ -3467,17 +3643,19 @@ CONFIG_SENSORS_MC13783_ADC=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y -CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_GOV_BANG_BANG=y CONFIG_THERMAL_GOV_USER_SPACE=y -# CONFIG_CPU_THERMAL is not set # CONFIG_THERMAL_EMULATION is not set CONFIG_INTEL_POWERCLAMP=m CONFIG_X86_PKG_TEMP_THERMAL=m +CONFIG_INTEL_SOC_DTS_THERMAL=m +CONFIG_INT340X_THERMAL=m +CONFIG_ACPI_THERMAL_REL=m # # Texas Instruments thermal drivers @@ -3490,6 +3668,9 @@ CONFIG_WATCHDOG_CORE=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_XILINX_WATCHDOG=m +CONFIG_DW_WATCHDOG=m +# CONFIG_RN5T618_WATCHDOG is not set CONFIG_RETU_WATCHDOG=m CONFIG_ACQUIRE_WDT=m CONFIG_ADVANTECH_WDT=m @@ -3497,8 +3678,6 @@ CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m CONFIG_F71808E_WDT=m CONFIG_SP5100_TCO=m -CONFIG_GEODE_WDT=m -CONFIG_SC520_WDT=m CONFIG_SBC_FITPC2_WATCHDOG=m CONFIG_EUROTECH_WDT=m CONFIG_IB700_WDT=m @@ -3516,14 +3695,11 @@ CONFIG_SC1200_WDT=m CONFIG_PC87413_WDT=m CONFIG_NV_TCO=m CONFIG_60XX_WDT=m -CONFIG_SBC8360_WDT=m CONFIG_CPU5_WDT=m CONFIG_SMSC_SCH311X_WDT=m CONFIG_SMSC37B787_WDT=m CONFIG_VIA_WDT=m CONFIG_W83627HF_WDT=m -CONFIG_W83697HF_WDT=m -CONFIG_W83697UG_WDT=m CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m @@ -3578,10 +3754,10 @@ CONFIG_BCMA_DRIVER_GPIO=y # Multifunction device drivers # CONFIG_MFD_CORE=y -CONFIG_MFD_CS5535=m -# CONFIG_MFD_CROS_EC is not set +CONFIG_MFD_BCM590XX=m +CONFIG_MFD_CROS_EC=m +CONFIG_MFD_CROS_EC_I2C=m # CONFIG_MFD_DA9052_SPI is not set -CONFIG_MFD_MC13783=m CONFIG_MFD_MC13XXX=m # CONFIG_MFD_MC13XXX_SPI is not set CONFIG_MFD_MC13XXX_I2C=m @@ -3590,6 +3766,7 @@ CONFIG_LPC_ICH=m CONFIG_LPC_SCH=m # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_MENF21BMC is not set # CONFIG_EZX_PCAP is not set CONFIG_MFD_VIPERBOARD=m CONFIG_MFD_RETU=m @@ -3599,22 +3776,24 @@ CONFIG_PCF50633_GPIO=m CONFIG_UCB1400_CORE=m CONFIG_MFD_RDC321X=m CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_RTSX_USB=m +CONFIG_MFD_RN5T618=m CONFIG_MFD_SI476X_CORE=m CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y CONFIG_ABX500_CORE=y -# CONFIG_MFD_STMPE is not set -# CONFIG_MFD_SYSCON is not set +CONFIG_MFD_SYSCON=y CONFIG_MFD_TI_AM335X_TSCADC=m +CONFIG_MFD_LP3943=m # CONFIG_TPS6105X is not set CONFIG_TPS65010=m CONFIG_TPS6507X=m CONFIG_MFD_TPS65217=m +CONFIG_MFD_TPS65218=m # CONFIG_MFD_TPS65912 is not set # CONFIG_MFD_TPS65912_SPI is not set CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_LM3533=m -# CONFIG_MFD_TIMBERDALE is not set # CONFIG_MFD_TMIO is not set CONFIG_MFD_VX855=m CONFIG_MFD_ARIZONA=y @@ -3624,6 +3803,7 @@ CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y # CONFIG_MFD_WM8997 is not set # CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_WM8994 is not set # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m @@ -3634,6 +3814,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_ANALOG_TV_SUPPORT=y CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_SDR_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m @@ -3652,7 +3833,7 @@ CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_VIDEOBUF2_DMA_SG=m -# CONFIG_VIDEO_V4L2_INT_DEVICE is not set +CONFIG_VIDEOBUF2_DVB=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y CONFIG_TTPCI_EEPROM=m @@ -3672,12 +3853,14 @@ CONFIG_IR_RC5_DECODER=m CONFIG_IR_RC6_DECODER=m CONFIG_IR_JVC_DECODER=m CONFIG_IR_SONY_DECODER=m -CONFIG_IR_RC5_SZ_DECODER=m CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_XMP_DECODER=m CONFIG_RC_DEVICES=y CONFIG_RC_ATI_REMOTE=m CONFIG_IR_ENE=m +CONFIG_IR_HIX5HD2=m CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m CONFIG_IR_ITE_CIR=m @@ -3688,6 +3871,14 @@ CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m CONFIG_IR_IGUANA=m CONFIG_IR_TTUSBIR=m +CONFIG_IR_IMG=m +# CONFIG_IR_IMG_RAW is not set +CONFIG_IR_IMG_HW=y +CONFIG_IR_IMG_NEC=y +CONFIG_IR_IMG_JVC=y +CONFIG_IR_IMG_SONY=y +CONFIG_IR_IMG_SHARP=y +CONFIG_IR_IMG_SANYO=y CONFIG_RC_LOOPBACK=m CONFIG_IR_GPIO_CIR=m CONFIG_MEDIA_USB_SUPPORT=y @@ -3704,6 +3895,7 @@ CONFIG_USB_GL860=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_DTCS033=m CONFIG_USB_GSPCA_ETOMS=m CONFIG_USB_GSPCA_FINEPIX=m CONFIG_USB_GSPCA_JEILINJ=m @@ -3752,7 +3944,6 @@ CONFIG_VIDEO_CPIA2=m CONFIG_USB_ZR364XX=m CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m -CONFIG_USB_SN9C102=m CONFIG_VIDEO_USBTV=m # @@ -3768,12 +3959,17 @@ CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160_AC97=y CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set # # Analog/digital TV USB devices # CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828_V4L2=y +CONFIG_VIDEO_AU0828_RC=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3821,23 +4017,32 @@ CONFIG_DVB_USB_AZ6007=m CONFIG_DVB_USB_CE6230=m CONFIG_DVB_USB_EC168=m CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_IT913X=m CONFIG_DVB_USB_LME2510=m CONFIG_DVB_USB_MXL111SF=m CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_USB_DVBSKY=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m CONFIG_SMS_USB_DRV=m CONFIG_DVB_B2C2_FLEXCOP_USB=m # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set +CONFIG_DVB_AS102=m # # Webcam, TV (analog/digital) USB devices # CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_V4L2=m CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m CONFIG_VIDEO_EM28XX_RC=m + +# +# Software defined radio USB devices +# +CONFIG_USB_AIRSPY=m +CONFIG_USB_HACKRF=m +CONFIG_USB_MSI2500=m CONFIG_MEDIA_PCI_SUPPORT=y # @@ -3862,6 +4067,8 @@ CONFIG_VIDEO_ZORAN_AVS6EYES=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_SOLO6X10=m +CONFIG_VIDEO_TW68=m # # Media capture/analog/hybrid TV support @@ -3885,11 +4092,13 @@ CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7134_GO7007=m CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # +CONFIG_DVB_AV7110_IR=y CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_CORE=m @@ -3902,6 +4111,7 @@ CONFIG_DVB_B2C2_FLEXCOP_PCI=m CONFIG_DVB_PLUTO2=m CONFIG_DVB_DM1105=m CONFIG_DVB_PT1=m +CONFIG_DVB_PT3=m CONFIG_MANTIS_CORE=m CONFIG_DVB_MANTIS=m CONFIG_DVB_HOPPER=m @@ -3911,8 +4121,9 @@ CONFIG_DVB_DDBRIDGE=m CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m CONFIG_VIDEO_SH_VEU=m -CONFIG_VIDEO_RENESAS_VSP1=m -# CONFIG_V4L_TEST_DRIVERS is not set +CONFIG_V4L_TEST_DRIVERS=y +# CONFIG_VIDEO_VIVID is not set +CONFIG_VIDEO_MEM2MEM_TESTDEV=m # # Supported MMC/SDIO adapters @@ -3927,14 +4138,17 @@ CONFIG_RADIO_TEA575X=m CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_SI4713=m +CONFIG_PLATFORM_SI4713=m +CONFIG_I2C_SI4713=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SHARK=m CONFIG_RADIO_SHARK2=m -CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI4713=m CONFIG_USB_KEENE=m +CONFIG_USB_RAREMONO=m CONFIG_USB_MA901=m CONFIG_RADIO_TEA5764=m CONFIG_RADIO_SAA7706H=m @@ -3965,6 +4179,7 @@ CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) @@ -4041,6 +4256,11 @@ CONFIG_VIDEO_UPD64031A=m CONFIG_VIDEO_UPD64083=m # +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m + +# # Miscellaneous helper chips # CONFIG_VIDEO_M52790=m @@ -4056,6 +4276,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m CONFIG_MEDIA_TUNER_TDA9887=m CONFIG_MEDIA_TUNER_TEA5761=m CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MSI001=m CONFIG_MEDIA_TUNER_MT20XX=m CONFIG_MEDIA_TUNER_MT2060=m CONFIG_MEDIA_TUNER_MT2063=m @@ -4076,9 +4297,13 @@ CONFIG_MEDIA_TUNER_FC0013=m CONFIG_MEDIA_TUNER_TDA18212=m CONFIG_MEDIA_TUNER_E4000=m CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_M88TS2022=m CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m CONFIG_MEDIA_TUNER_IT913X=m CONFIG_MEDIA_TUNER_R820T=m +CONFIG_MEDIA_TUNER_MXL301RF=m +CONFIG_MEDIA_TUNER_QM1D1C0042=m # # Multistandard (satellite) frontends @@ -4087,12 +4312,14 @@ CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m +CONFIG_DVB_M88DS3103=m # # Multistandard (cable + terrestrial) frontends # CONFIG_DVB_DRXK=m CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_SI2165=m # # DVB-S (satellite) frontends @@ -4148,6 +4375,9 @@ CONFIG_DVB_STV0367=m CONFIG_DVB_CXD2820R=m CONFIG_DVB_RTL2830=m CONFIG_DVB_RTL2832=m +CONFIG_DVB_RTL2832_SDR=m +CONFIG_DVB_SI2168=m +CONFIG_DVB_AS102_FE=m # # DVB-C (cable) frontends @@ -4179,6 +4409,7 @@ CONFIG_DVB_S5H1411=m CONFIG_DVB_S921=m CONFIG_DVB_DIB8000=m CONFIG_DVB_MB86A20S=m +CONFIG_DVB_TC90522=m # # Digital terrestrial only tuners/PLL @@ -4190,6 +4421,7 @@ CONFIG_DVB_TUNER_DIB0090=m # # SEC control devices for DVB-S # +CONFIG_DVB_DRX39XYJ=m CONFIG_DVB_LNBP21=m CONFIG_DVB_LNBP22=m CONFIG_DVB_ISL6405=m @@ -4200,7 +4432,6 @@ CONFIG_DVB_LGS8GXX=m CONFIG_DVB_ATBM8830=m CONFIG_DVB_TDA665x=m CONFIG_DVB_IX2505V=m -CONFIG_DVB_IT913X_FE=m CONFIG_DVB_M88RS2000=m CONFIG_DVB_AF9033=m @@ -4213,15 +4444,19 @@ CONFIG_DVB_AF9033=m # Graphics support # CONFIG_AGP=y -CONFIG_AGP_AMD64=y +CONFIG_AGP_AMD64=m CONFIG_AGP_INTEL=m CONFIG_AGP_SIS=m CONFIG_AGP_VIA=m +CONFIG_INTEL_GTT=m CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VGA_SWITCHEROO=y + +# +# Direct Rendering Manager +# CONFIG_DRM=m -CONFIG_DRM_USB=m CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y @@ -4233,6 +4468,7 @@ CONFIG_DRM_TTM=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_PTN3460=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m @@ -4259,11 +4495,14 @@ CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_QXL=m -CONFIG_VGASTATE=m -CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_HDMI=y +CONFIG_DRM_BOCHS=m + +# +# Frame buffer Devices +# CONFIG_FB=y CONFIG_FIRMWARE_EDID=y +CONFIG_FB_CMDLINE=y # CONFIG_FB_DDC is not set CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y @@ -4297,6 +4536,7 @@ CONFIG_FB_VESA=y CONFIG_FB_EFI=y # CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set +CONFIG_FB_OPENCORES=m # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_RIVA is not set @@ -4321,11 +4561,9 @@ CONFIG_FB_VOODOO1=m # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set -# CONFIG_FB_TMIO is not set # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m -# CONFIG_FB_GOLDFISH is not set CONFIG_FB_VIRTUAL=m CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_METRONOME is not set @@ -4334,7 +4572,6 @@ CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_AUO_K190X is not set CONFIG_FB_HYPERV=m # CONFIG_FB_SIMPLE is not set -# CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m # CONFIG_LCD_L4F00242T03 is not set @@ -4358,14 +4595,13 @@ CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m -CONFIG_BACKLIGHT_LM3630A=m # CONFIG_BACKLIGHT_LM3639 is not set -# CONFIG_BACKLIGHT_LP855X is not set -# CONFIG_BACKLIGHT_OT200 is not set # CONFIG_BACKLIGHT_TPS65217 is not set # CONFIG_BACKLIGHT_GPIO is not set # CONFIG_BACKLIGHT_LV5207LP is not set # CONFIG_BACKLIGHT_BD6107 is not set +CONFIG_VGASTATE=m +CONFIG_HDMI=y # # Console display driver support @@ -4397,7 +4633,7 @@ CONFIG_SND_HRTIMER=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_MAX_CARDS=32 -CONFIG_SND_SUPPORT_OLD_API=y +# CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set @@ -4426,7 +4662,6 @@ CONFIG_SND_PORTMAN2X4=m CONFIG_SND_AC97_POWER_SAVE=y CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 CONFIG_SND_SB_COMMON=m -CONFIG_SND_SB16_DSP=m CONFIG_SND_PCI=y CONFIG_SND_AD1889=m CONFIG_SND_ALS300=m @@ -4449,8 +4684,6 @@ CONFIG_SND_OXYGEN=m CONFIG_SND_CS4281=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CS5530=m -CONFIG_SND_CS5535AUDIO=m CONFIG_SND_CTXFI=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m @@ -4476,30 +4709,6 @@ CONFIG_SND_ES1968_INPUT=y CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_DSP_LOADER=y -CONFIG_SND_HDA_PREALLOC_SIZE=4096 -CONFIG_SND_HDA_HWDEP=y -CONFIG_SND_HDA_RECONFIG=y -CONFIG_SND_HDA_INPUT_BEEP=y -CONFIG_SND_HDA_INPUT_BEEP_MODE=1 -CONFIG_SND_HDA_INPUT_JACK=y -CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_CODEC_REALTEK=y -CONFIG_SND_HDA_CODEC_ANALOG=y -CONFIG_SND_HDA_CODEC_SIGMATEL=y -CONFIG_SND_HDA_CODEC_VIA=y -CONFIG_SND_HDA_CODEC_HDMI=y -CONFIG_SND_HDA_I915=y -CONFIG_SND_HDA_CODEC_CIRRUS=y -CONFIG_SND_HDA_CODEC_CONEXANT=y -CONFIG_SND_HDA_CODEC_CA0110=y -CONFIG_SND_HDA_CODEC_CA0132=y -CONFIG_SND_HDA_CODEC_CA0132_DSP=y -CONFIG_SND_HDA_CODEC_CMEDIA=y -CONFIG_SND_HDA_CODEC_SI3054=y -CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m CONFIG_SND_ICE1712=m @@ -4525,6 +4734,35 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m + +# +# HD-Audio +# +CONFIG_SND_HDA=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_PREALLOC_SIZE=4096 +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=m +CONFIG_SND_HDA_CODEC_ANALOG=m +CONFIG_SND_HDA_CODEC_SIGMATEL=m +CONFIG_SND_HDA_CODEC_VIA=m +CONFIG_SND_HDA_CODEC_HDMI=m +CONFIG_SND_HDA_I915=y +CONFIG_SND_HDA_CODEC_CIRRUS=m +CONFIG_SND_HDA_CODEC_CONEXANT=m +CONFIG_SND_HDA_CODEC_CA0110=m +CONFIG_SND_HDA_CODEC_CA0132=m +CONFIG_SND_HDA_CODEC_CA0132_DSP=y +CONFIG_SND_HDA_CODEC_CMEDIA=m +CONFIG_SND_HDA_CODEC_SI3054=m +CONFIG_SND_HDA_GENERIC=m +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m @@ -4535,12 +4773,15 @@ CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_US122L=m CONFIG_SND_USB_6FIRE=m CONFIG_SND_USB_HIFACE=m +CONFIG_SND_BCD2000=m CONFIG_SND_FIREWIRE=y CONFIG_SND_FIREWIRE_LIB=m CONFIG_SND_DICE=m CONFIG_SND_FIREWIRE_SPEAKERS=m CONFIG_SND_ISIGHT=m CONFIG_SND_SCS1X=m +CONFIG_SND_FIREWORKS=m +CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m @@ -4569,6 +4810,7 @@ CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_DRAGONRISE_FF=y @@ -4578,6 +4820,7 @@ CONFIG_HID_ELO=m CONFIG_HID_EZKEY=m CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y +CONFIG_HID_GT683R=m CONFIG_HID_HUION=m CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m @@ -4588,7 +4831,7 @@ CONFIG_HID_ICADE=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m CONFIG_HID_LCPOWER=m -CONFIG_HID_LENOVO_TPKBD=m +CONFIG_HID_LENOVO=m CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH_DJ=m CONFIG_LOGITECH_FF=y @@ -4603,6 +4846,7 @@ CONFIG_HID_NTRIG=m CONFIG_HID_ORTEK=m CONFIG_HID_PANTHERLORD=m CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PENMOUNT=m CONFIG_HID_PETALYNX=m CONFIG_HID_PICOLCD=m CONFIG_HID_PICOLCD_FB=y @@ -4619,6 +4863,7 @@ CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y CONFIG_HID_HYPERV_MOUSE=m @@ -4653,7 +4898,6 @@ CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=m -# CONFIG_USB_DEBUG is not set # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set # @@ -4662,6 +4906,8 @@ CONFIG_USB=m CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DYNAMIC_MINORS=y # CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_FSM is not set CONFIG_USB_MON=m CONFIG_USB_WUSB=m CONFIG_USB_WUSB_CBAF=m @@ -4672,6 +4918,7 @@ CONFIG_USB_WUSB_CBAF=m # CONFIG_USB_C67X00_HCD=m CONFIG_USB_XHCI_HCD=m +CONFIG_USB_XHCI_PCI=m CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y @@ -4682,7 +4929,8 @@ CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m CONFIG_USB_FUSBH200_HCD=m -CONFIG_USB_FOTG210_HCD=m +# CONFIG_USB_FOTG210_HCD is not set +CONFIG_USB_MAX3421_HCD=m CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_PCI=m # CONFIG_USB_OHCI_HCD_SSB is not set @@ -4693,21 +4941,11 @@ CONFIG_USB_SL811_HCD=m # CONFIG_USB_SL811_HCD_ISO is not set CONFIG_USB_SL811_CS=m CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_RENESAS_USBHS_HCD=m CONFIG_USB_WHCI_HCD=m CONFIG_USB_HWA_HCD=m # CONFIG_USB_HCD_BCMA is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_HCD_TEST_MODE is not set -CONFIG_USB_MUSB_HDRC=m -# CONFIG_USB_MUSB_HOST is not set -# CONFIG_USB_MUSB_GADGET is not set -CONFIG_USB_MUSB_DUAL_ROLE=y -CONFIG_USB_MUSB_TUSB6010=m -CONFIG_USB_MUSB_UX500=m -# CONFIG_USB_UX500_DMA is not set -CONFIG_MUSB_PIO_ONLY=y -CONFIG_USB_RENESAS_USBHS=m # # USB Device Class drivers @@ -4740,13 +4978,27 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m # # USB Imaging devices # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_HOST=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_USB_MUSB_HDRC=m +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_GADGET is not set +CONFIG_USB_MUSB_DUAL_ROLE=y +CONFIG_USB_MUSB_TUSB6010=m +CONFIG_USB_MUSB_UX500=m +# CONFIG_USB_UX500_DMA is not set +CONFIG_MUSB_PIO_ONLY=y # CONFIG_USB_DWC3 is not set +# CONFIG_USB_DWC2 is not set # CONFIG_USB_CHIPIDEA is not set # @@ -4784,6 +5036,7 @@ CONFIG_USB_SERIAL_METRO=m CONFIG_USB_SERIAL_MOS7720=m CONFIG_USB_SERIAL_MOS7715_PARPORT=y CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MXUPORT=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_OTI6858=m @@ -4803,7 +5056,6 @@ CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_WISHBONE=m -CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m # CONFIG_USB_SERIAL_DEBUG is not set @@ -4835,6 +5087,7 @@ CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m CONFIG_USB_HSIC_USB3503=m +CONFIG_USB_LINK_LAYER_TEST=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m @@ -4846,12 +5099,10 @@ CONFIG_USB_XUSBATM=m # CONFIG_USB_PHY=y CONFIG_NOP_USB_XCEIV=m -CONFIG_SAMSUNG_USBPHY=m -CONFIG_SAMSUNG_USB2PHY=m -CONFIG_SAMSUNG_USB3PHY=m # CONFIG_USB_GPIO_VBUS is not set +CONFIG_TAHVO_USB=m +# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -4862,9 +5113,9 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # # USB Peripheral Controller # -CONFIG_USB_FOTG210_UDC=m +# CONFIG_USB_FOTG210_UDC is not set +CONFIG_USB_GR_UDC=m CONFIG_USB_R8A66597=m -CONFIG_USB_RENESAS_USBHS_UDC=m CONFIG_USB_PXA27X=m CONFIG_USB_MV_UDC=m CONFIG_USB_MV_U3D=m @@ -4880,7 +5131,6 @@ CONFIG_USB_LIBCOMPOSITE=m CONFIG_USB_F_ACM=m CONFIG_USB_U_SERIAL=m CONFIG_USB_U_ETHER=m -CONFIG_USB_U_RNDIS=m CONFIG_USB_F_SERIAL=m CONFIG_USB_F_OBEX=m CONFIG_USB_F_NCM=m @@ -4888,6 +5138,9 @@ CONFIG_USB_F_ECM=m CONFIG_USB_F_SUBSET=m CONFIG_USB_F_RNDIS=m CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_FS=m +CONFIG_USB_F_UAC2=m +CONFIG_USB_F_UVC=m # CONFIG_USB_CONFIGFS is not set # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m @@ -4915,13 +5168,13 @@ CONFIG_USB_G_DBGP=m # CONFIG_USB_G_DBGP_PRINTK is not set CONFIG_USB_G_DBGP_SERIAL=y CONFIG_USB_G_WEBCAM=m +CONFIG_USB_LED_TRIG=y CONFIG_UWB=m CONFIG_UWB_HWA=m CONFIG_UWB_WHCI=m CONFIG_UWB_I1480U=m CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set # CONFIG_MMC_CLKGATE is not set # @@ -4941,15 +5194,19 @@ CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_RICOH_MMC=y CONFIG_MMC_SDHCI_ACPI=m CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_SDHCI_PXAV3=m +CONFIG_MMC_SDHCI_PXAV2=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m -# CONFIG_MMC_SPI is not set +CONFIG_MMC_SPI=m CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m +CONFIG_MMC_USDHI6ROL0=m CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -4958,7 +5215,7 @@ CONFIG_MEMSTICK=m # # CONFIG_MEMSTICK_UNSAFE_RESUME is not set CONFIG_MSPRO_BLOCK=m -# CONFIG_MS_BLOCK is not set +CONFIG_MS_BLOCK=m # # MemoryStick Host Controller Drivers @@ -4967,8 +5224,9 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS=m # # LED drivers @@ -4978,18 +5236,17 @@ CONFIG_LEDS_LM3533=m CONFIG_LEDS_LM3642=m CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set -# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_GPIO=m CONFIG_LEDS_LP3944=m CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m CONFIG_LEDS_LP5562=m -# CONFIG_LEDS_LP8501 is not set +CONFIG_LEDS_LP8501=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m -# CONFIG_LEDS_PCA963X is not set -CONFIG_LEDS_PCA9685=m -# CONFIG_LEDS_DAC124S085 is not set +CONFIG_LEDS_PCA963X=m +CONFIG_LEDS_DAC124S085=m CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -4997,7 +5254,10 @@ CONFIG_LEDS_DELL_NETBOOKS=m CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m CONFIG_LEDS_LM355x=m -CONFIG_LEDS_OT200=m + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# CONFIG_LEDS_BLINKM=m # @@ -5008,7 +5268,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m -# CONFIG_LEDS_TRIGGER_CPU is not set +CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -5019,7 +5279,35 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=m CONFIG_LEDS_TRIGGER_CAMERA=m CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +CONFIG_INFINIBAND_QIB=m +# CONFIG_INFINIBAND_QIB_DCA is not set +CONFIG_INFINIBAND_AMSO1100=m +# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_CXGB4=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_INFINIBAND_OCRDMA=m +CONFIG_INFINIBAND_USNIC=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +CONFIG_INFINIBAND_IPOIB_DEBUG=y +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_SRPT=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_ISERT=m CONFIG_EDAC=y CONFIG_EDAC_LEGACY_SYSFS=y # CONFIG_EDAC_DEBUG is not set @@ -5032,6 +5320,7 @@ CONFIG_EDAC_E752X=m CONFIG_EDAC_I82975X=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I3200=m +CONFIG_EDAC_IE31200=m CONFIG_EDAC_X38=m CONFIG_EDAC_I5400=m CONFIG_EDAC_I7CORE=m @@ -5066,10 +5355,12 @@ CONFIG_RTC_DRV_MAX6900=m CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_ISL12057=m CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF85063=m CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80_WDT=y @@ -5087,6 +5378,8 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_M41T93 is not set # CONFIG_RTC_DRV_M41T94 is not set # CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1343 is not set +# CONFIG_RTC_DRV_DS1347 is not set # CONFIG_RTC_DRV_DS1390 is not set # CONFIG_RTC_DRV_MAX6902 is not set # CONFIG_RTC_DRV_R9701 is not set @@ -5094,6 +5387,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_DS3234 is not set # CONFIG_RTC_DRV_PCF2123 is not set # CONFIG_RTC_DRV_RX4581 is not set +# CONFIG_RTC_DRV_MCP795 is not set # # Platform RTC drivers @@ -5103,6 +5397,7 @@ CONFIG_RTC_DRV_DS1286=m CONFIG_RTC_DRV_DS1511=m CONFIG_RTC_DRV_DS1553=m CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_STK17TA8=m CONFIG_RTC_DRV_M48T86=m CONFIG_RTC_DRV_M48T35=m @@ -5111,14 +5406,13 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_PCF50633=m # # on-CPU RTC drivers # CONFIG_RTC_DRV_MC13XXX=m -# CONFIG_RTC_DRV_MOXART is not set +# CONFIG_RTC_DRV_XGENE is not set # # HID Sensor RTC drivers @@ -5130,13 +5424,12 @@ CONFIG_DMADEVICES=y # # DMA Devices # +CONFIG_INTEL_MIC_X100_DMA=m CONFIG_INTEL_MID_DMAC=m CONFIG_INTEL_IOATDMA=m CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m -CONFIG_TIMB_DMA=m -CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y CONFIG_DMA_ACPI=y @@ -5202,31 +5495,24 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m CONFIG_SWIOTLB_XEN=y CONFIG_XEN_TMEM=m CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_SCSI_BACKEND=m CONFIG_XEN_PRIVCMD=m CONFIG_XEN_ACPI_PROCESSOR=m # CONFIG_XEN_MCE_LOG is not set CONFIG_XEN_HAVE_PVMMU=y +CONFIG_XEN_EFI=y CONFIG_STAGING=y -CONFIG_ET131X=m CONFIG_SLICOSS=m -CONFIG_USBIP_CORE=m -CONFIG_USBIP_VHCI_HCD=m -CONFIG_USBIP_HOST=m -# CONFIG_USBIP_DEBUG is not set -CONFIG_W35UND=m CONFIG_PRISM2_USB=m -CONFIG_ECHO=m CONFIG_COMEDI=m # CONFIG_COMEDI_DEBUG is not set CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 CONFIG_COMEDI_MISC_DRIVERS=y -CONFIG_COMEDI_KCOMEDILIB=m CONFIG_COMEDI_BOND=m CONFIG_COMEDI_TEST=m CONFIG_COMEDI_PARPORT=m CONFIG_COMEDI_SERIAL2002=m -CONFIG_COMEDI_SKEL=m # CONFIG_COMEDI_ISA_DRIVERS is not set CONFIG_COMEDI_PCI_DRIVERS=y CONFIG_COMEDI_8255_PCI=m @@ -5261,6 +5547,7 @@ CONFIG_COMEDI_DAS08_PCI=m CONFIG_COMEDI_DT3000=m CONFIG_COMEDI_DYNA_PCI10XX=m CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_MF6X4=m CONFIG_COMEDI_ICP_MULTI=m CONFIG_COMEDI_DAQBOARD2000=m CONFIG_COMEDI_JR3_PCI=m @@ -5293,19 +5580,19 @@ CONFIG_COMEDI_NI_MIO_CS=m CONFIG_COMEDI_QUATECH_DAQP_CS=m CONFIG_COMEDI_USB_DRIVERS=y CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_NI_USB6501=m CONFIG_COMEDI_USBDUX=m CONFIG_COMEDI_USBDUXFAST=m CONFIG_COMEDI_USBDUXSIGMA=m CONFIG_COMEDI_VMK80XX=m CONFIG_COMEDI_8255=m -CONFIG_COMEDI_FC=m +CONFIG_COMEDI_KCOMEDILIB=m CONFIG_COMEDI_AMPLC_DIO200=m CONFIG_COMEDI_AMPLC_PC236=m CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_PANEL is not set -CONFIG_R8187SE=m CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m @@ -5315,27 +5602,105 @@ CONFIG_RTL8192E=m CONFIG_R8712U=m CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y -CONFIG_88EU_P2P=y -CONFIG_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set -# CONFIG_TRANZPORT is not set -CONFIG_IDE_PHISON=m +CONFIG_R8723AU=m +CONFIG_8723AU_AP_MODE=y +CONFIG_8723AU_BT_COEXIST=y +CONFIG_RTS5208=m CONFIG_LINE6_USB=m # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set -CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m -CONFIG_DX_SEP=m -CONFIG_ZSMALLOC=y -CONFIG_ZRAM=m -# CONFIG_ZRAM_DEBUG is not set -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m -CONFIG_FB_SM7XX=m -CONFIG_CRYSTALHD=m + +# +# IIO staging drivers +# + +# +# Accelerometers +# +# CONFIG_ADIS16201 is not set +# CONFIG_ADIS16203 is not set +# CONFIG_ADIS16204 is not set +# CONFIG_ADIS16209 is not set +# CONFIG_ADIS16220 is not set +# CONFIG_ADIS16240 is not set +# CONFIG_LIS3L02DQ is not set +# CONFIG_SCA3000 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7606 is not set +# CONFIG_AD7780 is not set +# CONFIG_AD7816 is not set +# CONFIG_AD7192 is not set +# CONFIG_AD7280 is not set + +# +# Analog digital bi-direction converters +# +# CONFIG_ADT7316 is not set + +# +# Capacitance to digital converters +# +# CONFIG_AD7150 is not set +# CONFIG_AD7152 is not set +# CONFIG_AD7746 is not set + +# +# Direct Digital Synthesis +# +# CONFIG_AD9832 is not set +# CONFIG_AD9834 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16060 is not set + +# +# Network Analyzer, Impedance Converters +# +# CONFIG_AD5933 is not set + +# +# Light sensors +# +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_SENSORS_ISL29028 is not set +# CONFIG_TSL2583 is not set +# CONFIG_TSL2x7x is not set + +# +# Magnetometer sensors +# +CONFIG_SENSORS_HMC5843=m +CONFIG_SENSORS_HMC5843_I2C=m +CONFIG_SENSORS_HMC5843_SPI=m + +# +# Active energy metering IC +# +# CONFIG_ADE7753 is not set +# CONFIG_ADE7754 is not set +# CONFIG_ADE7758 is not set +# CONFIG_ADE7759 is not set +# CONFIG_ADE7854 is not set + +# +# Resolver to digital converters +# +# CONFIG_AD2S90 is not set +# CONFIG_AD2S1200 is not set +# CONFIG_AD2S1210 is not set + +# +# Triggers - standalone +# +# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set +# CONFIG_IIO_SIMPLE_DUMMY is not set CONFIG_FB_XGI=m -CONFIG_ACPI_QUICKSTART=m -CONFIG_USB_ENESTORAGE=m CONFIG_BCM_WIMAX=m CONFIG_FT1000=m CONFIG_FT1000_USB=m @@ -5359,17 +5724,13 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m CONFIG_STAGING_MEDIA=y -CONFIG_DVB_AS102=m +CONFIG_I2C_BCM2048=m CONFIG_DVB_CXD2099=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set -# CONFIG_USB_MSI3101 is not set -CONFIG_SOLO6X10=m +CONFIG_VIDEO_V4L2_INT_DEVICE=m +CONFIG_VIDEO_TCM825X=m CONFIG_LIRC_STAGING=y CONFIG_LIRC_BT829=m CONFIG_LIRC_IGORPLUGUSB=m @@ -5393,37 +5754,40 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y -# CONFIG_LTE_GDM724X is not set -CONFIG_NET_VENDOR_SILICOM=y -CONFIG_SBYPASS=m -CONFIG_BPCTL=m -CONFIG_CED1401=m -CONFIG_DGRP=m +CONFIG_LTE_GDM724X=m CONFIG_FIREWIRE_SERIAL=m -# CONFIG_USB_DWC2 is not set +CONFIG_FWTTY_MAX_TOTAL_PORTS=64 +CONFIG_FWTTY_MAX_CARD_PORTS=32 +# CONFIG_MTD_SPINAND_MT29F is not set CONFIG_LUSTRE_FS=m CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192 # CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set -CONFIG_LUSTRE_LLITE_LLOOP=y +CONFIG_LUSTRE_LLITE_LLOOP=m CONFIG_LNET=m CONFIG_LNET_MAX_PAYLOAD=1048576 CONFIG_LNET_SELFTEST=m -CONFIG_USB_BTMTK=m -# CONFIG_XILLYBUS is not set +CONFIG_LNET_XPRT_IB=m CONFIG_DGNC=m CONFIG_DGAP=m +CONFIG_GS_FPGABOOT=m +CONFIG_CRYPTO_SKEIN=y +CONFIG_CRYPTO_THREEFISH=y +# CONFIG_UNISYSSPAR is not set CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m +CONFIG_ALIENWARE_WMI=m CONFIG_ASUS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m +CONFIG_DELL_SMO8800=m CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_FUJITSU_TABLET=m CONFIG_AMILO_RFKILL=m CONFIG_HP_ACCEL=m +CONFIG_HP_WIRELESS=m CONFIG_HP_WMI=m CONFIG_MSI_LAPTOP=m CONFIG_PANASONIC_LAPTOP=m @@ -5449,10 +5813,10 @@ CONFIG_MSI_WMI=m CONFIG_TOPSTAR_LAPTOP=m CONFIG_ACPI_TOSHIBA=m CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_TOSHIBA_HAPS=m CONFIG_ACPI_CMPC=m CONFIG_INTEL_IPS=m CONFIG_IBM_RTL=m -CONFIG_XO15_EBOOK=m CONFIG_SAMSUNG_LAPTOP=m CONFIG_MXM_WMI=m CONFIG_INTEL_OAKTRAIL=m @@ -5463,13 +5827,37 @@ CONFIG_INTEL_SMARTCONNECT=y CONFIG_PVPANIC=m CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_LAPTOP=m +CONFIG_CHROMEOS_PSTORE=m + +# +# SOC (System On Chip) specific Drivers +# +# CONFIG_SOC_TI is not set +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +# CONFIG_COMMON_CLK_SI5351 is not set +# CONFIG_COMMON_CLK_PXA is not set # # Hardware Spinlock drivers # + +# +# Clock Source drivers +# CONFIG_CLKEVT_I8253=y CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y +# CONFIG_ATMEL_PIT is not set +# CONFIG_SH_TIMER_CMT is not set +# CONFIG_SH_TIMER_MTU2 is not set +# CONFIG_SH_TIMER_TMU is not set +# CONFIG_EM_TIMER_STI is not set # CONFIG_MAILBOX is not set CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y @@ -5491,22 +5879,221 @@ CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers # -# CONFIG_PM_DEVFREQ is not set + +# +# SOC (System On Chip) specific Drivers +# +CONFIG_PM_DEVFREQ=y + +# +# DEVFREQ Governors +# +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m +CONFIG_DEVFREQ_GOV_PERFORMANCE=m +CONFIG_DEVFREQ_GOV_POWERSAVE=m +CONFIG_DEVFREQ_GOV_USERSPACE=m + +# +# DEVFREQ Drivers +# CONFIG_EXTCON=m # # Extcon Device Drivers # +# CONFIG_EXTCON_ADC_JACK is not set CONFIG_EXTCON_GPIO=m +# CONFIG_EXTCON_RT8973A is not set +CONFIG_EXTCON_SM5502=m CONFIG_MEMORY=y -# CONFIG_IIO is not set +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=y +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 + +# +# Accelerometers +# +# CONFIG_BMA180 is not set +# CONFIG_BMC150_ACCEL is not set +CONFIG_HID_SENSOR_ACCEL_3D=m +CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m +CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +# CONFIG_KXSD9 is not set +# CONFIG_MMA8452 is not set +CONFIG_KXCJK1013=m + +# +# Analog to digital converters +# +# CONFIG_AD7266 is not set +# CONFIG_AD7291 is not set +# CONFIG_AD7298 is not set +# CONFIG_AD7476 is not set +# CONFIG_AD7791 is not set +# CONFIG_AD7793 is not set +# CONFIG_AD7887 is not set +# CONFIG_AD7923 is not set +# CONFIG_AD799X is not set +# CONFIG_MAX1027 is not set +# CONFIG_MAX1363 is not set +# CONFIG_MCP320X is not set +# CONFIG_MCP3422 is not set +# CONFIG_NAU7802 is not set +# CONFIG_TI_ADC081C is not set +# CONFIG_TI_ADC128S052 is not set +# CONFIG_TI_AM335X_ADC is not set +# CONFIG_VIPERBOARD_ADC is not set + +# +# Amplifiers +# +# CONFIG_AD8366 is not set + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# Digital to analog converters +# +# CONFIG_AD5064 is not set +# CONFIG_AD5360 is not set +# CONFIG_AD5380 is not set +# CONFIG_AD5421 is not set +# CONFIG_AD5446 is not set +# CONFIG_AD5449 is not set +# CONFIG_AD5504 is not set +# CONFIG_AD5624R_SPI is not set +# CONFIG_AD5686 is not set +# CONFIG_AD5755 is not set +# CONFIG_AD5764 is not set +# CONFIG_AD5791 is not set +# CONFIG_AD7303 is not set +# CONFIG_MAX517 is not set +# CONFIG_MCP4725 is not set +# CONFIG_MCP4922 is not set + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +# CONFIG_AD9523 is not set + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +# CONFIG_ADF4350 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16080 is not set +# CONFIG_ADIS16130 is not set +# CONFIG_ADIS16136 is not set +# CONFIG_ADIS16260 is not set +# CONFIG_ADXRS450 is not set +# CONFIG_BMG160 is not set +CONFIG_HID_SENSOR_GYRO_3D=m +CONFIG_IIO_ST_GYRO_3AXIS=m +CONFIG_IIO_ST_GYRO_I2C_3AXIS=m +CONFIG_IIO_ST_GYRO_SPI_3AXIS=m +# CONFIG_ITG3200 is not set + +# +# Humidity sensors +# +# CONFIG_DHT11 is not set +# CONFIG_SI7005 is not set + +# +# Inertial measurement units +# +# CONFIG_ADIS16400 is not set +# CONFIG_ADIS16480 is not set +# CONFIG_INV_MPU6050_IIO is not set + +# +# Light sensors +# +# CONFIG_ADJD_S311 is not set +# CONFIG_AL3320A is not set +# CONFIG_APDS9300 is not set +# CONFIG_CM32181 is not set +# CONFIG_CM36651 is not set +# CONFIG_GP2AP020A00F is not set +# CONFIG_ISL29125 is not set +CONFIG_HID_SENSOR_ALS=m +# CONFIG_HID_SENSOR_PROX is not set +# CONFIG_SENSORS_LM3533 is not set +# CONFIG_LTR501 is not set +# CONFIG_TCS3414 is not set +# CONFIG_TCS3472 is not set +# CONFIG_SENSORS_TSL2563 is not set +# CONFIG_TSL4531 is not set +# CONFIG_VCNL4000 is not set + +# +# Magnetometer sensors +# +# CONFIG_AK8975 is not set +# CONFIG_AK09911 is not set +# CONFIG_MAG3110 is not set +CONFIG_HID_SENSOR_MAGNETOMETER_3D=m +CONFIG_IIO_ST_MAGN_3AXIS=m +CONFIG_IIO_ST_MAGN_I2C_3AXIS=m +CONFIG_IIO_ST_MAGN_SPI_3AXIS=m + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m + +# +# Triggers - standalone +# +CONFIG_IIO_INTERRUPT_TRIGGER=m +# CONFIG_IIO_SYSFS_TRIGGER is not set + +# +# Pressure sensors +# +# CONFIG_HID_SENSOR_PRESS is not set +# CONFIG_MPL115 is not set +# CONFIG_MPL3115 is not set +# CONFIG_IIO_ST_PRESS is not set +# CONFIG_T5403 is not set + +# +# Lightning sensors +# +# CONFIG_AS3935 is not set + +# +# Temperature sensors +# +# CONFIG_MLX90614 is not set +# CONFIG_TMP006 is not set # CONFIG_NTB is not set # CONFIG_VME_BUS is not set # CONFIG_PWM is not set CONFIG_IPACK_BUS=m CONFIG_BOARD_TPCI200=m CONFIG_SERIAL_IPOCTAL=m -# CONFIG_RESET_CONTROLLER is not set +CONFIG_RESET_CONTROLLER=y CONFIG_FMC=m CONFIG_FMC_FAKEDEV=m CONFIG_FMC_TRIVIAL=m @@ -5516,10 +6103,13 @@ CONFIG_FMC_CHARDEV=m # # PHY Subsystem # -CONFIG_GENERIC_PHY=m -CONFIG_PHY_EXYNOS_MIPI_VIDEO=m +CONFIG_GENERIC_PHY=y +CONFIG_BCM_KONA_USB2_PHY=m CONFIG_POWERCAP=y CONFIG_INTEL_RAPL=m +# CONFIG_MCB is not set +CONFIG_RAS=y +CONFIG_THUNDERBOLT=m # # Firmware Drivers @@ -5531,6 +6121,7 @@ CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y CONFIG_DMI_SYSFS=m +CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m # CONFIG_GOOGLE_FIRMWARE is not set @@ -5539,6 +6130,8 @@ CONFIG_ISCSI_IBFT=m # EFI (Extensible Firmware Interface) Support # # CONFIG_EFI_VARS is not set +CONFIG_EFI_RUNTIME_MAP=y +CONFIG_EFI_RUNTIME_WRAPPERS=y CONFIG_UEFI_CPER=y # @@ -5607,7 +6200,7 @@ CONFIG_QUOTACTL_COMPAT=y CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m -CONFIG_GENERIC_ACL=y +CONFIG_OVERLAY_FS=m # # Caches @@ -5649,6 +6242,7 @@ CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_SYSCTL=y CONFIG_PROC_PAGE_MONITOR=y +CONFIG_KERNFS=y CONFIG_SYSFS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y @@ -5704,7 +6298,11 @@ CONFIG_OMFS_FS=m # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set -# CONFIG_ROMFS_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y CONFIG_PSTORE=y # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_FTRACE is not set @@ -5749,6 +6347,7 @@ CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_V4_SECURITY_LABEL=y # CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_GRACE_PERIOD=m CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_ACL_SUPPORT=m @@ -5759,8 +6358,11 @@ CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m +CONFIG_SUNRPC_XPRT_RDMA_SERVER=m CONFIG_CEPH_FS=m CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set @@ -5816,7 +6418,7 @@ CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_3=m CONFIG_NLS_ISO8859_4=m @@ -5853,7 +6455,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y # printk and dmesg options # CONFIG_PRINTK_TIME=y -CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_BOOT_PRINTK_DELAY is not set CONFIG_DYNAMIC_DEBUG=y @@ -5911,8 +6513,10 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 CONFIG_SCHED_DEBUG=y CONFIG_SCHEDSTATS=y +# CONFIG_SCHED_STACK_END_CHECK is not set CONFIG_TIMER_STATS=y # CONFIG_DEBUG_PREEMPT is not set @@ -5920,20 +6524,20 @@ CONFIG_TIMER_STATS=y # Lock Debugging (spinlocks, mutexes, etc...) # # CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set -CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_MUTEXES is not set # CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_LOCK_TORTURE_TEST is not set CONFIG_STACKTRACE=y # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_WRITECOUNT is not set # CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_PI_LIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_DEBUG_CREDENTIALS is not set @@ -5941,8 +6545,8 @@ CONFIG_DEBUG_BUGVERBOSE=y # # RCU Debugging # -# CONFIG_PROVE_RCU_DELAY is not set # CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_TORTURE_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set @@ -5959,7 +6563,6 @@ CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y -CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y @@ -5999,6 +6602,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -6016,9 +6620,14 @@ CONFIG_PERCPU_TEST=m CONFIG_ASYNC_RAID6_TEST=m # CONFIG_TEST_STRING_HELPERS is not set CONFIG_TEST_KSTRTOX=m +# CONFIG_TEST_RHASHTABLE is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DMA_API_DEBUG is not set +# CONFIG_TEST_LKM is not set +# CONFIG_TEST_USER_COPY is not set +# CONFIG_TEST_BPF is not set +# CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_UDELAY is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set @@ -6030,7 +6639,7 @@ CONFIG_EARLY_PRINTK_EFI=y # CONFIG_X86_PTDUMP is not set CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_SET_MODULE_RONX is not set +CONFIG_DEBUG_SET_MODULE_RONX=y # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set @@ -6065,36 +6674,18 @@ CONFIG_ENCRYPTED_KEYS=m # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_NETWORK_XFRM is not set +# CONFIG_SECURITY_NETWORK is not set CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -# CONFIG_SECURITY_SELINUX_DISABLE is not set -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 -# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set -CONFIG_SECURITY_SMACK=y -CONFIG_SECURITY_TOMOYO=y -CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 -CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 -# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set -CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 -CONFIG_SECURITY_APPARMOR_HASH=y +# CONFIG_SECURITY_SMACK is not set +# CONFIG_SECURITY_TOMOYO is not set +# CONFIG_SECURITY_APPARMOR is not set CONFIG_SECURITY_YAMA=y CONFIG_SECURITY_YAMA_STACKED=y +CONFIG_INTEGRITY=y +# CONFIG_INTEGRITY_SIGNATURE is not set # CONFIG_IMA is not set -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_SMACK is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +# CONFIG_EVM is not set # CONFIG_DEFAULT_SECURITY_YAMA is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" @@ -6121,7 +6712,7 @@ CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP=m CONFIG_CRYPTO_PCOMP2=y -CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y @@ -6130,6 +6721,7 @@ CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_ABLK_HELPER=m @@ -6168,7 +6760,7 @@ CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRC32_PCLMUL=m -CONFIG_CRYPTO_CRCT10DIF=m +CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m @@ -6178,10 +6770,11 @@ CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA1_SSSE3=m CONFIG_CRYPTO_SHA256_SSSE3=m CONFIG_CRYPTO_SHA512_SSSE3=m +CONFIG_CRYPTO_SHA1_MB=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m @@ -6209,6 +6802,7 @@ CONFIG_CRYPTO_CAST5_AVX_X86_64=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_CAST6_AVX_X86_64=m CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_DES3_EDE_X86_64=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m @@ -6238,6 +6832,7 @@ CONFIG_CRYPTO_LZ4HC=m # Random Number Generation # CONFIG_CRYPTO_ANSI_CPRNG=m +# CONFIG_CRYPTO_DRBG_MENU is not set CONFIG_CRYPTO_USER_API=m CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m @@ -6246,12 +6841,20 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_CCP=y +CONFIG_CRYPTO_DEV_CCP_DD=m +CONFIG_CRYPTO_DEV_CCP_CRYPTO=m +CONFIG_CRYPTO_DEV_QAT=m +CONFIG_CRYPTO_DEV_QAT_DH895xCC=m CONFIG_ASYMMETRIC_KEY_TYPE=m CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m CONFIG_PUBLIC_KEY_ALGO_RSA=m CONFIG_X509_CERTIFICATE_PARSER=m +CONFIG_PKCS7_MESSAGE_PARSER=m +CONFIG_PKCS7_TEST_KEY=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQFD=y CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_APIC_ARCHITECTURE=y @@ -6282,9 +6885,10 @@ CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IO=y CONFIG_PERCPU_RWSEM=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m -CONFIG_CRC_T10DIF=m +CONFIG_CRC_T10DIF=y CONFIG_CRC_ITU_T=m CONFIG_CRC32=y # CONFIG_CRC32_SELFTEST is not set @@ -6295,6 +6899,7 @@ CONFIG_CRC32_SLICEBY8=y CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_CRC8=m +# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set # CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y @@ -6322,6 +6927,7 @@ CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_ENC8=y CONFIG_REED_SOLOMON_DEC8=y +CONFIG_REED_SOLOMON_DEC16=y CONFIG_BCH=m CONFIG_BCH_CONST_PARAMS=y CONFIG_TEXTSEARCH=y @@ -6329,13 +6935,16 @@ CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y +CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_CPU_RMAP=y CONFIG_DQL=y +CONFIG_GLOB=y +# CONFIG_GLOB_SELFTEST is not set CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_LRU_CACHE=m @@ -6355,7 +6964,9 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_ACORN_8x8 is not set # CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_6x10 is not set # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set CONFIG_FONT_AUTOSELECT=y +CONFIG_ARCH_HAS_SG_CHAIN=y diff --git a/abs/core/linux/criu-no-expert.patch b/abs/core/linux/criu-no-expert.patch deleted file mode 100644 index 9bbc028..0000000 --- a/abs/core/linux/criu-no-expert.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/init/Kconfig b/init/Kconfig -index 4e5d96a..4b94ffe 100644 ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -1078,7 +1078,7 @@ config DEBUG_BLK_CGROUP - endif # CGROUPS - - config CHECKPOINT_RESTORE -- bool "Checkpoint/restore support" if EXPERT -+ bool "Checkpoint/restore support" - default n - help - Enables additional kernel features in a sake of checkpoint/restore. diff --git a/abs/core/linux/i8042-fix-aliases.patch b/abs/core/linux/i8042-fix-aliases.patch deleted file mode 100644 index 961968c..0000000 --- a/abs/core/linux/i8042-fix-aliases.patch +++ /dev/null @@ -1,113 +0,0 @@ -commit 5a420e61e39862c7c3356080eddb23dfe4ccadb7
-Author: Tom Gundersen <teg@jklm.no>
-Date: Sun Jan 26 17:00:32 2014 +0100
-
- Input: i8042 - fix PNP modaliases when both aux and kdb are enabled
-
- Commit 78551277e4 exposed the PNP modaliases for the i8042 module. However,
- when both the aux and the kbd drivers are enabled the aux entries would
- override the kdb ones.
-
- Refactor the device_id lists, and unconditionally attempt to load the driver
- if either a kdb or aux devices is present.
-
- Signed-off-by: Tom Gundersen <teg@jklm.no>
-
-diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
-index 0ec9abb..dbc6958 100644
---- a/drivers/input/serio/i8042-x86ia64io.h
-+++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -747,25 +747,27 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id *
- return 0;
- }
-
--static struct pnp_device_id pnp_kbd_devids[] = {
-- { .id = "PNP0300", .driver_data = 0 },
-- { .id = "PNP0301", .driver_data = 0 },
-- { .id = "PNP0302", .driver_data = 0 },
-- { .id = "PNP0303", .driver_data = 0 },
-- { .id = "PNP0304", .driver_data = 0 },
-- { .id = "PNP0305", .driver_data = 0 },
-- { .id = "PNP0306", .driver_data = 0 },
-- { .id = "PNP0309", .driver_data = 0 },
-- { .id = "PNP030a", .driver_data = 0 },
-- { .id = "PNP030b", .driver_data = 0 },
-- { .id = "PNP0320", .driver_data = 0 },
-- { .id = "PNP0343", .driver_data = 0 },
-- { .id = "PNP0344", .driver_data = 0 },
-- { .id = "PNP0345", .driver_data = 0 },
-+#define KBD_DEVIDS \
-+ { .id = "PNP0300", .driver_data = 0 }, \
-+ { .id = "PNP0301", .driver_data = 0 }, \
-+ { .id = "PNP0302", .driver_data = 0 }, \
-+ { .id = "PNP0303", .driver_data = 0 }, \
-+ { .id = "PNP0304", .driver_data = 0 }, \
-+ { .id = "PNP0305", .driver_data = 0 }, \
-+ { .id = "PNP0306", .driver_data = 0 }, \
-+ { .id = "PNP0309", .driver_data = 0 }, \
-+ { .id = "PNP030a", .driver_data = 0 }, \
-+ { .id = "PNP030b", .driver_data = 0 }, \
-+ { .id = "PNP0320", .driver_data = 0 }, \
-+ { .id = "PNP0343", .driver_data = 0 }, \
-+ { .id = "PNP0344", .driver_data = 0 }, \
-+ { .id = "PNP0345", .driver_data = 0 }, \
- { .id = "CPQA0D7", .driver_data = 0 },
-+
-+static struct pnp_device_id pnp_kbd_devids[] = {
-+ KBD_DEVIDS
- { .id = "", },
- };
--MODULE_DEVICE_TABLE(pnp, pnp_kbd_devids);
-
- static struct pnp_driver i8042_pnp_kbd_driver = {
- .name = "i8042 kbd",
-@@ -773,21 +775,23 @@ static struct pnp_driver i8042_pnp_kbd_driver = {
- .probe = i8042_pnp_kbd_probe,
- };
-
--static struct pnp_device_id pnp_aux_devids[] = {
-- { .id = "AUI0200", .driver_data = 0 },
-- { .id = "FJC6000", .driver_data = 0 },
-- { .id = "FJC6001", .driver_data = 0 },
-- { .id = "PNP0f03", .driver_data = 0 },
-- { .id = "PNP0f0b", .driver_data = 0 },
-- { .id = "PNP0f0e", .driver_data = 0 },
-- { .id = "PNP0f12", .driver_data = 0 },
-- { .id = "PNP0f13", .driver_data = 0 },
-- { .id = "PNP0f19", .driver_data = 0 },
-- { .id = "PNP0f1c", .driver_data = 0 },
-+#define AUX_DEVIDS \
-+ { .id = "AUI0200", .driver_data = 0 }, \
-+ { .id = "FJC6000", .driver_data = 0 }, \
-+ { .id = "FJC6001", .driver_data = 0 }, \
-+ { .id = "PNP0f03", .driver_data = 0 }, \
-+ { .id = "PNP0f0b", .driver_data = 0 }, \
-+ { .id = "PNP0f0e", .driver_data = 0 }, \
-+ { .id = "PNP0f12", .driver_data = 0 }, \
-+ { .id = "PNP0f13", .driver_data = 0 }, \
-+ { .id = "PNP0f19", .driver_data = 0 }, \
-+ { .id = "PNP0f1c", .driver_data = 0 }, \
- { .id = "SYN0801", .driver_data = 0 },
-+
-+static struct pnp_device_id pnp_aux_devids[] = {
-+ AUX_DEVIDS
- { .id = "", },
- };
--MODULE_DEVICE_TABLE(pnp, pnp_aux_devids);
-
- static struct pnp_driver i8042_pnp_aux_driver = {
- .name = "i8042 aux",
-@@ -795,6 +799,13 @@ static struct pnp_driver i8042_pnp_aux_driver = {
- .probe = i8042_pnp_aux_probe,
- };
-
-+static struct pnp_device_id pnp_kdb_aux_devids[] = {
-+ KBD_DEVIDS
-+ AUX_DEVIDS
-+ { .id = "", },
-+};
-+MODULE_DEVICE_TABLE(pnp, pnp_kdb_aux_devids);
-+
- static void i8042_pnp_exit(void)
- {
- if (i8042_pnp_kbd_registered) {
diff --git a/abs/core/linux/linux.install.pkg b/abs/core/linux/linux.install.pkg index 13f1c5e..891013c 100644 --- a/abs/core/linux/linux.install.pkg +++ b/abs/core/linux/linux.install.pkg @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.13.7-2-ARCH +KERNEL_VERSION=3.18.4-1-ARCH post_install () { # updating module dependencies diff --git a/abs/core/lirc/0001-doc-Add-Doxyfile-to-tarball.patch b/abs/core/lirc/0001-doc-Add-Doxyfile-to-tarball.patch new file mode 100644 index 0000000..1ca5165 --- /dev/null +++ b/abs/core/lirc/0001-doc-Add-Doxyfile-to-tarball.patch @@ -0,0 +1,25 @@ +From 945e44ffe2296bc37dc58363e5beaf5b4eca73fa Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Thu, 11 Dec 2014 05:34:26 +0100 +Subject: [PATCH 01/13] doc: Add Doxyfile to tarball. + +--- + doc/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 8a05a7d..1b6730e 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -3,6 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 + + DISTCLEANFILES = man/* html/* man-html/* + ++EXTRA_DIST = Doxyfile ++ + LIB_SRC = $(srcdir)/../lib + API_SRC = $(LIB_SRC)/*.c \ + $(LIB_SRC)/*.h \ +-- +2.2.2 + diff --git a/abs/core/lirc/0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch b/abs/core/lirc/0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch new file mode 100644 index 0000000..b65ab0f --- /dev/null +++ b/abs/core/lirc/0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch @@ -0,0 +1,26 @@ +From d733314ef8293a447568ef48af8b0ddd83a4ad42 Mon Sep 17 00:00:00 2001 +From: Inando <inand0@users.sf.net> +Date: Mon, 29 Dec 2014 14:45:08 +0100 +Subject: [PATCH 02/13] lirc.pc: Fix bad variable reference/ordering (#86) + +--- + lirc.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lirc.pc.in b/lirc.pc.in +index 43f2b9b..432f51a 100644 +--- a/lirc.pc.in ++++ b/lirc.pc.in +@@ -2,8 +2,8 @@ Name: lirc + Description: LIRC Linux Infrared Control client libs. + Version: @VERSION@ + +-datarootdir=@datarootdir@ + prefix=@prefix@ ++datarootdir=@datarootdir@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ +-- +2.2.2 + diff --git a/abs/core/lirc/0004-lirc-lsplugins-Bugfix.patch b/abs/core/lirc/0004-lirc-lsplugins-Bugfix.patch new file mode 100644 index 0000000..3517e50 --- /dev/null +++ b/abs/core/lirc/0004-lirc-lsplugins-Bugfix.patch @@ -0,0 +1,25 @@ +From ad094a827e37219b76cf6b6bf3d6fab49a32e913 Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Fri, 9 Jan 2015 12:46:36 +0100 +Subject: [PATCH 04/13] lirc-lsplugins: Bugfix. + +--- + tools/lirc-lsplugins.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/lirc-lsplugins.c b/tools/lirc-lsplugins.c +index 10403a7..9eceb3b 100644 +--- a/tools/lirc-lsplugins.c ++++ b/tools/lirc-lsplugins.c +@@ -212,7 +212,7 @@ static void line_print_long(const line_t* line) + } + + printf("Plugin path:\t%s\n", line->path); +- printf("Driver name:\t%s\n", line->path ? line->name : "-"); ++ printf("Driver name:\t%s\n", line->name ? line->name : "-"); + printf("Load state:\t%s\n", loadstate); + printf("Timing info:\t%s\n", handles_timing); + printf("Can send:\t%s\n", can_send); +-- +2.2.2 + diff --git a/abs/core/lirc/0005-lirc_options.conf-Add-effective-user-to-template.patch b/abs/core/lirc/0005-lirc_options.conf-Add-effective-user-to-template.patch new file mode 100644 index 0000000..8910905 --- /dev/null +++ b/abs/core/lirc/0005-lirc_options.conf-Add-effective-user-to-template.patch @@ -0,0 +1,24 @@ +From 502af4fcca53c81025446bb73fa29570abb34feb Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Thu, 11 Dec 2014 10:28:47 +0100 +Subject: [PATCH 05/13] lirc_options.conf: Add effective-user to template. + +--- + lirc_options.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lirc_options.conf b/lirc_options.conf +index 9dc672a..9346de8 100644 +--- a/lirc_options.conf ++++ b/lirc_options.conf +@@ -12,6 +12,7 @@ plugindir = /usr/lib/lirc/plugins + permission = 666 + allow-simulate = No + repeat-max = 600 ++#effective-user = + #listen = [address:]port + #connect = host[:port] + #debug = 6 +-- +2.2.2 + diff --git a/abs/core/lirc/0006-doc-Clean-up-irsend-1-manpage.patch b/abs/core/lirc/0006-doc-Clean-up-irsend-1-manpage.patch new file mode 100644 index 0000000..1a7f279 --- /dev/null +++ b/abs/core/lirc/0006-doc-Clean-up-irsend-1-manpage.patch @@ -0,0 +1,55 @@ +From ed1eab5e685df76426709b2c12284d61de0470b5 Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Tue, 16 Dec 2014 11:18:00 +0100 +Subject: [PATCH 06/13] doc: Clean up irsend(1) manpage. + +--- + doc/man-source/irsend.1 | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +diff --git a/doc/man-source/irsend.1 b/doc/man-source/irsend.1 +index 51f57ab..12d2db8 100644 +--- a/doc/man-source/irsend.1 ++++ b/doc/man-source/irsend.1 +@@ -1,4 +1,4 @@ +-.TH IRSEND "1" "Last change: Sep 2014" "irsend @version@" "User Commands" ++.TH IRSEND "1" "Last change: Dec 2014" "irsend @version@" "User Commands" + .SH NAME + irsend - basic LIRC program to send infra-red commands + .SH SYNOPSIS +@@ -63,6 +63,12 @@ connect to lircd at this address + .TP + \-# \fB\-\-count\fR=\fIn\fR + send command n times ++ ++.SH ENVIRONMENT ++.TP 4 ++LIRC_SOCKET_PATH ++The lircd socket to connect to, defaults to a hardcoded default value ++usually /var/run/lirc/lircd + .SH FILES + .TP + .I /etc/lirc/lircd.conf +@@ -94,18 +100,10 @@ irsend SIMULATE "0000000000000476 00 OK TECHNISAT_ST3004S" + Drivers are loaded dynamically. The directory used for this is determined by (falling + priority): + .IP \- 2 +-The --plugindir option if available. +-.IP \- 2 + The 'plugindir' entry in the [lircd] section of the lirc_options.conf file. + .IP \- 2 + The environment variable LIRC_PLUGINDIR. + .IP \- 2 + A hardcoded default (usually /usr/lib[64]/lirc/plugins). + .SH "SEE ALSO" +-The documentation for +-.B lirc +-is maintained as html pages. They are located under html/ in the +-documentation directory. +- +-.BR lircd(8), mode2(1), xmode2(1) +-.BR irrecord(1) irw(1), http://www.lirc.org . ++.B lircd(8), mode2(1), xmode2(1), irrecord(1), irw(1) +-- +2.2.2 + diff --git a/abs/core/lirc/0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch b/abs/core/lirc/0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch new file mode 100644 index 0000000..c186054 --- /dev/null +++ b/abs/core/lirc/0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch @@ -0,0 +1,70 @@ +From dfe0f3c3170a029a47edd9adf2a1b9a975d496ae Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Sat, 10 Jan 2015 01:30:32 +0100 +Subject: [PATCH 09/13] lib/lirc_log: Add priority labels (info, error...) to + syslog msg (#89). + +--- + lib/lirc_log.c | 23 +++++++---------------- + 1 file changed, 7 insertions(+), 16 deletions(-) + +diff --git a/lib/lirc_log.c b/lib/lirc_log.c +index 307fb77..cf37e6d 100644 +--- a/lib/lirc_log.c ++++ b/lib/lirc_log.c +@@ -2,22 +2,8 @@ + ** lircd.c ***************************************************************** + **************************************************************************** + * +- * lircd - LIRC Decoder Daemon ++ * lirc_log - simple logging module. + * +- * Copyright (C) 1996,97 Ralph Metzler <rjkm@thp.uni-koeln.de> +- * Copyright (C) 1998,99 Christoph Bartelmus <lirc@bartelmus.de> +- * +- * ======= +- * HISTORY +- * ======= +- * +- * 0.1: 03/27/96 decode SONY infra-red signals +- * create mousesystems mouse signals on pipe /dev/lircm +- * 04/07/96 send ir-codes to clients via socket (see irpty) +- * 05/16/96 now using ir_remotes for decoding +- * much easier now to describe new remotes +- * +- * 0.5: 09/02/98 finished (nearly) complete rewrite (Christoph) + * + */ + +@@ -59,6 +45,8 @@ const char *logfile = "syslog"; + char progname[128] = {'?','\0'}; + static int nodaemon = 0; + ++static const int PRIO_LEN = 16; /**< Longest priority label, some margin. */ ++ + + static const char* prio2text(int prio) + { +@@ -246,6 +234,7 @@ void logprintf(loglevel_t prio, const char *format_str, ...) + { + int save_errno = errno; + va_list ap; ++ char buff[PRIO_LEN + strlen(format_str)]; + + #ifdef SYSTEMD_LOGPERROR_FIX + if (nodaemon && prio <= loglevel) { +@@ -258,8 +247,10 @@ void logprintf(loglevel_t prio, const char *format_str, ...) + } + #endif + if (use_syslog) { ++ snprintf(buff, sizeof(buff), ++ "%s: %s", prio2text(prio), format_str); + va_start(ap, format_str); +- vsyslog(prio, format_str, ap); ++ vsyslog(prio, buff, ap); + va_end(ap); + } else if (lf && prio <= loglevel) { + time_t current; +-- +2.2.2 + diff --git a/abs/core/lirc/0010-lirc-setup-Fix-remote-config-file-display-problems.patch b/abs/core/lirc/0010-lirc-setup-Fix-remote-config-file-display-problems.patch new file mode 100644 index 0000000..5f5803d --- /dev/null +++ b/abs/core/lirc/0010-lirc-setup-Fix-remote-config-file-display-problems.patch @@ -0,0 +1,38 @@ +From f3714b04a20069b70b9cbba7558bb3cb5d28caa9 Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Wed, 14 Jan 2015 01:13:00 +0100 +Subject: [PATCH 10/13] lirc-setup: Fix remote config file display problems. + +--- + tools/lirc-setup/mvc_control.py | 2 +- + tools/lirc-setup/mvc_view.py | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/lirc-setup/mvc_control.py b/tools/lirc-setup/mvc_control.py +index a922df5..8cf216b 100644 +--- a/tools/lirc-setup/mvc_control.py ++++ b/tools/lirc-setup/mvc_control.py +@@ -244,7 +244,7 @@ class Controller(object): + errors='ignore') + except urllib.error.URLError as ex: + text = "Sorry: cannot download: " + uri + ' (' + str(ex) + ')' +- self.view.show_text(text, 'lirc: download error') ++ self.view.show_text(text, 'lirc: Remote config file') + + + def main(): +diff --git a/tools/lirc-setup/mvc_view.py b/tools/lirc-setup/mvc_view.py +index a50ce73..19e8df7 100644 +--- a/tools/lirc-setup/mvc_view.py ++++ b/tools/lirc-setup/mvc_view.py +@@ -156,6 +156,7 @@ class View(baseview.Baseview): + else: + return True + ++ text = text.replace("&", "&") + self.builder.get_object("show_text_label").set_markup(text) + w = self.builder.get_object('view_text_window') + w.set_title(title) +-- +2.2.2 + diff --git a/abs/core/lirc/0012-lib-Bad-bugfix-for-finding-.lircrc.patch b/abs/core/lirc/0012-lib-Bad-bugfix-for-finding-.lircrc.patch new file mode 100644 index 0000000..dc97b13 --- /dev/null +++ b/abs/core/lirc/0012-lib-Bad-bugfix-for-finding-.lircrc.patch @@ -0,0 +1,27 @@ +From 96292ce20b75ef27851ba75aed1aafb15a207a79 Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Thu, 15 Jan 2015 02:01:57 +0100 +Subject: [PATCH 12/13] lib: Bad bugfix for finding ~/.lircrc + +Basically, the common library code did not find ~/.lircrc, just +~/.config/lircrc. Fixed. +--- + lib/lirc_client.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/lirc_client.c b/lib/lirc_client.c +index c441803..df2eaef 100644 +--- a/lib/lirc_client.c ++++ b/lib/lirc_client.c +@@ -807,7 +807,7 @@ static char *lirc_getfilename(const char *file, const char *current_file) + if (filename == NULL) { + return NULL; + } +- strcat(filename, LIRCRC_USER_FILE); ++ strcat(filename, "/" LIRCRC_USER_FILE); + } + filename = realloc(filename, strlen(filename) + 1); + } else if (strncmp(file, "~/", 2) == 0) { +-- +2.2.2 + diff --git a/abs/core/lirc/0013-tools-Make-make_rel_symlink.py-use-python3.patch b/abs/core/lirc/0013-tools-Make-make_rel_symlink.py-use-python3.patch new file mode 100644 index 0000000..4ef3c15 --- /dev/null +++ b/abs/core/lirc/0013-tools-Make-make_rel_symlink.py-use-python3.patch @@ -0,0 +1,42 @@ +From 4c30c6f87dda6614978dfab69d417ef3ca83dccf Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Thu, 11 Dec 2014 04:44:49 +0100 +Subject: [PATCH 13/13] tools: Make make_rel_symlink.py use python3. + +--- + tools/make_rel_symlink.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tools/make_rel_symlink.py b/tools/make_rel_symlink.py +index 5c89305..896637f 100755 +--- a/tools/make_rel_symlink.py ++++ b/tools/make_rel_symlink.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + import os + import os.path +@@ -32,16 +32,16 @@ if sys.argv[1] == "-p": + sys.argv = sys.argv[ 1:] + + if len( sys.argv ) != 3: +- print USAGE ++ print(USAGE) + sys.exit( 1 ) + + if os.path.isdir( sys.argv[2] ): +- print "Removing link target dir:" + sys.argv[2] ++ print("Removing link target dir:" + sys.argv[2]) + shutil.rmtree( sys.argv[2]) + + link_path = relative_ln_s( sys.argv[1], sys.argv[2] ) + if just_print: +- print link_path ++ print(link_path) + else: + os.chdir( os.path.dirname( sys.argv[2])) + target = os.path.basename( sys.argv[2]) +-- +2.2.2 + diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD index e924cc8..6a5f803 100644 --- a/abs/core/lirc/PKGBUILD +++ b/abs/core/lirc/PKGBUILD @@ -1,121 +1,79 @@ -# $Id$ -# Maintainer: Paul Mattal <paul@archlinux.org> +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Paul Mattal <paul@archlinux.org> -pkgbase=lirc -pkgname=('lirc' 'lirc-utils') -pkgver=0.9.0 -pkgrel=73 -#epoch=1 -_extramodules=extramodules-3.13-ARCH +pkgname=lirc +_pkgver=0.9.2 +[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver" +pkgrel=1 +epoch=1 +pkgdesc="Linux Infrared Remote Control utils" arch=('i686' 'x86_64') url="http://www.lirc.org/" license=('GPL') -### NOTICE don't forget to bump version in depends in package_lirc -makedepends=('help2man' 'linux>=3.13' 'linux<3.14' 'linux-headers>=3.13' 'linux-headers<3.14' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2' 'iguanair') -options=('!makeflags' '!strip') -source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 - lirc_wpc8769l.patch - lircd-handle-large-config.patch - lirc_atiusb-kfifo.patch - kernel-2.6.39.patch - linux-3.8.patch +depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'iguanair') +makedepends=('help2man' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2') +#optdepends=('python: for lirc-setup, irdb-get and pronto2lirc') +provides=('lirc-utils') +conflicts=('lirc-utils') +replaces=('lirc-utils') +backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf') +install=lirc.install +source=("http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2" + 0001-doc-Add-Doxyfile-to-tarball.patch + 0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch + 0004-lirc-lsplugins-Bugfix.patch + 0005-lirc_options.conf-Add-effective-user-to-template.patch + 0006-doc-Clean-up-irsend-1-manpage.patch + 0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch + 0010-lirc-setup-Fix-remote-config-file-display-problems.patch + 0012-lib-Bad-bugfix-for-finding-.lircrc.patch lirc.logrotate - lirc.service - lircm.service - irexec.service lirc.tmpfiles) +md5sums=('3afc84e79c0839823cc20e7a710dd06d' + '1e1a68f08c2ecb2b766973e4f1721bae' + 'c04b2ed646dbaaec2fa9f4e1ad2cc802' + '2e60e1b3c19b0898d1d5f69e76891a60' + '9fe1e650858ca91e3a0fe4d63ee4b946' + '8b5c11ab325d4bef998c41b5b1160513' + '96475d718dbeb336a3282a5e9f9fdadd' + '308c3e1fd769b38caa6fd548f54f2440' + '497c4bb4ac8fc6febac94abe1922595c' + '3deb02604b37811d41816e9b4385fcc3' + 'febf25c154a7d36f01159e84f26c2d9a') prepare() { - cd "${srcdir}/lirc-${pkgver}" - patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch" - patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch" - patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch" - patch -Np1 -i "${srcdir}/kernel-2.6.39.patch" - patch -Np1 -i "${srcdir}/linux-3.8.patch" - - # use fixed instead of Courier w/xmode2, should be more prevalent on linux boxen - sed -i -e 's|char.*font1_name.*Courier.*$|char font1_name[]="-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1";|g' tools/xmode2.c + cd "${srcdir}/lirc-${_pkgver}" - # use /dev/lirc0 by default instead of /dev/lirc - sed -i -e 's|#define DEV_LIRC "lirc"|#define DEV_LIRC "lirc0"|' config.h.in + patch -p1 -i ../0001-doc-Add-Doxyfile-to-tarball.patch + patch -p1 -i ../0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch + patch -p1 -i ../0004-lirc-lsplugins-Bugfix.patch + patch -p1 -i ../0005-lirc_options.conf-Add-effective-user-to-template.patch + patch -p1 -i ../0006-doc-Clean-up-irsend-1-manpage.patch + patch -p1 -i ../0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch + patch -p1 -i ../0010-lirc-setup-Fix-remote-config-file-display-problems.patch + patch -p1 -i ../0012-lib-Bad-bugfix-for-finding-.lircrc.patch - sed -i '/AC_PATH_XTRA/d' configure.ac - sed -e 's/@X_CFLAGS@//g' \ - -e 's/@X_LIBS@//g' \ - -e 's/@X_PRE_LIBS@//g' \ - -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am - - # fix for new automake #33497 - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac - libtoolize autoreconf } build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${srcdir}/lirc-${pkgver}" - - PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ - --with-driver=all --with-kerneldir=/usr/lib/modules/${_kernver}/build \ - --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \ - --sbindir=/usr/bin --with-transmitter + cd "${srcdir}/lirc-${_pkgver}" - # Remove drivers already in kernel - sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \ - -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \ - -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \ - -e "s:lirc_atiusb::" -e "s:lirc_i2c::" \ - -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var \ + --with-transmitter --enable-sandboxed make } -package_lirc() { - pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'linux>=3.13' 'linux<3.14') - replaces=('lirc+pctv') - install=lirc.install - - cd "${srcdir}/lirc-${pkgver}/drivers" - make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install +package() { + cd "${srcdir}/lirc-${_pkgver}" - # set the kernel we've built for inside the install script - sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install" - # gzip -9 modules - find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; -} + make DESTDIR="${pkgdir}" install -package_lirc-utils() { - pkgdesc="Linux Infrared Remote Control utils" - depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'iguanair') - optdepends=('python2: pronto2lirc utility') - options=('strip') - install=lirc-utils.install + install -Dm644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf + install -Dm644 "${srcdir}"/lirc.logrotate "${pkgdir}"/etc/logrotate.d/lirc - cd "${srcdir}/lirc-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service - install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service - install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service - install -D -m644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf - cp -rp remotes "${pkgdir}/usr/share/lirc" - chmod -R go-w "${pkgdir}/usr/share/lirc/" + # LinHES remotes service uses /etc/lircd.conf so create symlink + ln -s "/etc/lircd.conf" "${pkgdir}/etc/lirc/lircd.conf.d/mv_ir_lircd.conf" - # install the logrotate config - install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" - - install -d "${pkgdir}/etc/lirc" - - # remove built modules - rm -r "${pkgdir}/usr/lib/modules" + rmdir "${pkgdir}"/var/{run/lirc/,run/,} } -md5sums=('b232aef26f23fe33ea8305d276637086' - '1cce37e18e3f6f46044abab29016d18f' - 'b70cc9640505205446ec47b7d4779f38' - '1f8b104a2365d9f93404b143f499059b' - '087a7d102e1c96bf1179f38db2b0b237' - '9ee196bd03ea44af5a752fb0cc6ca96a' - '3deb02604b37811d41816e9b4385fcc3' - 'a9ab637e7207472e61e55a2fa75dc555' - '1847b9997685bc3ad2cf11bea4590a92' - '07131d117fcfe9dcd50c453c3a5e9531' - 'febf25c154a7d36f01159e84f26c2d9a') diff --git a/abs/core/lirc/__changelog b/abs/core/lirc/__changelog index c0068c0..adf4a9c 100644 --- a/abs/core/lirc/__changelog +++ b/abs/core/lirc/__changelog @@ -1,2 +1,7 @@ -added 'iguanair' to make depends and package depends -change configure kerneldir for 3.13 moving src to --with-kerneldir=/usr/lib/modules/${_kernver}/build +PKGBUILD: add 'iguanair' to depends +PKGBUILD: change dep python to python2 +PKGBUILD: comment out optdepends +PKGBUILD: don't use 0013-tools-Make-make_rel_symlink.py-use-python3.patch +PKGBUILD: # LinHES remotes service uses /etc/lircd.conf so create symlink + ln -s "/etc/lircd.conf" "${pkgdir}/etc/lirc/lircd.conf.d/mv_ir_lircd.conf" +lirc.install: comment out service message diff --git a/abs/core/lirc/irexec.service b/abs/core/lirc/irexec.service deleted file mode 100644 index 5d7915b..0000000 --- a/abs/core/lirc/irexec.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=IR Exec -After=lirc.service -Wants=lirc.service - -[Service] -ExecStart=/usr/bin/irexec --daemon -Type=forking - -[Install] -WantedBy=multi-user.target diff --git a/abs/core/lirc/kernel-2.6.39.patch b/abs/core/lirc/kernel-2.6.39.patch deleted file mode 100644 index 7353d61..0000000 --- a/abs/core/lirc/kernel-2.6.39.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c ---- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c 2011-03-25 23:28:18.000000000 +0100 -+++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c 2011-06-07 17:02:20.356580306 +0200 -@@ -48,7 +48,6 @@ - #include <linux/slab.h> - #include <linux/module.h> - #include <linux/kmod.h> --#include <linux/smp_lock.h> - #include <linux/completion.h> - #include <linux/uaccess.h> - #include <linux/usb.h> -diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c ---- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c 2011-03-25 23:28:18.000000000 +0100 -+++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c 2011-06-07 17:04:19.725933627 +0200 -@@ -555,8 +555,8 @@ - kfree(ir); - return -EINVAL; - } -- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n", -- adap->id, addr, ir->c.name); -+ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n", -+ addr, ir->c.name); - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) - /* register device */ -diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c ---- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-03-25 23:28:18.000000000 +0100 -+++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-06-07 17:07:23.984935411 +0200 -@@ -361,14 +361,14 @@ - size = count << 3; - - ldata = (unsigned long *) data_buf; -- next_one = generic_find_next_le_bit(ldata, size, 0); -+ next_one = find_next_zero_bit_le(ldata, size, 0); - - if (next_one > 0) - put_pulse_bit(next_one - * WPC8769L_USECS_PER_BIT); - - while (next_one < size) { -- next_zero = generic_find_next_zero_le_bit(ldata, -+ next_zero = find_next_zero_bit_le(ldata, - size, next_one + 1); - - put_space_bit( -@@ -376,7 +376,7 @@ - * WPC8769L_USECS_PER_BIT); - - if (next_zero < size) { -- next_one = generic_find_next_le_bit(ldata, -+ next_one = find_next_bit_le(ldata, - size, next_zero + 1); - - put_pulse_bit( diff --git a/abs/core/lirc/linux-3.8.patch b/abs/core/lirc/linux-3.8.patch deleted file mode 100644 index 7b6378a..0000000 --- a/abs/core/lirc/linux-3.8.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -upr lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c lirc-0.9.0/drivers/lirc_serial/lirc_serial.c ---- lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:36:25.000000000 +0200 -+++ lirc-0.9.0/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:39:55.000000000 +0200 -@@ -1103,12 +1103,12 @@ static struct lirc_driver driver = { - - static struct platform_device *lirc_serial_dev; - --static int __devinit lirc_serial_probe(struct platform_device *dev) -+static int lirc_serial_probe(struct platform_device *dev) - { - return 0; - } - --static int __devexit lirc_serial_remove(struct platform_device *dev) -+static int lirc_serial_remove(struct platform_device *dev) - { - return 0; - } -@@ -1159,7 +1159,7 @@ static int lirc_serial_resume(struct pla - - static struct platform_driver lirc_serial_driver = { - .probe = lirc_serial_probe, -- .remove = __devexit_p(lirc_serial_remove), -+ .remove = lirc_serial_remove, - .suspend = lirc_serial_suspend, - .resume = lirc_serial_resume, - .driver = { -diff -upr lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c lirc-0.9.0/drivers/lirc_sir/lirc_sir.c ---- lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:36:25.000000000 +0200 -+++ lirc-0.9.0/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:38:24.000000000 +0200 -@@ -1290,19 +1290,19 @@ static int init_lirc_sir(void) - return 0; - } - --static int __devinit lirc_sir_probe(struct platform_device *dev) -+static int lirc_sir_probe(struct platform_device *dev) - { - return 0; - } - --static int __devexit lirc_sir_remove(struct platform_device *dev) -+static int lirc_sir_remove(struct platform_device *dev) - { - return 0; - } - - static struct platform_driver lirc_sir_driver = { - .probe = lirc_sir_probe, -- .remove = __devexit_p(lirc_sir_remove), -+ .remove = lirc_sir_remove, - .driver = { - .name = "lirc_sir", - .owner = THIS_MODULE, -diff -upr lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c ---- lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:36:25.000000000 +0200 -+++ lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:39:39.000000000 +0200 -@@ -930,12 +930,12 @@ static int wpc8769l_acpi_detect(void) - #ifdef MODULE - static struct platform_device *lirc_wpc8769l_platform_dev; - --static int __devinit lirc_wpc8769l_probe(struct platform_device *dev) -+static int lirc_wpc8769l_probe(struct platform_device *dev) - { - return 0; - } - --static int __devexit lirc_wpc8769l_remove(struct platform_device *dev) -+static int lirc_wpc8769l_remove(struct platform_device *dev) - { - return 0; - } -@@ -963,7 +963,7 @@ static int lirc_wpc8769l_resume(struct p - - static struct platform_driver lirc_wpc8769l_platform_driver = { - .probe = lirc_wpc8769l_probe, -- .remove = __devexit_p(lirc_wpc8769l_remove), -+ .remove = lirc_wpc8769l_remove, - .suspend = lirc_wpc8769l_suspend, - .resume = lirc_wpc8769l_resume, - .driver = { diff --git a/abs/core/lirc/lirc-utils.install b/abs/core/lirc/lirc-utils.install deleted file mode 100644 index 293d1ed..0000000 --- a/abs/core/lirc/lirc-utils.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - systemd-tmpfiles --create lirc.conf -} - -post_upgrade() { - post_install -} diff --git a/abs/core/lirc/lirc.install b/abs/core/lirc/lirc.install index 8e5460a..cc5d931 100644 --- a/abs/core/lirc/lirc.install +++ b/abs/core/lirc/lirc.install @@ -1,16 +1,13 @@ -EXTRAMODULES=extramodules-3.13-ARCH - post_install() { - # updating module dependencies - echo ">>> Updating module dependencies. Please wait ..." - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1 + systemd-tmpfiles --create lirc.conf } post_upgrade() { - post_install -} + post_install -# arg 1: the old package version -post_remove() { - post_install +# if [[ "$(vercmp $2 1:0.9.1-1)" -lt 0 ]]; then +# echo ':: lirc.service and lircm.service have been replaced' +# echo ' by the upstream unit files lircd.service and' +# echo ' lircmd.service.' +# fi } diff --git a/abs/core/lirc/lirc.service b/abs/core/lirc/lirc.service deleted file mode 100644 index a797d16..0000000 --- a/abs/core/lirc/lirc.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Linux Infrared Remote Control -After=network.target - -[Service] -Type=forking -PIDFile=/run/lirc/lircd.pid -ExecStart=/usr/sbin/lircd --driver=default --device=/dev/lirc0 - -[Install] -WantedBy=multi-user.target - diff --git a/abs/core/lirc/lirc_atiusb-kfifo.patch b/abs/core/lirc/lirc_atiusb-kfifo.patch deleted file mode 100644 index a64984d..0000000 --- a/abs/core/lirc/lirc_atiusb-kfifo.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001 -From: Jason Martin <publicmsu@gmail.com> -Date: Fri, 3 Jun 2011 00:12:51 -0400 -Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo - -I came across posts with regards to lirc_atiusb and its compatibility -with newer kernels, and their use of kfifo.I spent a little bit of time -this evening, and was able to correct the issues with the driver, and -now have a functioning lirc_atiusb device under the 2.6.38 kernel. - -Signed-off-by: Jarod Wilson <jarod@redhat.com> ---- - drivers/lirc_atiusb/lirc_atiusb.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c -index 52080de..bf2b631 100644 ---- a/drivers/lirc_atiusb/lirc_atiusb.c -+++ b/drivers/lirc_atiusb/lirc_atiusb.c -@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf) - goto new_irctl_failure_check; - } - -- if (lirc_buffer_init(driver->rbuf, dclen, 1)) { -+ if (lirc_buffer_init(driver->rbuf, dclen, 2)) { - mem_failure = 4; - goto new_irctl_failure_check; - } --- -1.7.0.1 - diff --git a/abs/core/lirc/lirc_wpc8769l.patch b/abs/core/lirc/lirc_wpc8769l.patch deleted file mode 100644 index e4e2a04..0000000 --- a/abs/core/lirc/lirc_wpc8769l.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com> -Date: Wed, 30 Mar 2011 16:46:35 -0400 -Subject: [PATCH] Make lirc_wpc8769l functional again - -Signed-off-by: Jarod Wilson <jarod@redhat.com> ---- - drivers/lirc_wpc8769l/lirc_wpc8769l.c | 28 +++++++++++++++++----------- - 1 files changed, 17 insertions(+), 11 deletions(-) - -diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c -index f820d11..4d04063 100644 ---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c -+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c -@@ -816,10 +816,6 @@ static int set_use_inc(void *data) - /* Reset last timeout value. */ - lastus = 0; - -- /* Init the read buffer. */ -- if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) -- return -ENOMEM; -- - /* Acquire the IRQ. */ - result = request_irq(irq, irq_handler, - IRQF_DISABLED | IRQF_SHARED, -@@ -863,9 +859,6 @@ static void set_use_dec(void *data) - /* Free the IRQ. */ - free_irq(irq, THIS_MODULE); - dprintk("Freed IRQ %d\n", irq); -- -- /* Free the RX buffer. */ -- lirc_buffer_free(&rbuf); - } - - static struct lirc_driver driver = { -@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void) - /* Do load-time checks. */ - wpc8769l_power_up_and_check_if_we_woke_us_up(); - -+ /* Init the read buffer. */ -+ if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) { -+ rc = -ENOMEM; -+ goto exit_platform_exit; -+ } -+ - /* Configure the driver hooks. */ - driver.features = LIRC_CAN_REC_MODE2; -+ driver.dev = &lirc_wpc8769l_platform_dev->dev; - driver.minor = lirc_register_driver(&driver); - if (driver.minor < 0) { - eprintk("lirc_register_driver failed!\n"); - rc = -EIO; -- goto exit_platform_exit; -+ goto exit_release_buffer; - } - - iprintk("Driver loaded.\n"); - - return 0; /* Everything OK. */ - -+exit_release_buffer: -+ lirc_buffer_free(&rbuf); -+ - exit_platform_exit: - lirc_wpc8769l_platform_exit(); - -@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init); - - static void __exit lirc_wpc8769l_module_exit(void) - { -- /* Unregister the platform driver and device. */ -- lirc_wpc8769l_platform_exit(); -- - /* Unregister the LIRC driver. */ - lirc_unregister_driver(driver.minor); - -+ /* Free the buffer. */ -+ lirc_buffer_free(&rbuf); -+ -+ /* Unregister the platform driver and device. */ -+ lirc_wpc8769l_platform_exit(); -+ - /* Release the second range. */ - if (baseport2) - release_region(baseport2, WPC8769L_IO_REGION_2_SIZE); --- -1.7.0.1 - diff --git a/abs/core/lirc/lircd-handle-large-config.patch b/abs/core/lirc/lircd-handle-large-config.patch deleted file mode 100644 index 85bc205..0000000 --- a/abs/core/lirc/lircd-handle-large-config.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001 -From: Jarod Wilson <jarod@redhat.com> -Date: Wed, 6 Apr 2011 11:04:12 -0400 -Subject: [PATCH] lircd: handle larger config files in write_socket better - -Pointed out by Michael Zanetti on list, irsend LIST has issues with long -config files, which didn't exist in maintainer mode, as we were using a -do while loop to make sure we spit out everything. Just use that loop -all the time. - -Signed-off-by: Jarod Wilson <jarod@redhat.com> ---- - daemons/lircd.c | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/daemons/lircd.c b/daemons/lircd.c -index 6c21a3a..ddcca05 100644 ---- a/daemons/lircd.c -+++ b/daemons/lircd.c -@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len) - int done, todo = len; - - while (todo) { --#ifdef SIM_REC - do { - done = write(fd, buf, todo); -- } -- while (done < 0 && errno == EAGAIN); --#else -- done = write(fd, buf, todo); --#endif -+ } while (done < 0 && errno == EAGAIN); -+ - if (done <= 0) - return (done); - buf += done; --- -1.7.0.1 - diff --git a/abs/core/lirc/lircm.service b/abs/core/lirc/lircm.service deleted file mode 100644 index c0b5e36..0000000 --- a/abs/core/lirc/lircm.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=LIRC Mouse -Requires=lirc.service -After=network.target lirc.service - -[Service] -Type=forking -ExecStart=/usr/sbin/lircmd - -[Install] -WantedBy=multi-user.target - diff --git a/abs/core/mesa-demos/PKGBUILD b/abs/core/mesa-demos/PKGBUILD index 310dc36..68d27a5 100644 --- a/abs/core/mesa-demos/PKGBUILD +++ b/abs/core/mesa-demos/PKGBUILD @@ -3,26 +3,27 @@ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname='mesa-demos' -pkgver=8.1.0 -pkgrel=1 +pkgver=8.2.0 +pkgrel=3 arch=('i686' 'x86_64') pkgdesc="Mesa demos and tools" url="http://mesa3d.sourceforge.net" license=('custom') -depends=('libgl' 'glew') +depends=('libgl' 'glew' 'freeglut') source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2" 'LICENSE') -sha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828' +sha256sums=('e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92' '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2') build() { - cd "${srcdir}/mesa-demos-${pkgver}" - ./configure --prefix=/usr + cd mesa-demos-${pkgver} + ./configure --prefix=/usr \ + --with-system-data-files=/usr/share/mesa-demos make } package() { - cd "${srcdir}/mesa-demos-${pkgver}" + cd mesa-demos-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos" install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/" diff --git a/abs/core/mesa/PKGBUILD b/abs/core/mesa/PKGBUILD index 1cd06e1..a94cdf6 100644 --- a/abs/core/mesa/PKGBUILD +++ b/abs/core/mesa/PKGBUILD @@ -3,27 +3,21 @@ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa -pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') -pkgver=10.1.1 -pkgrel=2 +pkgname=('opencl-mesa' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl') +pkgver=10.4.0 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' - 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd') + 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm' + 'systemd' 'libomxil-bellagio' 'libclc' 'clang') url="http://mesa3d.sourceforge.net" license=('custom') -source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 - LICENSE - workaround-for-robustness-and-reset-with-intel.patch) -md5sums=('1fde7ed079df7aeb9b6a744ca033de8d' - '5c65a0fe315dd347e09b1f2826a1df5a' - 'b6b744a948b0de9cd14a2a971b7472de') - -prepare () { - cd ${srcdir}/?esa-* - - # workaround for FS#39803 - https://bugs.freedesktop.org/show_bug.cgi?id=75723 - patch -Np1 -i ../workaround-for-robustness-and-reset-with-intel.patch -} +source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2{,.sig} +#source=(ftp://ftp.freedesktop.org/pub/mesa/10.3/MesaLib-${pkgver}.tar.bz2{,.sig} + LICENSE) +sha256sums=('98a7dff3a1a6708c79789de8b9a05d8042e867067f70e8f30387c15026233219' + 'SKIP' + '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2') build() { cd ${srcdir}/?esa-* @@ -36,25 +30,26 @@ build() { --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ --with-egl-platforms=x11,drm,wayland \ - --with-llvm-shared-libs \ + --enable-llvm-shared-libs \ --enable-egl \ - --disable-gallium-egl \ --enable-gbm \ - --enable-gallium-gbm \ --enable-gallium-llvm \ --enable-shared-glapi \ + --enable-glx \ --enable-glx-tls \ --enable-dri \ - --enable-glx \ --enable-osmesa \ --enable-gles1 \ --enable-gles2 \ --enable-texture-float \ --enable-xa \ --enable-vdpau \ - --enable-dri3 + --enable-omx \ + --enable-nine \ + --enable-opencl --enable-opencl-icd \ + --with-clang-libdir=/usr/lib + # --help - # --disable-gallium-egl : not well maintained/expose less bug, so prefer egl_dri2 (FS#40096) make @@ -63,75 +58,72 @@ build() { make DESTDIR=${srcdir}/fakeinstall install } -package_ati-dri() { - pkgdesc="Mesa drivers for AMD/ATI Radeon" - depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}") - conflicts=('xf86-video-ati<6.9.0-6') - - install -m755 -d ${pkgdir}/usr/lib/vdpau/ - mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_{r600,radeonsi}.* ${pkgdir}/usr/lib/vdpau/ - - install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri - mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ +package_opencl-mesa() { + pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" + depends=('expat' 'libdrm' 'elfutils' 'libxfixes' 'libxext' 'libcl' 'libclc' 'clang') + optdepends=('opencl-headers: headers necessary for OpenCL development') - install -m755 -d ${pkgdir}/usr/lib/gallium-pipe - mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r300,r600,radeonsi}* ${pkgdir}/usr/lib/gallium-pipe/ + install -m755 -d ${pkgdir}/etc + mv -v ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/ - install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/" -} - -package_intel-dri() { - pkgdesc="Mesa drivers for Intel" - depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}") - - install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri - mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ + install -m755 -d ${pkgdir}/usr/lib/gallium-pipe + mv -v ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/ + mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r600,radeonsi}.so ${pkgdir}/usr/lib/gallium-pipe/ - install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/" + install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/" } -package_nouveau-dri() { - pkgdesc="Mesa drivers for Nouveau" - depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}") - - install -m755 -d ${pkgdir}/usr/lib/vdpau/ - mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ +package_libva-mesa-driver() { + pkgdesc="VA-API implementation for gallium" + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils') - install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri - mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib/xorg/modules/dri/ - - install -m755 -d ${pkgdir}/usr/lib/gallium-pipe - mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/ - - install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/" + install -m755 -d ${pkgdir}/usr/lib + mv -v ${srcdir}/fakeinstall/usr/lib/dri ${pkgdir}/usr/lib + + install -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver/" } -package_svga-dri() { - pkgdesc="Gallium3D VMware guest GL driver" - depends=('libdrm' 'expat' 'llvm-libs') - - install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri - mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ +package_mesa-vdpau() { + pkgdesc="Mesa VDPAU drivers" + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils') - install -m755 -d ${pkgdir}/usr/lib/gallium-pipe - mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_vmwgfx* ${pkgdir}/usr/lib/gallium-pipe/ - - install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/" + install -m755 -d ${pkgdir}/usr/lib + mv -v ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/" } package_mesa() { pkgdesc="an open-source implementation of the OpenGL specification" - depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' 'llvm-libs') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') - conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') - replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') - - mv -v ${srcdir}/fakeinstall/* ${pkgdir} + depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' + 'libomxil-bellagio' 'expat' 'libtxc_dxtn' 'llvm-libs') + optdepends=('opengl-man-pages: for the OpenGL API man pages' + 'mesa-vdpau: for accelerated video playback' + 'libva-mesa-driver: for accelerated video playback') + provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' + 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') + conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' + 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') + replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' + 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') + + install -m755 -d ${pkgdir}/etc + mv -v ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc + + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri + # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast + mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri + + mv -v ${srcdir}/fakeinstall/usr/lib/bellagio ${pkgdir}/usr/lib + mv -v ${srcdir}/fakeinstall/usr/lib/d3d ${pkgdir}/usr/lib + mv -v ${srcdir}/fakeinstall/usr/lib/*.so* ${pkgdir}/usr/lib/ + + mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr + mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/ + install -m755 -d ${pkgdir}/usr/lib/mesa # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ? mv -v ${pkgdir}/usr/lib/libGL.so* ${pkgdir}/usr/lib/mesa/ @@ -144,8 +136,8 @@ package_mesa() { package_mesa-libgl() { pkgdesc="Mesa 3-D graphics library" - depends=("mesa=${pkgver}") - provides=("libgl=${pkgver}") + depends=('mesa') + provides=('libgl') replaces=('libgl') # See FS#26284 diff --git a/abs/core/mjpegtools/PKGBUILD b/abs/core/mjpegtools/PKGBUILD index 3615c32..bd56794 100644 --- a/abs/core/mjpegtools/PKGBUILD +++ b/abs/core/mjpegtools/PKGBUILD @@ -1,36 +1,35 @@ -# $Id: PKGBUILD 148854 2012-02-05 11:52:58Z ibiru $ +# $Id$ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Maintainer: Roberto Carvajal <roberto@archlinux.org> pkgname=mjpegtools -pkgver=2.0.0 -pkgrel=1 +pkgver=2.1.0 +pkgrel=2 pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL') url="http://mjpeg.sourceforge.net/" depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv') makedepends=('gtk2' 'v4l-utils') optdepends=('gtk2: glav GUI') -options=('!makeflags' '!libtool') +options=('!makeflags') install=mjpegtools.install -source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz - mjpegtools-v4l-2.6.38.patch gcc_3.7.patch) +source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz) +md5sums=('57bf5dd78976ca9bac972a6511b236f3') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch" - patch -Np1 -i "${srcdir}/gcc_3.7.patch" +prepare() { + cd ${pkgname}-${pkgver} sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --enable-largefile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/" } -md5sums=('903e1e3b967eebcc5fe5626d7517dc46' - '44006d6f844017fe57aa123aa43f4508' - '7c9b3d4a1f3a10e3263a6a110b0f55cc') diff --git a/abs/core/mjpegtools/__changelog b/abs/core/mjpegtools/__changelog deleted file mode 100644 index 8244652..0000000 --- a/abs/core/mjpegtools/__changelog +++ /dev/null @@ -1,2 +0,0 @@ -added gcc 3.7.patch -https://bugs.gentoo.org/show_bug.cgi?id=409197 diff --git a/abs/core/mjpegtools/gcc_3.7.patch b/abs/core/mjpegtools/gcc_3.7.patch deleted file mode 100644 index 050b33f..0000000 --- a/abs/core/mjpegtools/gcc_3.7.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/y4mdenoise/MotionSearcher.hh -+++ b/y4mdenoise/MotionSearcher.hh -@@ -2196,7 +2196,7 @@ - { - // This region is too small to be bothered with. - // Just get rid of it. -- DeleteRegion (a_pRegion); -+ this->DeleteRegion (a_pRegion); - } - else - { diff --git a/abs/core/mjpegtools/mjpegtools-v4l-2.6.38.patch b/abs/core/mjpegtools/mjpegtools-v4l-2.6.38.patch deleted file mode 100644 index 6adeb92..0000000 --- a/abs/core/mjpegtools/mjpegtools-v4l-2.6.38.patch +++ /dev/null @@ -1,100 +0,0 @@ -Index: lavtools/lavvideo.c -=================================================================== ---- lavtools/lavvideo.c.orig -+++ lavtools/lavvideo.c -@@ -63,7 +63,7 @@ Copyright by Gernot Ziegler. - * errors here, check your linux/time.h && sys/time.h header setup. - */ - #define _LINUX_TIME_H --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - - #include <videodev_mjpeg.h> - #include <frequencies.h> -Index: lavtools/liblavplay.c -=================================================================== ---- lavtools/liblavplay.c.orig -+++ lavtools/liblavplay.c -@@ -68,7 +68,8 @@ - * errors here, check your linux/time.h && sys/time.h header setup. - */ - #define _LINUX_TIME_H --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> -+#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ - #else - #define VIDEO_MODE_PAL 0 - #define VIDEO_MODE_NTSC 1 -Index: lavtools/liblavrec.c -=================================================================== ---- lavtools/liblavrec.c.orig -+++ lavtools/liblavrec.c -@@ -63,7 +63,8 @@ - * errors here, check your linux/time.h && sys/time.h header setup. - */ - #define _LINUX_TIME_H --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> -+#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ - #ifdef HAVE_SYS_SOUNDCARD_H - #include <sys/soundcard.h> - #endif -Index: lavtools/testrec.c -=================================================================== ---- lavtools/testrec.c.orig -+++ lavtools/testrec.c -@@ -89,7 +89,7 @@ - * errors here, check your linux/time.h && sys/time.h header setup. - */ - #define _LINUX_TIME_H --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - #include <linux/soundcard.h> - - /* These are explicit prototypes for the compiler, to prepare separation of audiolib.c */ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -164,7 +164,7 @@ AC_ARG_WITH([v4l], AC_HELP_STRING([--wit - AS_IF([test "x$with_v4l" != "xno"], [ - case $host in - *-*-linux*) -- AC_CHECK_HEADER(linux/videodev.h, -+ AC_CHECK_HEADER(libv4l1-videodev.h, - [have_video4linux=true - AC_DEFINE(HAVE_V4L, 1, - [Building for Linux - using the video4linux API])], []) -@@ -173,7 +173,7 @@ esac]) - - AS_IF([test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"], - [have_video4linux=false -- AC_MSG_WARN([videodev.h not found - please install the linux kernel headers programms needing v4l disabled])]) -+ AC_MSG_WARN([libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled])]) - AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue) - - dnl ********************************************************************* -Index: configure -=================================================================== ---- configure.orig -+++ configure -@@ -16392,7 +16392,7 @@ if test "x$with_v4l" != "xno"; then : - - case $host in - *-*-linux*) -- ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default" -+ ac_fn_c_check_header_mongrel "$LINENO" "libv4l1-videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default" - if test "x$ac_cv_header_linux_videodev_h" = xyes; then : - have_video4linux=true - -@@ -16407,8 +16407,8 @@ fi - - if test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"; then : - have_video4linux=false -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5 --$as_echo "$as_me: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5 -+$as_echo "$as_me: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;} - fi - if test x$have_video4linux = xtrue; then - HAVE_V4L_TRUE= diff --git a/abs/core/mkinitcpio-busybox/PKGBUILD b/abs/core/mkinitcpio-busybox/PKGBUILD index f85beb6..023f630 100644 --- a/abs/core/mkinitcpio-busybox/PKGBUILD +++ b/abs/core/mkinitcpio-busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167188 2012-09-27 01:16:40Z dreisner $ +# $Id$ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-busybox -pkgver=1.20.2 -pkgrel=1 +pkgver=1.21.1 +pkgrel=2 pkgdesc="base initramfs tools" arch=('i686' 'x86_64') url="http://www.busybox.net/" @@ -14,21 +14,22 @@ options=('!buildflags') source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" 'glibc-2.16.patch' 'config') -sha256sums=('eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882' +sha256sums=('cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303' 'fb5b6e2a0de4db5401322e5c2474ad8ce6a58615dad45b7109cfe045baf2c88d' - 'd8064ed6ec21868e4afe057445e2d852b353abd595132cb1ca3ba345988772f0') + '240c9ab805fbf5eb3347b2a42f62d840f160c4999d0f172b28ba50dadad09ada') -build() { - cd "$srcdir/busybox-$pkgver" +prepare() { + cd "busybox-$pkgver" - local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" + local safeflags="-march=${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" - sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ - "$srcdir/config" > .config + sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="'"$safeflags"'"|' "$srcdir/config" >.config - patch -Np1 < "$srcdir/glibc-2.16.patch" + patch -Np1 <"$srcdir/glibc-2.16.patch" +} - make +build() { + make -C "busybox-$pkgver" } package() { diff --git a/abs/core/mkinitcpio-busybox/config b/abs/core/mkinitcpio-busybox/config index ed84c53..ad36538 100644 --- a/abs/core/mkinitcpio-busybox/config +++ b/abs/core/mkinitcpio-busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.20.0 -# Sun May 13 11:33:40 2012 +# Busybox version: 1.21.0 +# Tue Jan 22 09:04:09 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_UTMP is not set # CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_PIDFILE is not set +CONFIG_PID_FILE_PATH="" CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set @@ -96,6 +97,7 @@ CONFIG_PREFIX="./_install" # CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=0 +CONFIG_SHA3_SMALL=0 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set # CONFIG_FEATURE_USE_TERMIOS is not set @@ -263,6 +265,7 @@ CONFIG_SEQ=y CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y CONFIG_SHA512SUM=y +# CONFIG_SHA3SUM is not set CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -274,7 +277,7 @@ CONFIG_STAT=y CONFIG_FEATURE_STAT_FORMAT=y # CONFIG_STTY is not set # CONFIG_SUM is not set -# CONFIG_SYNC is not set +CONFIG_SYNC=y CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum, sha256sum, sha512sum +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y @@ -375,7 +378,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_AWK=y # CONFIG_FEATURE_AWK_LIBM is not set # CONFIG_CMP is not set @@ -612,9 +614,11 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_REISERFS is not set # CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_EXFAT is not set # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set # CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NILFS is not set # CONFIG_FEATURE_VOLUMEID_NTFS is not set # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set # CONFIG_FEATURE_VOLUMEID_UDF is not set @@ -622,6 +626,7 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set # CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set # CONFIG_FEATURE_VOLUMEID_SYSV is not set # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set @@ -701,7 +706,7 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_FEATURE_MAKEDEVS_TABLE is not set # CONFIG_MAN is not set # CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set +CONFIG_MOUNTPOINT=y # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set # CONFIG_READAHEAD is not set @@ -894,6 +899,13 @@ CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_PSTREE is not set # CONFIG_PWDX is not set # CONFIG_SMEMCAP is not set +# CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set +# CONFIG_FEATURE_TOP_SMP_CPU is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set +# CONFIG_FEATURE_TOPMEM is not set CONFIG_UPTIME=y # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_FREE=y @@ -914,13 +926,6 @@ CONFIG_FEATURE_PS_LONG=y # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set # CONFIG_RENICE is not set # CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set # CONFIG_FEATURE_SHOW_THREADS is not set # CONFIG_WATCH is not set @@ -1015,6 +1020,7 @@ CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 # CONFIG_LOGREAD is not set # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_FEATURE_KMSG_SYSLOG is not set # CONFIG_KLOGD is not set # CONFIG_FEATURE_KLOGD_KLOGCTL is not set # CONFIG_LOGGER is not set diff --git a/abs/core/mkinitcpio/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch b/abs/core/mkinitcpio/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch deleted file mode 100644 index 042a0b9..0000000 --- a/abs/core/mkinitcpio/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7cf7ac4eb2c29a2b1aa748dae7658da5fbbc3a18 Mon Sep 17 00:00:00 2001 -From: Brian Parsons <brian@pmex.com> -Date: Mon, 11 Jun 2012 17:30:10 -0400 -Subject: [PATCH 1/2] Update module filter to be aware of hyphens in the - MODULES array - -[dave: fix whitespace and re-add needed quoting] - -Signed-off-by: Dave Reisner <dreisner@archlinux.org> ---- - functions | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/functions b/functions -index 4a62d8e..e9fb81a 100644 ---- a/functions -+++ b/functions -@@ -590,7 +590,7 @@ write_image_config() { - . "$CONFIG" - - # sanitize of any extra whitespace -- read -ra modules <<< "$MODULES" -+ read -ra modules <<<"${MODULES//-/_}" - for mod in "${modules[@]}"; do - in_array "${mod%\?}" "${ADDED_MODULES[@]}" || continue - add+=("${mod%\?}") --- -1.7.10.4 - diff --git a/abs/core/mkinitcpio/0001-avoid-compound-conditional-leading-to-spurious-error.patch b/abs/core/mkinitcpio/0001-avoid-compound-conditional-leading-to-spurious-error.patch new file mode 100644 index 0000000..c1371fd --- /dev/null +++ b/abs/core/mkinitcpio/0001-avoid-compound-conditional-leading-to-spurious-error.patch @@ -0,0 +1,39 @@ +From ea4c4154205372154457c794513ae46b61ea4e4c Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Mon, 4 Aug 2014 08:31:37 -0400 +Subject: [mkinitcpio] [PATCH] avoid compound conditional leading to spurious + "errors" + +As seen: + +https://bbs.archlinux.org/viewtopic.php?id=185204 +https://bbs.archlinux.org/viewtopic.php?id=185265 +--- + functions | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/functions b/functions +index 20bbffe..362d07b 100644 +--- a/functions ++++ b/functions +@@ -423,11 +423,15 @@ add_full_dir() { + + for f in "$1"/*; do + if [[ -L $f ]]; then +- [[ $f = $filter ]] && add_symlink "$f" "$(readlink "$f")" ++ if [[ $f = $filter ]]; then ++ add_symlink "$f" "$(readlink "$f")" ++ fi + elif [[ -d $f ]]; then + add_full_dir "$f" + elif [[ -f $f ]]; then +- [[ $f = $filter ]] && add_file "$f" ++ if [[ $f = $filter ]]; then ++ add_file "$f" ++ fi + fi + done + fi +-- +2.1.0 + diff --git a/abs/core/mkinitcpio/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch b/abs/core/mkinitcpio/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch deleted file mode 100644 index 7a1aba9..0000000 --- a/abs/core/mkinitcpio/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c257b0d7b4dd1c3f9b63c6a27b68a27bc246acea Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Tue, 12 Jun 2012 19:18:18 -0400 -Subject: [PATCH 2/2] shutdown: don't alert udev on disable VGs - -Fixes FS#30271. - -Signed-off-by: Dave Reisner <dreisner@archlinux.org> ---- - shutdown | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/shutdown b/shutdown -index ce7de23..fd88105 100644 ---- a/shutdown -+++ b/shutdown -@@ -25,7 +25,7 @@ stop_device() { - read devname <"$1/dm/name" - lvm lvdisplay -c "/dev/mapper/$devname" | { - IFS=: read _ vgname _ -- lvm vgchange -an "$vgname" -+ lvm vgchange --noudevsync -an "$vgname" - } - ;; - raid*) --- -1.7.10.4 - diff --git a/abs/core/mkinitcpio/PKGBUILD b/abs/core/mkinitcpio/PKGBUILD index e4415be..ad19b84 100644 --- a/abs/core/mkinitcpio/PKGBUILD +++ b/abs/core/mkinitcpio/PKGBUILD @@ -1,30 +1,38 @@ -# $Id: PKGBUILD 171244 2012-11-16 22:09:31Z dreisner $ +# $Id$ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio -pkgver=0.11.2 -pkgrel=1 +pkgver=18 +pkgrel=2 pkgdesc="Modular initramfs image creation utility" arch=('any') -url="http://www.archlinux.org/" +url="https://projects.archlinux.org/mkinitcpio.git/" license=('GPL') -depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.21' 'libarchive' 'coreutils' - 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'file' 'gzip' 'systemd-tools') +depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' + 'coreutils' 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip' 'systemd') optdepends=('xz: Use lzma or xz compression for the initramfs image' 'bzip2: Use bzip2 compression for the initramfs image' 'lzop: Use lzo compression for the initramfs image' + 'lz4: Use lz4 compression for the initramfs image' 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') backup=('etc/mkinitcpio.conf') -source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} "mkinitcpio.patch") +source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + '0001-avoid-compound-conditional-leading-to-spurious-error.patch' + 'mkinitcpio.patch') install=mkinitcpio.install +prepare() { + patch -d "$pkgname-$pkgver" -Np1 <0001-avoid-compound-conditional-leading-to-spurious-error.patch +} + package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install cd $pkgdir/etc patch -Np0 < $srcdir/mkinitcpio.patch || exit 1 -} -md5sums=('cc437770a2f1a6ae63e14ac3c86defcf' - '5521e600fafa99522deb4f112f2e57cb' - 'fa758c290731ab535c8d6995f0ff5ef0') +} +md5sums=('46b83483ac1444aa05a8d09e3bbc87b5' + 'SKIP' + 'd8c693935bd8f793cc410b78b3bfaf56' + '031fd7d3013c26175ae7421781893feb') diff --git a/abs/core/mkinitcpio/__changelog b/abs/core/mkinitcpio/__changelog index a2eacb9..609b54f 100644 --- a/abs/core/mkinitcpio/__changelog +++ b/abs/core/mkinitcpio/__changelog @@ -1,2 +1 @@ -modified mkinitcpio.patch to move fsck earlier in the hook -this is needed so that drives other then / can mount during boot +mkinitcpio.patch: update for new hooks diff --git a/abs/core/mkinitcpio/mkinitcpio.install b/abs/core/mkinitcpio/mkinitcpio.install index d8bbfdb..8571ee7 100644 --- a/abs/core/mkinitcpio/mkinitcpio.install +++ b/abs/core/mkinitcpio/mkinitcpio.install @@ -5,4 +5,11 @@ post_upgrade() { printf '==> If your /usr is on a separate partition, you must add the "usr" hook\n' printf ' to /etc/mkinitcpio.conf and regenerate your images before rebooting\n' fi + + if [ "$(vercmp 0.12.0 "$2")" -eq 1 ]; then + printf '==> The "block" hook has replaced several hooks:\n' + printf ' fw, sata, pata, scsi, virtio, mmc, usb\n' + printf ' Replace any and all of these in /etc/mkinitcpio.conf with a single\n' + printf ' instance of the "block" hook\n' + fi } diff --git a/abs/core/mkinitcpio/mkinitcpio.patch b/abs/core/mkinitcpio/mkinitcpio.patch index ffc21fc..7bd711a 100644 --- a/abs/core/mkinitcpio/mkinitcpio.patch +++ b/abs/core/mkinitcpio/mkinitcpio.patch @@ -1,20 +1,20 @@ ---- mkinitcpio.conf.orig 2012-08-22 23:26:28.952203845 +0000 -+++ mkinitcpio.conf 2012-08-22 23:25:44.408871852 +0000 +--- mkinitcpio.conf.orig 2015-01-02 21:13:27.682427426 +0000 ++++ mkinitcpio.conf 2015-01-02 21:15:11.195818945 +0000 @@ -4,7 +4,7 @@ # run. Advanced users may wish to specify all system modules # in this array. For instance: # MODULES="piix ide_disk reiserfs" -MODULES="" +MODULES="nfs reiserfs xfs jfs ext4" - + # BINARIES # This setting includes any additional binaries a given user may -@@ -56,7 +56,7 @@ +@@ -49,7 +49,7 @@ # ## NOTE: If you have /usr on a separate partition, you MUST include the # usr, fsck and shutdown hooks. --HOOKS="base udev autodetect pata scsi sata filesystems usbinput fsck" -+HOOKS="base udev fsck autodetect pata scsi sata filesystems usb usbinput resume v86d plymouth" - +-HOOKS="base udev autodetect modconf block filesystems keyboard fsck" ++HOOKS="base udev autodetect modconf block filesystems keyboard fsck v86d plymouth" + # COMPRESSION # Use this to compress the initramfs image. By default, gzip compression diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD index 01b69c4..fbf15d9 100644 --- a/abs/core/mplayer/PKGBUILD +++ b/abs/core/mplayer/PKGBUILD @@ -5,42 +5,48 @@ pkgbase=mplayer pkgname=('mplayer' 'mencoder') -pkgver=37051 -pkgrel=3 +pkgver=37224 +pkgrel=5 arch=('i686' 'x86_64') makedepends=( 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'libcaca' - 'x264' 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' + 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' - 'libcdio-paranoia' 'opus' + 'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gsm' ) license=('GPL') url='http://www.mplayerhq.hu/' options=('!buildflags' '!emptydirs') source=($pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver - http://ffmpeg.org/releases/ffmpeg-2.2.tar.bz2 + http://ffmpeg.org/releases/ffmpeg-2.2.10.tar.bz2 mplayer.desktop cdio-includes.patch - include-samba-4.0.patch) + include-samba-4.0.patch + giflib51.patch + revert-icl-fixes.patch) md5sums=('SKIP' - '744febca199548c9393b1f1ed05ccdd8' + 'f40a829f5075c8ee901e5dbc6d40c209' '62f44a58f072b2b1a3c3d3e4976d64b3' '7b5be7191aafbea64218dc4916343bbc' - '868a92bdef148df7f38bfa992b26ce9d') + '868a92bdef148df7f38bfa992b26ce9d' + '14461fb94b7aa5dda091ba4f737df2d9' + '3579402002b7302fdf2d146639333efd') -#pkgver() { -# cd $pkgbase-$pkgver -# svnversion -#} +pkgver() { + cd $pkgbase-$pkgver + svnversion +} prepare() { cd $pkgbase-$pkgver - mv ../ffmpeg-2.2 ./ffmpeg + mv ../ffmpeg-2.2.10 ./ffmpeg patch -p0 -i ../cdio-includes.patch patch -p1 -i ../include-samba-4.0.patch + patch -Np0 -i ../giflib51.patch + patch -Np0 -i ../revert-icl-fixes.patch ./version.sh } @@ -78,11 +84,12 @@ package_mplayer() { backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') depends=( 'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx' - 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' + 'lirc-utils' 'libx264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' 'libxinerama' 'libvdpau' 'smbclient' 'xvidcore' 'opencore-amr' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' - 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' + 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' 'rtmpdump' + 'gsm' ) cd $pkgbase-$pkgver @@ -101,14 +108,13 @@ package_mplayer() { package_mencoder() { pkgdesc='Free command line video decoding, encoding and filtering tool' depends=( - 'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' + 'enca' 'a52dec' 'libvpx' 'libx264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' - 'libvorbis' 'opus' + 'libvorbis' 'opus' 'rtmpdump' 'gsm' ) make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man - #find "$pkgdir"/usr/share/man -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} + - rm -rf $pkgdir/usr/share/man + find "$pkgdir"/usr/share/man -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} + } diff --git a/abs/core/mplayer/__changelog b/abs/core/mplayer/__changelog index 46c977a..c723332 100644 --- a/abs/core/mplayer/__changelog +++ b/abs/core/mplayer/__changelog @@ -1,3 +1,2 @@ PKGBUILD - remove dep libpulse PKGBUILD - remove dep jack -PKGBUILD - remove man pages from mencoder diff --git a/abs/core/mplayer/giflib51.patch b/abs/core/mplayer/giflib51.patch new file mode 100644 index 0000000..e884b39 --- /dev/null +++ b/abs/core/mplayer/giflib51.patch @@ -0,0 +1,24 @@ +--- libvo/vo_gif89a.c.orig 2014-06-11 10:06:29.243216331 +0000 ++++ libvo/vo_gif89a.c 2014-06-11 10:08:37.346078847 +0000 +@@ -75,6 +75,9 @@ + #define MakeMapObject GifMakeMapObject + #define FreeMapObject GifFreeMapObject + #define QuantizeBuffer GifQuantizeBuffer ++#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1 ++#define EGifCloseFile(a) EGifCloseFile(a, NULL) ++#endif + #endif + + // how many frames per second we are aiming for during output. +--- libmpdemux/demux_gif.c.orig 2014-06-11 10:46:48.120883788 +0000 ++++ libmpdemux/demux_gif.c 2014-06-11 10:47:28.290732272 +0000 +@@ -50,6 +50,9 @@ + #define DGifOpenFileHandle(a) DGifOpenFileHandle(a, NULL) + #define GifError() (gif ? gif->Error : 0) + #define GifErrorString() GifErrorString(gif->Error) ++#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1 ++#define DGifCloseFile(a) DGifCloseFile(a, NULL) ++#endif + #endif + + /* >= 4.2 prior GIFLIB did not have MAJOR/MINOR defines */ diff --git a/abs/core/mplayer/revert-icl-fixes.patch b/abs/core/mplayer/revert-icl-fixes.patch new file mode 100644 index 0000000..e5f049f --- /dev/null +++ b/abs/core/mplayer/revert-icl-fixes.patch @@ -0,0 +1,66 @@ +Index: libmpcodecs/vf_fspp.c +=================================================================== +--- libmpcodecs/vf_fspp.c (revision 37183) ++++ libmpcodecs/vf_fspp.c (revision 37181) +@@ -1598,10 +1598,6 @@ + + : "+S"(data), "+D"(output), "+c"(cnt), "=o"(temps) + : "d"(thr_adr) +- NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,MM_2,MM_FIX_1_414213562_A,MM_FIX_1_414213562,MM_FIX_0_382683433, +- ff_MM_FIX_0_541196100,MM_FIX_1_306562965,MM_FIX_0_847759065) +- NAMED_CONSTRAINTS_ADD(MM_FIX_0_566454497,MM_FIX_0_198912367,MM_FIX_2_613125930,MM_FIX_1_847759065, +- MM_FIX_1_082392200) + : "%"REG_a + ); + } +@@ -1871,8 +1867,6 @@ + + : "+S"(workspace), "+D"(output_adr), "+c"(cnt), "=o"(temps) + : "a"(output_stride*sizeof(short)) +- NAMED_CONSTRAINTS_ADD(MM_FIX_1_414213562_A,MM_FIX_2_613125930,MM_FIX_1_847759065,MM_FIX_1_082392200, +- MM_FIX_1_414213562,MM_DESCALE_RND) + : "%"REG_d + ); + } +@@ -1980,10 +1974,10 @@ + "movd (%%"REG_S",%%"REG_a",2), %%mm3 \n\t" //5 + "paddw %%mm4, %%mm1 \n\t" + +- "movq %%mm5, %3 \n\t" //t7 ++ "movq %%mm5, 0*8+%3 \n\t" //t7 + "punpcklbw %%mm7, %%mm3 \n\t" + +- "movq %%mm6, %4 \n\t" //t6 ++ "movq %%mm6, 1*8+%3 \n\t" //t6 + "movq %%mm2, %%mm4 \n\t" + + "movd (%%"REG_S"), %%mm5 \n\t" //3 +@@ -2029,7 +2023,7 @@ + "psubw %%mm1, %%mm5 \n\t" //d1 + "movq %%mm0, %%mm6 \n\t" + +- "movq %4, %%mm1 \n\t" ++ "movq 1*8+%3, %%mm1 \n\t" + "punpcklwd %%mm5, %%mm0 \n\t" + + "punpckhwd %%mm5, %%mm6 \n\t" +@@ -2053,7 +2047,7 @@ + "movq %%mm7, "DCTSIZE_S"*3*2(%%"REG_D") \n\t" + "psllw $2, %%mm3 \n\t" //t10 + +- "movq %3, %%mm2 \n\t" ++ "movq 0*8+%3, %%mm2 \n\t" + "psllw $2, %%mm4 \n\t" //t11 + + "pmulhw "MANGLE(MM_FIX_0_707106781)", %%mm4 \n\t" //z3 +@@ -2116,9 +2110,8 @@ + "dec %%"REG_c" \n\t" + "jnz 6b \n\t" + +- : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps), "=o"(temps[1]) ++ : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps) + : "a"(line_size) +- NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,ff_MM_FIX_0_541196100,MM_FIX_0_382683433,MM_FIX_1_306562965) + : "%"REG_d); + } + diff --git a/abs/core/mysql/PKGBUILD b/abs/core/mysql/PKGBUILD index 17850bd..0c6747e 100755..100644 --- a/abs/core/mysql/PKGBUILD +++ b/abs/core/mysql/PKGBUILD @@ -1,27 +1,40 @@ -# $Id: PKGBUILD 167246 2012-09-29 09:32:53Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Maintainer: Muflone http://www.muflone.com/contacts/english/ +# Contributor: Rustam Tsurik <rustam.tsurik@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +pkgname=('mysql' 'libmysqlclient' 'mysql-clients') pkgbase=mysql -pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.28 -pkgrel=2 +pkgver=5.6.23 +pkgrel=3 +pkgdesc="Fast SQL database server, community edition" arch=('i686' 'x86_64') +makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc') license=('GPL') url="https://www.mysql.com/products/community/" -makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') -source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" - 'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service') +source=("https://dev.mysql.com/get/Downloads/MySQL-5.6/${pkgbase}-${pkgver}.tar.gz" + "mysqld-post.sh" + "mysqld-tmpfile.conf" + "mysqld.service" + "my.cnf" + "mysqld.rc" + "mysql-srv_buf_size.patch") + +prepare() { + cd "${pkgbase}-${pkgver}" + patch -p0 -i "../mysql-srv_buf_size.patch" +} build() { + rm -rf build mkdir build cd build - # CFLAGS/CXXFLAGS as suggested upstream - - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ + cmake "../${pkgbase}-${pkgver}" \ + -DCMAKE_AR=/usr/bin/gcc-ar \ + -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \ + -DBUILD_CONFIG=mysql_release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ -DMYSQL_DATADIR=/var/lib/mysql \ @@ -39,95 +52,127 @@ build() { -DINSTALL_MYSQLSHAREDIR=share/mysql \ -DINSTALL_DOCDIR=share/mysql/docs \ -DINSTALL_SHAREDIR=share/mysql \ - -DWITH_READLINE=ON \ -DWITH_ZLIB=system \ -DWITH_SSL=system \ -DWITH_LIBWRAP=OFF \ - -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ + -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \ -DWITH_EXTRA_CHARSETS=complex \ -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=1 \ - -DWITH_PARTITION_STORAGE_ENGINE=1 \ - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ - -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ - -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ - -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \ - -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" - + -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ + -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ + -DWITH_INNOBASE_STORAGE_ENGINE=ON \ + -DWITH_PARTITION_STORAGE_ENGINE=ON \ + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=ON \ + -DWITHOUT_FEDERATED_STORAGE_ENGINE=ON \ + -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \ + -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \ + -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now" make } package_libmysqlclient(){ pkgdesc="MySQL client libraries" depends=('openssl') + conflicts=('libmariadbclient') + provides=("libmariadbclient=${pkgver}") cd build - for dir in include libmysql libmysqld libservices; do - make -C ${dir} DESTDIR="${pkgdir}" install + for dir in include libmysql libmysqld libservices + do + make -C "${dir}" DESTDIR="${pkgdir}" install done - install -d "${pkgdir}"/usr/bin - install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/ - install -d "${pkgdir}"/usr/share/man/man1 - for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + install -m 755 -d "${pkgdir}/usr/bin" + install -m 755 scripts/mysql_config "${pkgdir}/usr/bin/" + install -m 755 -d "${pkgdir}/usr/share/man/man1" + for man in mysql_config mysql_client_test_embedded mysqltest_embedded + do + install -m 644 "${srcdir}/${pkgbase}-${pkgver}/man/${man}.1" \ + "${pkgdir}/usr/share/man/man1/${man}.1" done } package_mysql-clients(){ pkgdesc="MySQL client tools" - depends=('libmysqlclient') + depends=('libmysqlclient' 'jemalloc') + conflicts=('mariadb-clients') + provides=("mariadb-clients=${pkgver}") cd build - make -C client DESTDIR="${pkgdir}" install + make -C "client" DESTDIR="${pkgdir}" install # install man pages - install -d "${pkgdir}"/usr/share/man/man1 - for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + install -d "${pkgdir}/usr/share/man/man1" + for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap + do + install -m644 "${srcdir}/${pkgbase}-${pkgver}/man/${man}.1" \ + "${pkgdir}/usr/share/man/man1/${man}.1" done # provided by mysql - rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest} + rm "${pkgdir}/usr/bin/mysql_plugin" + rm "${pkgdir}/usr/bin/mysql_upgrade" + rm "${pkgdir}/usr/bin/mysql_config_editor" + rm "${pkgdir}/usr/bin/mysqlbinlog" + rm "${pkgdir}/usr/bin/mysqltest" } package_mysql(){ - pkgdesc="A fast SQL database server" + pkgdesc="Fast SQL database server, community edition" backup=('etc/mysql/my.cnf') - install=mysql.install - depends=('mysql-clients' 'systemd-tools') + install="${pkgbase}.install" + depends=('mysql-clients' 'libaio') + conflicts=('mariadb') + provides=("mariadb=${pkgver}") options=('emptydirs') cd build make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf - install -Dm755 "${srcdir}"/mysqld.rc "${pkgdir}"/etc/rc.d/mysqld - install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post - install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf - install -d "${pkgdir}"/usr/lib/systemd/system - install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/ + install -m 644 -D "${srcdir}/my.cnf" "${pkgdir}/etc/mysql/my.cnf" + install -m 755 -D "${srcdir}"/mysqld.rc "${pkgdir}"/etc/rc.d/mysqld + install -m 755 -D "${srcdir}/mysqld-post.sh" "${pkgdir}/usr/bin/mysqld-post" + install -m 644 -D "${srcdir}/mysqld-tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/mysqld.conf" + install -m 755 -d "${pkgdir}/usr/lib/systemd/system" + install -m 644 -D "${srcdir}/mysqld.service" "${pkgdir}/usr/lib/systemd/system/" # provided by libmysqlclient - rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} + rm "${pkgdir}/usr/bin/mysql_config" + rm "${pkgdir}/usr/bin/mysql_client_test_embedded" + rm "${pkgdir}/usr/bin/mysqltest_embedded" rm "${pkgdir}"/usr/lib/libmysql* - rm -r "${pkgdir}"/usr/include/ - rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 + rm -r "${pkgdir}/usr/include/" + rm "${pkgdir}/usr/share/man/man1/mysql_config.1" + rm "${pkgdir}/usr/share/man/man1/mysql_client_test_embedded.1" + rm "${pkgdir}/usr/share/man/man1/mysqltest_embedded.1" # provided by mysql-clients - rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} - rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 + rm "${pkgdir}/usr/bin/mysql" + rm "${pkgdir}/usr/bin/mysqladmin" + rm "${pkgdir}/usr/bin/mysqlcheck" + rm "${pkgdir}/usr/bin/mysqldump" + rm "${pkgdir}/usr/bin/mysqlimport" + rm "${pkgdir}/usr/bin/mysqlshow" + rm "${pkgdir}/usr/bin/mysqlslap" + rm "${pkgdir}/usr/share/man/man1/mysql.1" + rm "${pkgdir}/usr/share/man/man1/mysqladmin.1" + rm "${pkgdir}/usr/share/man/man1/mysqlcheck.1" + rm "${pkgdir}/usr/share/man/man1/mysqldump.1" + rm "${pkgdir}/usr/share/man/man1/mysqlimport.1" + rm "${pkgdir}/usr/share/man/man1/mysqlshow.1" + rm "${pkgdir}/usr/share/man/man1/mysqlslap.1" # not needed - rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench} - rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 - - install -dm700 "${pkgdir}"/var/lib/mysql + rm -r "${pkgdir}/usr/data" + rm -r "${pkgdir}/usr/mysql-test" + rm -r "${pkgdir}/usr/sql-bench" + rm "${pkgdir}/usr/share/man/man1/mysql-test-run.pl.1" } -md5sums=('da8ddb3d00e6e159153d2444360f52a8' - 'e7eb2faeab755cbb2fe03542bf328da9' - 'e0f0c53cb6e3cead8896fa1f0c902789' - '6ea6ceb360d09a774e87335ee098ddd5' + +md5sums=('60344f26eae136a267a0277407926e79' + 'b79e65a5aa536e6b5bc60988eb0b78a2' '2fa6e456964d4ff5e6d4f9ff0126aed6' - 'a0e1460c276a50a9666c331de83271f2') + '81b62df0f569935109c1b107dfe9f9fa' + '75121ffbbd47367c27ae0448f6282b57' + 'e7eb2faeab755cbb2fe03542bf328da9' + 'f2b34ac2954bb56c4abf08c66a7f840e') diff --git a/abs/core/mysql/__changelog b/abs/core/mysql/__changelog index ec41d21..3c060d4 100644 --- a/abs/core/mysql/__changelog +++ b/abs/core/mysql/__changelog @@ -1,2 +1,6 @@ -data dir /data/srv/mysql -removed binary logging +PKGBUILD: copy my.cnf to /etc/mysql/ +my.cnf: data dir /data/srv/mysql +my.cnf: removed binary logging +mysqld.rc: this is needed for installing db in chroot +mysql.install: change default datadir to /data/srv/mysql +mysql.install: run mysql_install_db even if datadir already exists; needed for install diff --git a/abs/core/mysql/my.cnf b/abs/core/mysql/my.cnf index 6d24cfa..da26759 100755 --- a/abs/core/mysql/my.cnf +++ b/abs/core/mysql/my.cnf @@ -1,8 +1,7 @@ -# MySQL config file for medium systems. +# Example MySQL config file for very large systems. # -# This is for a system with little memory (32M - 64M) where MySQL plays -# an important part, or systems up to 128M where MySQL is used together with -# other programs (such as a web server) +# This is for a large system with memory of 1G-2G where the system runs mainly +# MySQL. # # MySQL programs look for option files in a set of # locations which depend on the deployment platform. @@ -27,21 +26,23 @@ socket = /var/run/mysqld/mysqld.sock port = 3306 socket = /var/run/mysqld/mysqld.sock datadir = /data/srv/mysql + skip-external-locking net_buffer_length = 8K -key_buffer_size = 80M +key_buffer_size = 96M max_allowed_packet = 1M -table_open_cache = 256 -tmp_table_size = 16M -max_heap_table_size = 16M -sort_buffer_size = 1M -read_buffer_size = 1M -read_rnd_buffer_size = 4M +tmp_table_size = 128M +max_heap_table_size = 128M +sort_buffer_size = 2M +read_buffer_size = 2M +read_rnd_buffer_size = 2M myisam_sort_buffer_size = 64M thread_cache_size = 8 -query_cache_size = 16M -join_buffer_size = 128K +query_cache_type = 1 +query_cache_size = 64M +query_cache_limit = 2M +join_buffer_size = 2M # Don't listen on a TCP/IP port at all. This can be a security enhancement, @@ -143,8 +144,8 @@ no-auto-rehash #safe-updates [myisamchk] -key_buffer_size = 20M -sort_buffer_size = 20M +key_buffer_size = 256M +sort_buffer_size = 256M read_buffer = 2M write_buffer = 2M diff --git a/abs/core/mysql/mysql-srv_buf_size.patch b/abs/core/mysql/mysql-srv_buf_size.patch new file mode 100644 index 0000000..12212fc --- /dev/null +++ b/abs/core/mysql/mysql-srv_buf_size.patch @@ -0,0 +1,20 @@ +--- storage/innobase/row/row0log.cc.orig 2013-07-10 16:17:27.000000000 +0000 ++++ storage/innobase/row/row0log.cc 2013-08-21 12:48:22.216656556 +0000 +@@ -2364,7 +2364,7 @@ all_done: + and be ignored when the operation is unsupported. */ + fallocate(index->online_log->fd, + FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, +- ofs, srv_buf_size); ++ ofs, srv_sort_buf_size); + #endif /* FALLOC_FL_PUNCH_HOLE */ + + next_mrec = index->online_log->head.block; +@@ -3153,7 +3153,7 @@ all_done: + and be ignored when the operation is unsupported. */ + fallocate(index->online_log->fd, + FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, +- ofs, srv_buf_size); ++ ofs, srv_sort_buf_size); + #endif /* FALLOC_FL_PUNCH_HOLE */ + + next_mrec = index->online_log->head.block; diff --git a/abs/core/mysql/mysql.install b/abs/core/mysql/mysql.install index a98f1a8..586fead 100644 --- a/abs/core/mysql/mysql.install +++ b/abs/core/mysql/mysql.install @@ -1,7 +1,17 @@ +if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then + datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p") +fi +[[ -z $datadir ]] && datadir=/data/srv/mysql + post_install(){ groupadd -g 89 mysql &>/dev/null - useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - usr/bin/mysql_install_db --user=mysql --basedir=/usr + useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null + + if [[ ! -e $datadir ]]; then + install -dm700 $datadir + fi + + usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir chown -R mysql:mysql var/lib/mysql &>/dev/null usr/bin/systemd-tmpfiles --create mysqld.conf @@ -9,9 +19,9 @@ post_install(){ post_upgrade(){ getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null - getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null - if [ "$(vercmp $2 5.5)" -lt 0 ]; then + if [ "$(vercmp $2 5.6)" -lt 0 ]; then echo " >> " echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." echo " >> " diff --git a/abs/core/mysql/mysqld-post.sh b/abs/core/mysql/mysqld-post.sh index 8dc9c4e..c4ac181 100755 --- a/abs/core/mysql/mysqld-post.sh +++ b/abs/core/mysql/mysqld-post.sh @@ -1,7 +1,8 @@ #!/bin/sh while true; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break echo "$response" | grep -q "mysqld is alive" && break + echo "$response" | grep -q "Access denied for user" && break sleep 1 done diff --git a/abs/core/mysql/mysqld.service b/abs/core/mysql/mysqld.service index 0175c68..a6fc8cf 100644 --- a/abs/core/mysql/mysqld.service +++ b/abs/core/mysql/mysqld.service @@ -1,11 +1,16 @@ [Unit] -Description=MySQL Server +Description=MySQL database server +After=syslog.target [Service] User=mysql -ExecStart=/usr/bin/mysqld --user=mysql +Group=mysql + +ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid ExecStartPost=/usr/bin/mysqld-post + Restart=always +PrivateTmp=true [Install] WantedBy=multi-user.target diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp index ac72a0b..e18da49 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp @@ -116,7 +116,8 @@ void WelcomeDialog::runLIVECD(void) if ( runsettings(true) == 1 ) { QString PAINTER = gCoreContext->GetSetting("ThemePainter"); - QString startFECmd = ("MYTHCONFDIR=/tmp mythfrontend -O ThemePainter=" + PAINTER ); + QString SERVERIP = gCoreContext->GetSetting("HostMysqlServer"); + QString startFECmd = ("MYTHCONFDIR=/tmp mythfrontend -O ThemePainter=" + PAINTER + " -O AudioOutputDevice=ALSA:default -O MasterServerIP=" + SERVERIP ); myth_system(startFECmd.ascii()); } else diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp index 3592f09..05acc5e 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp @@ -56,7 +56,7 @@ static HostComboBox *ThemePainter() gc->setLabel(QObject::tr("Paint Engine")); gc->addSelection(QObject::tr("Qt"), "qt"); gc->addSelection(QObject::tr("OpenGL"), "opengl"); - gc->setHelpText(QObject::tr("This selects what Myth uses to draw. If you have decent hardware, select OpenGL. Changing this requires a restart.")); + gc->setHelpText(QObject::tr("This selects what Myth uses to draw. If you have decent hardware, select OpenGL. Changing this requires a restart.")); return gc; } @@ -453,8 +453,9 @@ static HostCheckBox *HostRunFrontend() static HostComboBox *HostMysqlserverip_listbox() { HostComboBox *gc = new HostComboBox("HostMysqlServer",true); - gc->setLabel(QObject::tr("Mysql server")); + gc->setLabel(QObject::tr("MySQL Server")); + myth_system("avahi-browse -l -r -t _mysql._tcp > /tmp/mysqllist"); QString currentitem; QString prevline; QString line; @@ -479,8 +480,8 @@ static HostComboBox *HostMysqlserverip_listbox() file.close(); //system ("rm -f /tmp/mysqllist"); } - gc->addSelection("Manual: type ip here"); - gc->setHelpText(QObject::tr("")); + gc->addSelection("Manual: Enter IP Address"); + gc->setHelpText(QObject::tr("The IP address of the MasterBackend MySQL server.")); QString NETBOOT = getenv("NETBOOT"); NETBOOT=NETBOOT.stripWhiteSpace(); @@ -1151,9 +1152,18 @@ static HostCheckBox *HostHuluDesktop() static HostCheckBox *HostXBMC() { HostCheckBox *gc = new HostCheckBox("HostXBMC"); - gc->setLabel(QObject::tr("XBMC")); + gc->setLabel(QObject::tr("Kodi")); gc->setValue(false); - gc->setHelpText(QObject::tr("A software media player and entertainment hub for digital media.")); + gc->setHelpText(QObject::tr("Kodi (formerly known as XBMC) is an award-winning free and open source (GPL) software media player and entertainment hub, featuring a 10-foot user interface for use with televisions and remote controls.")); + return gc; +}; + +static HostCheckBox *HostPLEXHT() +{ + HostCheckBox *gc = new HostCheckBox("HostPLEXHT"); + gc->setLabel(QObject::tr("Plex Home Theater")); + gc->setValue(false); + gc->setHelpText(QObject::tr("Plex organizes all of your personal media, wherever you keep it, so you can enjoy it on any device.")); return gc; }; @@ -3603,7 +3613,7 @@ int runsettings (bool mysqlonly , bool shownetwork , bool showhostype, int retc = 0 ; displaymysqlonly = mysqlonly; - if (displaymysqlonly ) + if (displaymysqlonly) { MythInstallSettings mysqlsettings; mysqlsettings.Load(); @@ -3636,7 +3646,7 @@ int runsettings (bool mysqlonly , bool shownetwork , bool showhostype, displayshownetwork = false; }; - if ( showhostype && continuerun ) + if ( showhostype && continuerun ) { displayshowhostype = showhostype; system ("avahi-browse -l -r -t _mysql._tcp > /tmp/mysqllist"); @@ -3993,6 +4003,7 @@ void writesettings () hostparm.ThisHostHuluDesktop = gCoreContext->GetSetting("HostHuluDesktop"); hostparm.ThisHostwebonlinhes = gCoreContext->GetSetting("HostWebonlinhes"); hostparm.ThisHostXBMC = gCoreContext->GetSetting("HostXBMC"); + hostparm.ThisHostPLEXHT = gCoreContext->GetSetting("HostPLEXHT"); hostparm.ThisHostfoldingathome = gCoreContext->GetSetting("Hostfoldingathome"); hostparm.ThisHostfoldingusername = gCoreContext->GetSetting("Hostfoldingusername"); @@ -4325,7 +4336,8 @@ void writesettings () // myfile << "miro=\"" + hostparm.ThisHostMiro + "\"\n"; myfile << "webonlinhes=\"" + hostparm.ThisHostwebonlinhes + "\"\n"; myfile << "huludesktop=\"" + hostparm.ThisHostHuluDesktop + "\"\n"; - myfile << "xbmc=\"" + hostparm.ThisHostXBMC + "\"\n"; + myfile << "kodi=\"" + hostparm.ThisHostXBMC + "\"\n"; + myfile << "plexhometheater=\"" + hostparm.ThisHostPLEXHT + "\"\n"; myfile << "foldingathome=\"" + hostparm.ThisHostfoldingathome + "\"\n"; myfile << "foldingusername=\"" + hostparm.ThisHostfoldingusername + "\"\n"; myfile << "foldingworksize=\"" + hostparm.ThisHostfoldingworksize + "\"\n"; @@ -4420,6 +4432,7 @@ MythInstallSettings::MythInstallSettings() denied->addChild(deniedlabel); if ( displaymysqlonly ) { + vcg->setLabel(QObject::tr("Run MythFrontend Settings")); vcg->addChild(HostMysqlserverip_listbox()); vcg->addChild(ThemePainter()); addChild(vcg); @@ -4748,6 +4761,7 @@ MythInstallSettings::MythInstallSettings() //GridShowPlugin4->addChild(HostMiro()); //GridShowPlugin4->addChild(HostXine()); GridShowPlugin4->addChild(HostHuluDesktop()); + GridShowPlugin4->addChild(HostPLEXHT()); GridShowPlugin4->addChild(Hostwebmin()); GridShowPlugin4->addChild(Hostwebonlinhes()); GridShowPlugin4->addChild(HostXBMC()); diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h index 6ce0eff..cd2983b 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h @@ -524,6 +524,7 @@ struct HostParms // QString ThisHostMiro; QString ThisHostwebonlinhes; QString ThisHostXBMC; + QString ThisHostPLEXHT; QString ThisHostHuluDesktop; QString ThisHostpluginmythgameMame; diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp index a9f0aa9..4c243b5 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp @@ -319,7 +319,7 @@ int main(int argc, char **argv) "fceux", "sdlmame", "mednafen", - "mupen64plus-svn", + "mupen64plus", "romdb", "snes9x", "xe", @@ -330,7 +330,8 @@ int main(int argc, char **argv) "mythweather", "mythzoneminder", "huludesktop", - "xbmc", + "plex-home-theater", + "kodi", "webmin", "web-on-linhes", "foldingathome"}; @@ -354,6 +355,7 @@ int main(int argc, char **argv) "Hostpluginmythweather", "Hostpluginmythzoneminder", "HostHuluDesktop", + "HostPLEXHT", "HostXBMC", "Hostwebmin", "Hostwebonlinhes", diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index c37757d..901f6ad 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall -pkgver=8.2 -pkgrel=7 +pkgver=8.3 +pkgrel=6 pkgdesc="LinHES installer/systemconfig GUI." arch=('i686' 'x86_64') depends=('mythtv>=0.27') @@ -14,7 +14,7 @@ build() { rsync -au $startdir/MythVantage-app $srcdir msg "Building mythinstall" - cd $srcdir/MythVantage-app/mythinstall && qmake + cd $srcdir/MythVantage-app/mythinstall && qmake-qt4 make || exit 1 } diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index 90dd836..9e121ae 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -b305eb5b7fc662146e74983fa3754d622695cdeb +ca4a2d68aab8723e4424cd808d6865bad2b950f1 diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash_web b/abs/core/mythtv/stable-0.27/git_src/git_hash_web index 90a5feb..e1c323c 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash_web +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash_web @@ -1 +1 @@ -fca2bd2f78136a5363b1fbe7a313677b6bd1adc5 +e0c2a3aea94bc96be5836472a1c53e62b5e43c93 diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 1747521..193c126 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.4 -pkgrel=2 +pkgrel=10 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') @@ -43,7 +43,7 @@ build() { --python=/usr/bin/python2 msg "Compiling mythplugins" - qmake mythplugins.pro || return 1 + qmake-qt4 mythplugins.pro || return 1 make || return 1 } diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 1ecc448..89cc513 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.4 -pkgrel=2 +pkgrel=10 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('avahi' 'faad2' 'fftw' 'glew' 'lame' 'libass' 'libavc1394' 'libcdio' 'mysql-clients' 'mysql-python' 'openssl' 'perl-date-manip' 'perl-dbd-mysql' 'perl-io-socket-inet6' 'perl-libwww' 'perl-math-round' 'perl-net-upnp' 'perl-soap-lite' 'perl-xml-sax' 'python-pycurl' - 'python2-lxml' 'qt' 'qtwebkit' 'taglib' 'urlgrabber' 'wget' 'x264' 'xmltv') + 'python2-lxml' 'qt4' 'qtwebkit' 'taglib' 'urlgrabber' 'wget' 'x264' 'xmltv') makedepends=('mesa' 'libgl' 'yasm' 'git' 'rsync') replaces=() groups=('pvr') diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/lh_backend_control.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/lh_backend_control.xml new file mode 100644 index 0000000..0b0cc17 --- /dev/null +++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/lh_backend_control.xml @@ -0,0 +1,24 @@ +<mythmenu name="LH_BACKEND"> + + <button> + <type></type> + <text>Start MythBackend</text> + <description>Start the Master MythBackend</description> + <action>EXEC lh_backend_control.sh start</action> + </button> + + <button> + <type></type> + <text>Stop MythBackend</text> + <description>Stop the Master MythBackend</description> + <action>EXEC lh_backend_control.sh stop</action> + </button> + + <button> + <type></type> + <text>Restart MythBackend</text> + <description>Restart the Master MythBackend</description> + <action>EXEC lh_backend_control.sh restart</action> + </button> + +</mythmenu> diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/library.xml.patch b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/library.xml.patch index 8f80928..0c0177a 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/library.xml.patch +++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/library.xml.patch @@ -1,6 +1,6 @@ ---- themes/defaultmenu/library.xml.orig 2012-06-10 08:02:54.000000000 +0000 -+++ themes/defaultmenu/library.xml 2012-06-10 08:03:38.000000000 +0000 -@@ -40,6 +40,13 @@ +--- themes/defaultmenu/library.xml.orig 2014-11-26 20:21:35.092552944 +0000 ++++ themes/defaultmenu/library.xml 2014-11-26 20:22:43.103983263 +0000 +@@ -56,6 +56,13 @@ </button> <button> @@ -14,13 +14,12 @@ <type>IMAGES</type> <text>Image Gallery</text> <description>Look at Pictures</description> -@@ -51,8 +58,7 @@ +@@ -67,7 +74,7 @@ <type>GAME</type> <text>Play Games</text> <description>Play video games</description> - <action>PLUGIN mythgame</action> -- <depends>mythgame</depends> + <action>MENU game.xml</action> + <depends>mythgame</depends> </button> - </mythmenu> diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml index 8f8cc9f..fe7640d 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml +++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml @@ -39,6 +39,13 @@ </button> <button> + <type>TOOLS</type> + <text>LinHES Tools</text> + <description>Utilities for LinHES System</description> + <action>MENU linhes_tools.xml</action> + </button> + + <button> <type>BACKUP</type> <text>Backup LinHES</text> <description>Backup the LinHES System</description> diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes_tools.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes_tools.xml new file mode 100644 index 0000000..feabe8e --- /dev/null +++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes_tools.xml @@ -0,0 +1,31 @@ +<mythmenu name="LH_TOOLS"> + + <button> + <type></type> + <text>Show Help</text> + <description>Display the LinHES help screen</description> + <action>EXEC mythinstall -H</action> + </button> + + <button> + <type></type> + <text>Toggle Pointer</text> + <description>Show/Hide the mouse pointer</description> + <action>EXEC unclutter-toggle.sh</action> + </button> + + <button> + <type></type> + <text>MythBackend</text> + <description>Start/Stop MythBackend</description> + <action>MENU lh_backend_control.xml</action> + </button> + + <button> + <type></type> + <text>MythTV-Setup</text> + <description>Open mythtv-setup</description> + <action>EXEC mythtv-setup</action> + </button> + +</mythmenu> diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml index af38ba7..d37ba2b 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml +++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml @@ -3,7 +3,7 @@ <button> <type>RESTORE</type> <text>Restore Now?</text> - <description>Restore the database from the most recent backup.</description> + <description>Restore the database from the most recent backup</description> <action>NONE</action> </button> diff --git a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD index df18538..9239c46 100644 --- a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=0.27 -pkgrel=5 +pkgrel=6 commit_hash=`cat ../git_src/git_hash_web` pkgdesc="Web interface for MythTV's backend, $commit_hash" arch=('i686' 'x86_64') diff --git a/abs/core/ncurses/PKGBUILD b/abs/core/ncurses/PKGBUILD index b55c210..008e209 100644 --- a/abs/core/ncurses/PKGBUILD +++ b/abs/core/ncurses/PKGBUILD @@ -1,68 +1,69 @@ -# $Id: PKGBUILD 150103 2012-02-12 13:47:59Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=ncurses -pkgver=5.9 -pkgrel=3 -pkgdesc="System V Release 4.0 curses emulation library" +pkgver=5.9_20141101 +pkgrel=1 +pkgdesc='System V Release 4.0 curses emulation library' arch=('i686' 'x86_64') -url="http://www.gnu.org/software/ncurses/" +url='http://invisible-island.net/ncurses/ncurses.html' license=('MIT') -depends=('glibc') -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('8cb9c412e5f2d96bc6f459aa8c6282a1' - '014ffdbbfec6d41a9a89d6cbe6434638') +depends=('glibc' 'gcc-libs' 'sh') +provides=('libmenu.so' 'libpanel.so' 'libform.so' 'libncurses.so' 'libncurses++w.so' + 'libformw.so' 'libmenuw.so' 'libpanelw.so' 'libncursesw.so') +source=(ftp://invisible-island.net/ncurses/current/ncurses-${pkgver/_/-}.tgz{,.asc}) +md5sums=('87500270f8b1ba911228c940bad30ed1' + 'SKIP') -build() { - cd ${srcdir}/ +prepare() { mkdir ncurses{,w}-build +} - cd ${srcdir}/ncursesw-build - ../${pkgname}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \ +build() { + cd ncursesw-build + ../$pkgname-${pkgver/_/-}/configure --prefix=/usr --mandir=/usr/share/man \ --with-shared --with-normal --without-debug --without-ada \ - --with-install-prefix=${pkgdir} --enable-widec \ - --enable-pc-files - # add --enable-ext-colors with next soname bump + --enable-widec --enable-pc-files --with-cxx-binding --with-cxx-shared + # add --enable-ext-colors and --enable-ext-mouse with next soname bump make - # libncurses.so.5 for external binary support + # libraries for external binary support cd ${srcdir}/ncurses-build - [ $CARCH = "x86_64" ] && CONFIGFLAG="--with-chtype=long" - ../${pkgname}-${pkgver}/configure --prefix=/usr \ - --with-shared --with-normal --without-debug --without-ada \ - --with-install-prefix=${pkgdir} $CONFIGFLAG + [[ $CARCH = "x86_64" ]] && CONFIGFLAG="--with-chtype=long" + ../$pkgname-${pkgver/_/-}/configure --prefix=/usr \ + --with-shared --with-normal --without-debug --without-ada $CONFIGFLAG \ + --with-cxx-binding --with-cxx-shared make } package() { - cd ${srcdir}/ncursesw-build - make install + cd ncursesw-build + make DESTDIR="$pkgdir" install - # Fool packages looking to link to non-wide-character ncurses libraries - for lib in ncurses form panel menu; do - echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so - ln -s lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a + # fool packages looking to link to non-wide-character ncurses libraries + for lib in ncurses ncurses++ form panel menu; do + echo "INPUT(-l${lib}w)" > "$pkgdir"/usr/lib/lib${lib}.so done - ln -s libncurses++w.a ${pkgdir}/usr/lib/libncurses++.a for lib in ncurses ncurses++ form panel menu; do - ln -s ${lib}w.pc ${pkgdir}/usr/lib/pkgconfig/${lib}.pc + ln -s ${lib}w.pc "$pkgdir"/usr/lib/pkgconfig/${lib}.pc done - # Some packages look for -lcurses during build - echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib/libcursesw.so - ln -s libncurses.so ${pkgdir}/usr/lib/libcurses.so - ln -s libncursesw.a ${pkgdir}/usr/lib/libcursesw.a - ln -s libncurses.a ${pkgdir}/usr/lib/libcurses.a + # some packages look for -lcurses during build + echo "INPUT(-lncursesw)" > "$pkgdir"/usr/lib/libcursesw.so + ln -s libncurses.so "$pkgdir"/usr/lib/libcurses.so - # non-widec compatibility library - cd ${srcdir}/ncurses-build - install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.${pkgver} - ln -s libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.5 + # non-widec compatibility libraries + cd "$srcdir"/ncurses-build + for lib in ncurses form panel menu; do + install -Dm755 lib/lib${lib}.so.${pkgver%_*} "$pkgdir"/usr/lib/lib${lib}.so.${pkgver%_*} + ln -s lib${lib}.so.${pkgver%_*} "$pkgdir"/usr/lib/lib${lib}.so.5 + done # install license, rip it from the readme - cd ${srcdir}/${pkgname}-${pkgver} - install -dm755 ${pkgdir}/usr/share/licenses/$pkgname - grep -B 100 '$Id' README > ${pkgdir}/usr/share/licenses/${pkgname}/license.txt + cd "$srcdir"/$pkgname-${pkgver/_/-} + install -dm755 "$pkgdir"/usr/share/licenses/$pkgname + grep -B 100 '$Id' README > "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } diff --git a/abs/core/nvidia-304xx-utils/PKGBUILD b/abs/core/nvidia-304xx-utils/PKGBUILD new file mode 100644 index 0000000..95a9c50 --- /dev/null +++ b/abs/core/nvidia-304xx-utils/PKGBUILD @@ -0,0 +1,163 @@ +# $Id$ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Andreas Radke <andyrtr@archlinux.org> + +pkgbase=nvidia-304xx-utils +pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx') +pkgver=304.125 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +license=('custom') +makedepends=('zlib') +options=('!strip') + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('bc3b0ac291fa998d5109a6f7e94fb2d4') +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('291d41ccdbcc08f752a38f9e0a7eeea0') +fi + +create_links() { + # create soname links + for _lib in $(find "${pkgdir}" -name '*.so*' | grep -v 'xorg/'); do + _soname=$(dirname "${_lib}")/$(readelf -d "${_lib}" | grep -Po 'SONAME.*: \[\K[^]]*' || true) + _base=$(echo ${_soname} | sed -r 's/(.*).so.*/\1.so/') + [[ -e "${_soname}" ]] || ln -s $(basename "${_lib}") "${_soname}" + [[ -e "${_base}" ]] || ln -s $(basename "${_soname}") "${_base}" + done +} + +build() { + sh "${_pkg}.run" --extract-only +} + +package_opencl-nvidia-304xx() { + pkgdesc="OpenCL implemention for NVIDIA, 304xx legacy branch" + depends=('libcl' 'zlib') + optdepends=('opencl-headers: headers necessary for OpenCL development') + provides=('opencl-nvidia') + conflicts=('opencl-nvidia') + + cd ${_pkg} + + # OpenCL + install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd" + install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}" + install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" + + create_links + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/opencl-nvidia-304xx/LICENSE" +} + +package_nvidia-304xx-libgl() { + pkgdesc="NVIDIA drivers libraries symlinks, 304xx legacy branch" + depends=('nvidia-304xx-utils' 'mesa') + conflicts=('libgl' 'nvidia-libgl') + provides=('libgl' 'nvidia-libgl') + + cd ${_pkg} + + mkdir -p "${pkgdir}/usr/lib/xorg/modules/extensions" + ln -s "../../../nvidia/xorg/modules/extensions/libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}" + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.1" + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" + + ln -s nvidia/libGL.so.${pkgver} "${pkgdir}/usr/lib/libGL.so.${pkgver}" + ln -s libGL.so.${pkgver} "${pkgdir}/usr/lib/libGL.so.1" + ln -s libGL.so.${pkgver} "${pkgdir}/usr/lib/libGL.so" + + # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them + ln -s mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so.1.0.0" + ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so.1" + ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so" + + ln -s mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0" + ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so.1" + ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so" + + ln -s mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2.0.0" + ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2" + ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so" + + mkdir -p "${pkgdir}/usr/share/licenses" + ln -s nvidia-304xx "${pkgdir}/usr/share/licenses/nvidia-304xx-libgl" +} + +package_nvidia-304xx-utils() { + pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch" + depends=('xorg-server' 'libxvmc') + optdepends=('gtk2: nvidia-settings' + 'pkg-config: nvidia-xconfig' + 'opencl-nvidia-304xx: OpenCL support') + conflicts=('nvidia-utils') + provides=('nvidia-utils') + + cd ${_pkg} + + # X driver + install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so" + + # GLX extension module for X + install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}" + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so" # X doesn't find glx otherwise + + # OpenGL libraries + install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGL.so.${pkgver}" + + # OpenGL core library + install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}" + + # XvMC + install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib/libXvMCNVIDIA.so.${pkgver}" + + # VDPAU + install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}" + + # nvidia-tls library + install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-tls.so.${pkgver}" + install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}" + install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}" + + # CUDA + install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}" + install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}" + + # DEBUG + install -D -m755 nvidia-debugdump "${pkgdir}/usr/bin/nvidia-debugdump" + + # nvidia-xconfig + install -D -m755 nvidia-xconfig "${pkgdir}/usr/bin/nvidia-xconfig" + install -D -m644 nvidia-xconfig.1.gz "${pkgdir}/usr/share/man/man1/nvidia-xconfig.1.gz" + + # nvidia-settings + install -D -m755 nvidia-settings "${pkgdir}/usr/bin/nvidia-settings" + install -D -m644 nvidia-settings.1.gz "${pkgdir}/usr/share/man/man1/nvidia-settings.1.gz" + install -D -m644 nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop" + install -D -m644 nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png" + sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop" + + # nvidia-bug-report + install -D -m755 nvidia-bug-report.sh "${pkgdir}/usr/bin/nvidia-bug-report.sh" + + # nvidia-smi + install -D -m755 nvidia-smi "${pkgdir}/usr/bin/nvidia-smi" + install -D -m644 nvidia-smi.1.gz "${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz" + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia-304xx/LICENSE" + ln -s nvidia-304xx "${pkgdir}/usr/share/licenses/nvidia-304xx-utils" + + install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia-304xx/README" + install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia-304xx/NVIDIA_Changelog" + ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-utils" + + create_links +} +md5sums=('291d41ccdbcc08f752a38f9e0a7eeea0') diff --git a/abs/core/nvidia-304xx/PKGBUILD b/abs/core/nvidia-304xx/PKGBUILD new file mode 100644 index 0000000..56595a6 --- /dev/null +++ b/abs/core/nvidia-304xx/PKGBUILD @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Felix Yan <felixonmars@archlinux.org> +# Contributor: Thomas Baechler <thomas@archlinux.org> + +pkgname=nvidia-304xx +pkgver=304.125 +_extramodules=extramodules-3.18-ARCH +pkgrel=7 +pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=3.18' 'linux<3.19' 'nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}") +makedepends=('linux-headers>=3.18' 'linux-headers<3.19') +conflicts=('nvidia') +license=('custom') +install=nvidia.install +options=(!strip) + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('bc3b0ac291fa998d5109a6f7e94fb2d4') +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('291d41ccdbcc08f752a38f9e0a7eeea0') +fi + +source+=('nv-drm.patch') +md5sums+=('79671a27131da619a33eb02ed0c2c031') + +prepare() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + # patches here + patch -p0 -i "$srcdir/nv-drm.patch" +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}/kernel" + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + + # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time. +} diff --git a/abs/core/nvidia-304xx/nv-drm.patch b/abs/core/nvidia-304xx/nv-drm.patch new file mode 100644 index 0000000..4c6a393 --- /dev/null +++ b/abs/core/nvidia-304xx/nv-drm.patch @@ -0,0 +1,27 @@ +--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200 ++++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200 +@@ -18,6 +18,11 @@ + + #include <drm/drmP.h> + ++/* 3.18-rc0+ */ ++#ifndef drm_gem_object ++#include <drm/drm_gem.h> ++#endif ++ + extern nv_linux_state_t *nv_linux_devices; + + struct nv_gem_object { +diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c +index ecc982a..60d7aae 100644 +--- kernel/nv-drm.c~ ++++ kernel/nv-drm.c +@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = { + .gem_prime_vmap = nv_gem_prime_vmap, + .gem_prime_vunmap = nv_gem_prime_vunmap, + ++ .set_busid = drm_pci_set_busid, ++ + .name = "nvidia-drm", + .desc = "NVIDIA DRM driver", + .date = "20130102", diff --git a/abs/core/nvidia-304xx/nvidia.install b/abs/core/nvidia-304xx/nvidia.install new file mode 100644 index 0000000..a83edad --- /dev/null +++ b/abs/core/nvidia-304xx/nvidia.install @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-3.18-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.18-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.18-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/abs/core/nvidia-340xx-utils/PKGBUILD b/abs/core/nvidia-340xx-utils/PKGBUILD new file mode 100644 index 0000000..46681f7 --- /dev/null +++ b/abs/core/nvidia-340xx-utils/PKGBUILD @@ -0,0 +1,183 @@ +# $Id: PKGBUILD 219666 2014-08-13 13:28:24Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Maintainer: Thomas Baechler <thomas@archlinux.org> +# Contributor: James Rayner <iphitus@gmail.com> +pkgbase=nvidia-340xx-utils +pkgname=('nvidia-340xx-utils' 'nvidia-340xx-libgl' 'opencl-nvidia-340xx') +pkgver=340.65 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +license=('custom') +options=('!strip') +source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" + "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +sha1sums=('051a5b6aad243c5b57ed18455a91f9aa028de86d' + '2b1a102e87740ebb5367a5e8cd76d4f38de2add1') + +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" + +create_links() { + # create soname links + for _lib in $(find "${pkgdir}" -name '*.so*' | grep -v 'xorg/'); do + _soname=$(dirname "${_lib}")/$(readelf -d "${_lib}" | grep -Po 'SONAME.*: \[\K[^]]*' || true) + _base=$(echo ${_soname} | sed -r 's/(.*).so.*/\1.so/') + [[ -e "${_soname}" ]] || ln -s $(basename "${_lib}") "${_soname}" + [[ -e "${_base}" ]] || ln -s $(basename "${_soname}") "${_base}" + done +} + +prepare() { + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + bsdtar -xf nvidia-persistenced-init.tar.bz2 +} + +package_opencl-nvidia-340xx() { + pkgdesc="OpenCL implemention for NVIDIA" + depends=('libcl' 'zlib') + optdepends=('opencl-headers: headers necessary for OpenCL development') + conflicts=('opencl-nvidia') + provides=('opencl-nvidia') + cd "${_pkg}" + + # OpenCL + install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd" + install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}" + install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" + + create_links + + mkdir -p "${pkgdir}/usr/share/licenses" + ln -s nvidia "${pkgdir}/usr/share/licenses/opencl-nvidia" +} + +package_nvidia-340xx-libgl() { + pkgdesc="NVIDIA drivers libraries symlinks" + depends=('nvidia-340xx-utils') + conflicts=('libgl' 'nvidia-libgl') + provides=('libgl' 'nvidia-libgl') + cd "${_pkg}" + + mkdir -p "${pkgdir}/usr/lib/xorg/modules/extensions" + ln -s "/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}" + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.1" + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" + + ln -s "/usr/lib/nvidia/libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}" + ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.1" + ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so" + + ln -s "/usr/lib/nvidia/libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so.${pkgver}" + ln -s "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so.1" + ln -s "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so" + + ln -s "/usr/lib/nvidia/libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM.so.${pkgver}" + ln -s "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM.so.1" + ln -s "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM.so" + + ln -s "/usr/lib/nvidia/libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv2.so.${pkgver}" + ln -s "libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv2.so.2" + ln -s "libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv2.so" + + mkdir -p "${pkgdir}/usr/share/licenses" + ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl" +} + +package_nvidia-340xx-utils() { + pkgdesc="NVIDIA drivers utilities" + depends=('xorg-server') + optdepends=('gtk2: nvidia-settings' + 'xorg-server-devel: nvidia-xconfig' + 'opencl-nvidia-340xx: OpenCL support') + conflicts=('nvidia-utils') + provides=('nvidia-utils') + install="${pkgname}.install" + cd "${_pkg}" + + # X driver + install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so" + + # GLX extension module for X + install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}" + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so" # X doesn't find glx otherwise + + # OpenGL libraries + install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGL.so.${pkgver}" + install -D -m755 "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libEGL.so.${pkgver}" + install -D -m755 "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.${pkgver}" + install -D -m755 "libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGLESv2.so.${pkgver}" + + # OpenGL core library + install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}" + install -D -m755 "libnvidia-eglcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-eglcore.so.${pkgver}" + install -D -m755 "libnvidia-glsi.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glsi.so.${pkgver}" + + # misc + install -D -m755 "libnvidia-ifr.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ifr.so.${pkgver}" + install -D -m755 "libnvidia-fbc.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-fbc.so.${pkgver}" + install -D -m755 "libnvidia-encode.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-encode.so.${pkgver}" + install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}" + install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}" + + # VDPAU + install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}" + + # nvidia-tls library + install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-tls.so.${pkgver}" + + # CUDA + install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}" + install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}" + + # DEBUG + install -D -m755 nvidia-debugdump "${pkgdir}/usr/bin/nvidia-debugdump" + + # nvidia-xconfig + install -D -m755 nvidia-xconfig "${pkgdir}/usr/bin/nvidia-xconfig" + install -D -m644 nvidia-xconfig.1.gz "${pkgdir}/usr/share/man/man1/nvidia-xconfig.1.gz" + + # nvidia-settings + install -D -m755 nvidia-settings "${pkgdir}/usr/bin/nvidia-settings" + install -D -m644 nvidia-settings.1.gz "${pkgdir}/usr/share/man/man1/nvidia-settings.1.gz" + install -D -m644 nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop" + install -D -m644 nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png" + sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop" + + # nvidia-bug-report + install -D -m755 nvidia-bug-report.sh "${pkgdir}/usr/bin/nvidia-bug-report.sh" + + # nvidia-smi + install -D -m755 nvidia-smi "${pkgdir}/usr/bin/nvidia-smi" + install -D -m644 nvidia-smi.1.gz "${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz" + + # nvidia-cuda-mps + install -D -m755 nvidia-cuda-mps-server "${pkgdir}/usr/bin/nvidia-cuda-mps-server" + install -D -m755 nvidia-cuda-mps-control "${pkgdir}/usr/bin/nvidia-cuda-mps-control" + install -D -m644 nvidia-cuda-mps-control.1.gz "${pkgdir}/usr/share/man/man1/nvidia-cuda-mps-control.1.gz" + + # nvidia-modprobe + # This should be removed if nvidia fixed their uvm module! + install -D -m4755 nvidia-modprobe "${pkgdir}/usr/bin/nvidia-modprobe" + install -D -m644 nvidia-modprobe.1.gz "${pkgdir}/usr/share/man/man1/nvidia-modprobe.1.gz" + + # nvidia-persistenced + install -D -m755 nvidia-persistenced "${pkgdir}/usr/bin/nvidia-persistenced" + install -D -m644 nvidia-persistenced.1.gz "${pkgdir}/usr/share/man/man1/nvidia-persistenced.1.gz" + install -D -m644 nvidia-persistenced-init/systemd/nvidia-persistenced.service.template "${pkgdir}/usr/lib/systemd/system/nvidia-persistenced.service" + sed -i 's/__USER__/nvidia-persistenced/' "${pkgdir}/usr/lib/systemd/system/nvidia-persistenced.service" + + # application profiles + install -D -m644 nvidia-application-profiles-${pkgver}-rc "${pkgdir}/usr/share/nvidia/nvidia-application-profiles-${pkgver}-rc" + install -D -m644 nvidia-application-profiles-${pkgver}-key-documentation "${pkgdir}/usr/share/nvidia/nvidia-application-profiles-${pkgver}-key-documentation" + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia/LICENSE" + ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-utils" + install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia/README" + install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia/NVIDIA_Changelog" + cp -r html "${pkgdir}/usr/share/doc/nvidia/" + ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils" + + create_links +} diff --git a/abs/core/nvidia-340xx-utils/nvidia-340xx-utils.install b/abs/core/nvidia-340xx-utils/nvidia-340xx-utils.install new file mode 100644 index 0000000..df17a32 --- /dev/null +++ b/abs/core/nvidia-340xx-utils/nvidia-340xx-utils.install @@ -0,0 +1,14 @@ +post_install() { + if ! getent group nvidia-persistenced >/dev/null; then + groupadd -g 143 nvidia-persistenced + fi + if ! getent passwd nvidia-persistenced >/dev/null; then + useradd -c 'NVIDIA Persistence Daemon' -u 143 -g nvidia-persistenced -d '/' -s /sbin/nologin nvidia-persistenced + fi +} + +post_remove() { + if getent group nvidia-persistenced >/dev/null; then + userdel -f nvidia-persistenced + fi +} diff --git a/abs/core/nvidia-340xx/PKGBUILD b/abs/core/nvidia-340xx/PKGBUILD new file mode 100644 index 0000000..30134be --- /dev/null +++ b/abs/core/nvidia-340xx/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $ +# Maintainer : Thomas Baechler <thomas@archlinux.org> + +pkgname=nvidia-340xx +pkgver=340.65 +_extramodules=extramodules-3.18-ARCH +pkgrel=8 +pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=3.18' 'linux<3.19' "nvidia-340xx-libgl" "nvidia-340xx-utils=${pkgver}") +makedepends=('linux-headers>=3.18' 'linux-headers<3.19') +conflicts=('nvidia') +license=('custom') +install=${pkgname}.install +options=(!strip) +source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" + "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" + nv-drm.patch) +md5sums=('4aa6039b8543312b41a924bb87b0b2db' + '4558104f8601d27c7fd3e5cec7892345' + '79671a27131da619a33eb02ed0c2c031') + +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" + +prepare() { + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + # patches here + patch -p0 -i ../nv-drm.patch +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module + + cd uvm + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} diff --git a/abs/core/nvidia-340xx/nv-drm.patch b/abs/core/nvidia-340xx/nv-drm.patch new file mode 100644 index 0000000..4c6a393 --- /dev/null +++ b/abs/core/nvidia-340xx/nv-drm.patch @@ -0,0 +1,27 @@ +--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200 ++++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200 +@@ -18,6 +18,11 @@ + + #include <drm/drmP.h> + ++/* 3.18-rc0+ */ ++#ifndef drm_gem_object ++#include <drm/drm_gem.h> ++#endif ++ + extern nv_linux_state_t *nv_linux_devices; + + struct nv_gem_object { +diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c +index ecc982a..60d7aae 100644 +--- kernel/nv-drm.c~ ++++ kernel/nv-drm.c +@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = { + .gem_prime_vmap = nv_gem_prime_vmap, + .gem_prime_vunmap = nv_gem_prime_vunmap, + ++ .set_busid = drm_pci_set_busid, ++ + .name = "nvidia-drm", + .desc = "NVIDIA DRM driver", + .date = "20130102", diff --git a/abs/core/nvidia-340xx/nvidia-340xx.install b/abs/core/nvidia-340xx/nvidia-340xx.install new file mode 100644 index 0000000..a83edad --- /dev/null +++ b/abs/core/nvidia-340xx/nvidia-340xx.install @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-3.18-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.18-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.18-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD index a890901..9e9cd62 100644 --- a/abs/core/nvidia-utils/PKGBUILD +++ b/abs/core/nvidia-utils/PKGBUILD @@ -1,41 +1,44 @@ # $Id$ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Contributor: James Rayner <iphitus@gmail.com> pkgbase=nvidia-utils pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia') -pkgver=337.12 -pkgrel=1 +pkgver=346.35 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.nvidia.com/" license=('custom') options=('!strip') source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -sha1sums=('a99cd207d55fabeda424441c3eac23867f843b33' - '265178244fd20dd9a4fff740d0a02c072efc1f18') +sha1sums=('b011f4767ac6fef2aa677923626dc235317af2c6' + 'deb4535a9546b56ee1dbd1053bc56a3dd9c62117') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" create_links() { # create soname links - while read -d '' _lib; do - _soname="$(dirname "${_lib}")/$(LC_ALL=C readelf -d "${_lib}" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')" - [[ -e "${_soname}" ]] || ln -s "$(basename "${_lib}")" "${_soname}" - [[ -e "${_soname/.[0-9]*/}" ]] || ln -s "$(basename "${_soname}")" "${_soname/.[0-9]*/}" - done < <(find "${pkgdir}" -type f -name '*.so*' -print0) + for _lib in $(find "${pkgdir}" -name '*.so*' | grep -v 'xorg/'); do + _soname=$(dirname "${_lib}")/$(readelf -d "${_lib}" | grep -Po 'SONAME.*: \[\K[^]]*' || true) + _base=$(echo ${_soname} | sed -r 's/(.*).so.*/\1.so/') + [[ -e "${_soname}" ]] || ln -s $(basename "${_lib}") "${_soname}" + [[ -e "${_base}" ]] || ln -s $(basename "${_soname}") "${_base}" + done } -build() { - cd "${srcdir}" +prepare() { sh "${_pkg}.run" --extract-only + cd "${_pkg}" + bsdtar -xf nvidia-persistenced-init.tar.bz2 } package_opencl-nvidia() { pkgdesc="OpenCL implemention for NVIDIA" depends=('libcl' 'zlib') optdepends=('opencl-headers: headers necessary for OpenCL development') - cd "${srcdir}/${_pkg}" + cd "${_pkg}" # OpenCL install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd" @@ -53,7 +56,7 @@ package_nvidia-libgl() { depends=('nvidia-utils') conflicts=('libgl') provides=('libgl') - cd "${srcdir}/${_pkg}" + cd "${_pkg}" mkdir -p "${pkgdir}/usr/lib/xorg/modules/extensions" ln -s "/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}" @@ -86,7 +89,8 @@ package_nvidia-utils() { optdepends=('gtk2: nvidia-settings' 'xorg-server-devel: nvidia-xconfig' 'opencl-nvidia: OpenCL support') - cd "${srcdir}/${_pkg}" + install="${pkgname}.install" + cd "${_pkg}" # X driver install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so" @@ -135,6 +139,8 @@ package_nvidia-utils() { install -D -m644 nvidia-settings.1.gz "${pkgdir}/usr/share/man/man1/nvidia-settings.1.gz" install -D -m644 nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop" install -D -m644 nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png" + install -D -m755 "libnvidia-gtk2.so.$pkgver" "$pkgdir/usr/lib/libnvidia-gtk2.so.$pkgver" + install -D -m755 "libnvidia-gtk3.so.$pkgver" "$pkgdir/usr/lib/libnvidia-gtk3.so.$pkgver" sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop" # nvidia-bug-report @@ -146,11 +152,19 @@ package_nvidia-utils() { # nvidia-cuda-mps install -D -m755 nvidia-cuda-mps-server "${pkgdir}/usr/bin/nvidia-cuda-mps-server" + install -D -m755 nvidia-cuda-mps-control "${pkgdir}/usr/bin/nvidia-cuda-mps-control" install -D -m644 nvidia-cuda-mps-control.1.gz "${pkgdir}/usr/share/man/man1/nvidia-cuda-mps-control.1.gz" # nvidia-modprobe # This should be removed if nvidia fixed their uvm module! install -D -m4755 nvidia-modprobe "${pkgdir}/usr/bin/nvidia-modprobe" + install -D -m644 nvidia-modprobe.1.gz "${pkgdir}/usr/share/man/man1/nvidia-modprobe.1.gz" + + # nvidia-persistenced + install -D -m755 nvidia-persistenced "${pkgdir}/usr/bin/nvidia-persistenced" + install -D -m644 nvidia-persistenced.1.gz "${pkgdir}/usr/share/man/man1/nvidia-persistenced.1.gz" + install -D -m644 nvidia-persistenced-init/systemd/nvidia-persistenced.service.template "${pkgdir}/usr/lib/systemd/system/nvidia-persistenced.service" + sed -i 's/__USER__/nvidia-persistenced/' "${pkgdir}/usr/lib/systemd/system/nvidia-persistenced.service" # application profiles install -D -m644 nvidia-application-profiles-${pkgver}-rc "${pkgdir}/usr/share/nvidia/nvidia-application-profiles-${pkgver}-rc" @@ -160,6 +174,7 @@ package_nvidia-utils() { ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-utils" install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia/README" install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia/NVIDIA_Changelog" + cp -r html "${pkgdir}/usr/share/doc/nvidia/" ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils" create_links diff --git a/abs/core/nvidia-utils/nvidia-utils.install b/abs/core/nvidia-utils/nvidia-utils.install new file mode 100644 index 0000000..df17a32 --- /dev/null +++ b/abs/core/nvidia-utils/nvidia-utils.install @@ -0,0 +1,14 @@ +post_install() { + if ! getent group nvidia-persistenced >/dev/null; then + groupadd -g 143 nvidia-persistenced + fi + if ! getent passwd nvidia-persistenced >/dev/null; then + useradd -c 'NVIDIA Persistence Daemon' -u 143 -g nvidia-persistenced -d '/' -s /sbin/nologin nvidia-persistenced + fi +} + +post_remove() { + if getent group nvidia-persistenced >/dev/null; then + userdel -f nvidia-persistenced + fi +} diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index 30ce01e..991e153 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -2,22 +2,23 @@ # Maintainer : Thomas Baechler <thomas@archlinux.org> pkgname=nvidia -pkgver=337.12 -_extramodules=extramodules-3.13-ARCH -pkgrel=1 +pkgver=346.35 +_extramodules=extramodules-3.18-ARCH +pkgrel=4 pkgdesc="NVIDIA drivers for linux" arch=('i686' 'x86_64') url="http://www.nvidia.com/" -depends=('linux>=3.13' 'linux<3.14' "nvidia-libgl" "nvidia-utils=${pkgver}") -makedepends=('linux-headers>=3.13' 'linux-headers<3.14') -conflicts=('nvidia-96xx' 'nvidia-173xx') +depends=('linux>=3.18' 'linux<3.19' "nvidia-libgl" "nvidia-utils=${pkgver}") +makedepends=('linux-headers>=3.18' 'linux-headers<3.19') license=('custom') install=nvidia.install options=(!strip) source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" - "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums=('c610d5bff8f7f758dc25fdd51b1b65eb' - '4c2aaac75c1ff01a09ac8f4ff84084cd') + "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" + nv-drm-343.36.patch) +md5sums=('d2b8f7f90ef5037f03f94519f9809511' + '9ca9f07f91361362f304ca8317ddd453' + 'ff8a5f979e4428f8c847423fb007042c') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -26,6 +27,7 @@ prepare() { sh "${_pkg}.run" --extract-only cd "${_pkg}" # patches here + patch -p1 -i ../nv-drm-343.36.patch } build() { @@ -33,17 +35,22 @@ build() { cd "${_pkg}"/kernel make SYSSRC=/usr/lib/modules/"${_kernver}/build" module - cd uvm - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module + if [[ "$CARCH" = "x86_64" ]]; then + cd uvm + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module + fi } package() { install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" + + if [[ "$CARCH" = "x86_64" ]]; then + install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" + fi + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko install -d -m755 "${pkgdir}/usr/lib/modprobe.d" echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" } diff --git a/abs/core/nvidia/__changelog b/abs/core/nvidia/__changelog new file mode 100644 index 0000000..a8f8250 --- /dev/null +++ b/abs/core/nvidia/__changelog @@ -0,0 +1 @@ +nvidia.install: post_upgrade add root cron job to run xconfig.cron diff --git a/abs/core/nvidia/nv-drm-343.36.patch b/abs/core/nvidia/nv-drm-343.36.patch new file mode 100644 index 0000000..4f96201 --- /dev/null +++ b/abs/core/nvidia/nv-drm-343.36.patch @@ -0,0 +1,14 @@ +diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c +index c0b41a0..700c193 100644 +--- a/kernel/nv-drm.c ++++ b/kernel/nv-drm.c +@@ -128,6 +128,8 @@ static struct drm_driver nv_drm_driver = { + .gem_prime_vmap = nv_gem_prime_vmap, + .gem_prime_vunmap = nv_gem_prime_vunmap, + ++ .set_busid = drm_pci_set_busid, ++ + .name = "nvidia-drm", + .desc = "NVIDIA DRM driver", + .date = "20130102", + diff --git a/abs/core/nvidia/nvidia.install b/abs/core/nvidia/nvidia.install index 86803bc..af0670c 100644 --- a/abs/core/nvidia/nvidia.install +++ b/abs/core/nvidia/nvidia.install @@ -1,18 +1,20 @@ post_install() { - EXTRAMODULES='extramodules-3.13-ARCH' + EXTRAMODULES='extramodules-3.18-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.13-ARCH' + EXTRAMODULES='extramodules-3.18-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx' fi + echo "* * * * * /usr/bin/bash /usr/MythVantage/bin/xconfig.cron" >> /var/spool/cron/root + echo "root" >> /var/spool/cron/cron.update } post_remove() { - EXTRAMODULES='extramodules-3.13-ARCH' + EXTRAMODULES='extramodules-3.18-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/abs/core/openssl/PKGBUILD b/abs/core/openssl/PKGBUILD index 68efbf5..13148e2 100644 --- a/abs/core/openssl/PKGBUILD +++ b/abs/core/openssl/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl -_ver=1.0.1g +_ver=1.0.1j # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} #pkgver=$_ver @@ -18,13 +18,11 @@ backup=('etc/ssl/openssl.cnf') source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc" 'no-rpath.patch' - 'ca-dir.patch' - 'openssl-1.0.1f-perl-5.18.patch') -md5sums=('de62b43dfcd858e66a74bee1c834e959' + 'ca-dir.patch') +md5sums=('f7175c9cd3c39bb1907ac8bba9df8ed3' 'SKIP' 'dc78d3d06baffc16217519242ce92478' - '3bf51be3a1bbd262be46dc619f92aa90' - 'ea2a61c8bd43788d81d98f1ac36c98ac') + '3bf51be3a1bbd262be46dc619f92aa90') prepare() { cd $srcdir/$pkgname-$_ver @@ -33,8 +31,6 @@ prepare() { patch -p0 -i $srcdir/no-rpath.patch # set ca dir to /etc/ssl by default patch -p0 -i $srcdir/ca-dir.patch - - patch -p1 -i $srcdir/openssl-1.0.1f-perl-5.18.patch } build() { diff --git a/abs/core/openssl/openssl-1.0.1f-perl-5.18.patch b/abs/core/openssl/openssl-1.0.1f-perl-5.18.patch deleted file mode 100644 index c662096..0000000 --- a/abs/core/openssl/openssl-1.0.1f-perl-5.18.patch +++ /dev/null @@ -1,356 +0,0 @@ -Forward-ported from openssl-1.0.1e-perl-5.18.patch -Fixes install with perl-5.18. - -https://bugs.gentoo.org/show_bug.cgi?id=497286 - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> - ---- openssl-1.0.1f/doc/apps/cms.pod -+++ openssl-1.0.1f/doc/apps/cms.pod -@@ -450,28 +450,28 @@ - - =over 4 - --=item 0 -+=item C<0> - - the operation was completely successfully. - --=item 1 -+=item C<1> - - an error occurred parsing the command options. - --=item 2 -+=item C<2> - - one of the input files could not be read. - --=item 3 -+=item C<3> - - an error occurred creating the CMS file or when reading the MIME - message. - --=item 4 -+=item C<4> - - an error occurred decrypting or verifying the message. - --=item 5 -+=item C<5> - - the message was verified correctly but an error occurred writing out - the signers certificates. ---- openssl-1.0.1f/doc/apps/smime.pod -+++ openssl-1.0.1f/doc/apps/smime.pod -@@ -308,28 +308,28 @@ - - =over 4 - --=item 0 -+=item C<0> - - the operation was completely successfully. - --=item 1 -+=item C<1> - - an error occurred parsing the command options. - --=item 2 -+=item C<2> - - one of the input files could not be read. - --=item 3 -+=item C<3> - - an error occurred creating the PKCS#7 file or when reading the MIME - message. - --=item 4 -+=item C<4> - - an error occurred decrypting or verifying the message. - --=item 5 -+=item C<5> - - the message was verified correctly but an error occurred writing out - the signers certificates. ---- openssl-1.0.1f/doc/ssl/SSL_accept.pod -+++ openssl-1.0.1f/doc/ssl/SSL_accept.pod -@@ -44,13 +44,13 @@ - - =over 4 - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the - return value B<ret> to find out the reason. - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. ---- openssl-1.0.1f/doc/ssl/SSL_clear.pod -+++ openssl-1.0.1f/doc/ssl/SSL_clear.pod -@@ -56,12 +56,12 @@ - - =over 4 - --=item 0 -+=item C<0> - - The SSL_clear() operation could not be performed. Check the error stack to - find out the reason. - --=item 1 -+=item C<1> - - The SSL_clear() operation was successful. - ---- openssl-1.0.1f/doc/ssl/SSL_COMP_add_compression_method.pod -+++ openssl-1.0.1f/doc/ssl/SSL_COMP_add_compression_method.pod -@@ -53,11 +53,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation succeeded. - --=item 1 -+=item C<1> - - The operation failed. Check the error queue to find out the reason. - ---- openssl-1.0.1f/doc/ssl/SSL_connect.pod -+++ openssl-1.0.1f/doc/ssl/SSL_connect.pod -@@ -41,13 +41,13 @@ - - =over 4 - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the - return value B<ret> to find out the reason. - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. ---- openssl-1.0.1f/doc/ssl/SSL_CTX_add_session.pod -+++ openssl-1.0.1f/doc/ssl/SSL_CTX_add_session.pod -@@ -52,13 +52,13 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation failed. In case of the add operation, it was tried to add - the same (identical) session twice. In case of the remove operation, the - session was not found in the cache. - --=item 1 -+=item C<1> - - The operation succeeded. - ---- openssl-1.0.1f/doc/ssl/SSL_CTX_load_verify_locations.pod -+++ openssl-1.0.1f/doc/ssl/SSL_CTX_load_verify_locations.pod -@@ -100,13 +100,13 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation failed because B<CAfile> and B<CApath> are NULL or the - processing at one of the locations specified failed. Check the error - stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - ---- openssl-1.0.1f/doc/ssl/SSL_CTX_set_client_CA_list.pod -+++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_client_CA_list.pod -@@ -66,13 +66,13 @@ - - =over 4 - --=item 0 -+=item C<0> - - A failure while manipulating the STACK_OF(X509_NAME) object occurred or - the X509_NAME could not be extracted from B<cacert>. Check the error stack - to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - ---- openssl-1.0.1f/doc/ssl/SSL_CTX_set_session_id_context.pod -+++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_session_id_context.pod -@@ -64,13 +64,13 @@ - - =over 4 - --=item 0 -+=item C<0> - - The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded - the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error - is logged to the error stack. - --=item 1 -+=item C<1> - - The operation succeeded. - ---- openssl-1.0.1f/doc/ssl/SSL_CTX_set_ssl_version.pod -+++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_ssl_version.pod -@@ -42,11 +42,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - The new choice failed, check the error stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - ---- openssl-1.0.1f/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -+++ openssl-1.0.1f/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -@@ -96,7 +96,7 @@ - connection will fail with decryption_error before it will be finished - completely. - --=item 0 -+=item C<0> - - PSK identity was not found. An "unknown_psk_identity" alert message - will be sent and the connection setup fails. ---- openssl-1.0.1f/doc/ssl/SSL_do_handshake.pod -+++ openssl-1.0.1f/doc/ssl/SSL_do_handshake.pod -@@ -45,13 +45,13 @@ - - =over 4 - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the - return value B<ret> to find out the reason. - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. ---- openssl-1.0.1f/doc/ssl/SSL_read.pod -+++ openssl-1.0.1f/doc/ssl/SSL_read.pod -@@ -86,7 +86,7 @@ - The read operation was successful; the return value is the number of - bytes actually read from the TLS/SSL connection. - --=item 0 -+=item C<0> - - The read operation was not successful. The reason may either be a clean - shutdown due to a "close notify" alert sent by the peer (in which case ---- openssl-1.0.1f/doc/ssl/SSL_session_reused.pod -+++ openssl-1.0.1f/doc/ssl/SSL_session_reused.pod -@@ -27,11 +27,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - A new session was negotiated. - --=item 1 -+=item C<1> - - A session was reused. - ---- openssl-1.0.1f/doc/ssl/SSL_set_fd.pod -+++ openssl-1.0.1f/doc/ssl/SSL_set_fd.pod -@@ -35,11 +35,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation failed. Check the error stack to find out why. - --=item 1 -+=item C<1> - - The operation succeeded. - ---- openssl-1.0.1f/doc/ssl/SSL_set_session.pod -+++ openssl-1.0.1f/doc/ssl/SSL_set_session.pod -@@ -37,11 +37,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation failed; check the error stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - ---- openssl-1.0.1f/doc/ssl/SSL_shutdown.pod -+++ openssl-1.0.1f/doc/ssl/SSL_shutdown.pod -@@ -92,14 +92,14 @@ - - =over 4 - --=item 0 -+=item C<0> - - The shutdown is not yet finished. Call SSL_shutdown() for a second time, - if a bidirectional shutdown shall be performed. - The output of L<SSL_get_error(3)|SSL_get_error(3)> may be misleading, as an - erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred. - --=item 1 -+=item C<1> - - The shutdown was successfully completed. The "close notify" alert was sent - and the peer's "close notify" alert was received. ---- openssl-1.0.1f/doc/ssl/SSL_write.pod -+++ openssl-1.0.1f/doc/ssl/SSL_write.pod -@@ -79,7 +79,7 @@ - The write operation was successful, the return value is the number of - bytes actually written to the TLS/SSL connection. - --=item 0 -+=item C<0> - - The write operation was not successful. Probably the underlying connection - was closed. Call SSL_get_error() with the return value B<ret> to find out, diff --git a/abs/core/pacman/0001-pacman-key-compatibility-with-gnupg-2.1.patch b/abs/core/pacman/0001-pacman-key-compatibility-with-gnupg-2.1.patch new file mode 100644 index 0000000..65b72ef --- /dev/null +++ b/abs/core/pacman/0001-pacman-key-compatibility-with-gnupg-2.1.patch @@ -0,0 +1,27 @@ +From 41c8263ba289dac191d7f74faaa62476baf41c28 Mon Sep 17 00:00:00 2001 +From: Tobias Powalowski <tpowa@archlinux.org> +Date: Fri, 21 Nov 2014 20:54:58 +1000 +Subject: [PATCH] pacman-key: compatibility with gnupg-2.1 + +GnuPG 2.1 no longer allow empty passphrases by default. + +Signed-off-by: Allan McRae <allan@archlinux.org> +--- + scripts/pacman-key.sh.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in +index ba8d02e..5ba0ad8 100644 +--- a/scripts/pacman-key.sh.in ++++ b/scripts/pacman-key.sh.in +@@ -151,6 +151,7 @@ Key-Usage: sign + Name-Real: Pacman Keyring Master Key + Name-Email: pacman@localhost + Expire-Date: 0 ++%no-protection + %commit + %echo Done + EOF +-- +2.1.3 + diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index 56424d7..4e0fbf9 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -4,30 +4,47 @@ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pacman -pkgver=4.1.0 -pkgrel=1 +pkgver=4.1.2 +pkgrel=7 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" license=('GPL') groups=('base' 'base-devel') -depends=('bash' 'glibc>=2.15' 'libarchive>=3.1.2' 'curl>=7.19.4' +depends=('bash>=4.2.042-2' 'glibc>=2.17-2' 'libarchive>=3.1.2' 'curl>=7.19.4' 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring') -makedepends=('asciidoc') -checkdepends=('fakechroot') +checkdepends=('python2' 'fakechroot') optdepends=('fakeroot: for makepkg usage as normal user') +provides=('pacman-contrib') +conflicts=('pacman-contrib') +replaces=('pacman-contrib') backup=(etc/pacman.conf etc/makepkg.conf) -install=pacman.install -options=(!libtool) +options=('strip' 'debug') source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} + 0001-pacman-key-compatibility-with-gnupg-2.1.patch + pacman.conf.i686 pacman.conf.x86_64 makepkg.conf) +md5sums=('063c8b0ff6bdf903dc235445525627cd' + 'SKIP' + 'd0e015b1bf78cbf9762d9c44ea5f77a9' + '2db6c94709bb30cc614a176ecf8badb1' + 'de74a13618347f08ae4a9637f74471c4' + '2da6544e387f940588a90cb4b9b914e2') +validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae <allan@archlinux.org> + +prepare() { + cd "$pkgname-$pkgver" + patch -p1 -i $srcdir/0001-pacman-key-compatibility-with-gnupg-2.1.patch +} build() { - cd $srcdir/$pkgname-$pkgver + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --enable-doc + --localstatedir=/var --enable-doc \ + --with-scriptlet-shell=/usr/bin/bash \ + --with-ldconfig=/usr/bin/ldconfig make make -C contrib } @@ -37,41 +54,43 @@ check() { } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C contrib install # install Arch specific stuff - mkdir -p $pkgdir/etc - case "$CARCH" in + install -dm755 "$pkgdir/etc" + install -m644 "$srcdir/pacman.conf.$CARCH" "$pkgdir/etc/pacman.conf" + + case $CARCH in i686) - install -m644 $srcdir/pacman.conf.i686 $pkgdir/etc/pacman.conf mycarch="i686" mychost="i686-pc-linux-gnu" myflags="-march=i686" ;; x86_64) - install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf mycarch="x86_64" mychost="x86_64-unknown-linux-gnu" myflags="-march=x86-64" ;; esac - install -m644 $srcdir/makepkg.conf $pkgdir/etc/ + # set things correctly in the default conf file - sed -i $pkgdir/etc/makepkg.conf \ + install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc" + sed -i "$pkgdir/etc/makepkg.conf" \ -e "s|@CARCH[@]|$mycarch|g" \ -e "s|@CHOST[@]|$mychost|g" \ -e "s|@CARCHFLAGS[@]|$myflags|g" - # install completion files - install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman" + # put bash_completion in the right location + install -dm755 "$pkgdir/usr/share/bash-completion/completions" + mv "$pkgdir/etc/bash_completion.d/pacman" "$pkgdir/usr/share/bash-completion/completions" + rmdir "$pkgdir/etc/bash_completion.d" + for f in makepkg pacman-key; do ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f" done - install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman + install -Dm644 contrib/PKGBUILD.vim "$pkgdir/usr/share/vim/vimfiles/syntax/PKGBUILD.vim" } -md5sums=('a0f2b3148bee4784f21cf373cf59a0bc' - 'SKIP' - 'de74a13618347f08ae4a9637f74471c4' - '2ea6f0a5badef735ec7d30a372f5e9c6') diff --git a/abs/core/pacman/__changelog b/abs/core/pacman/__changelog index d53c316..e69de29 100644 --- a/abs/core/pacman/__changelog +++ b/abs/core/pacman/__changelog @@ -1,2 +0,0 @@ -- PKGBUILD: change dep glibc to LH 2.16 -- pacman.install: remove SyncFirst option from /etc/pacman.conf diff --git a/abs/core/pacman/makepkg.conf b/abs/core/pacman/makepkg.conf index dfec258..8cf5faa 100644 --- a/abs/core/pacman/makepkg.conf +++ b/abs/core/pacman/makepkg.conf @@ -11,7 +11,7 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' 'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'rsync::/usr/bin/rsync -z %u %o' + 'rsync::/usr/bin/rsync --no-motd -z %u %o' 'scp::/usr/bin/scp -C %u %o') # Other common tools: @@ -30,14 +30,14 @@ CHOST="@CHOST@" # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family CPPFLAGS="-D_FORTIFY_SOURCE=2" -CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" -CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" +CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4" +CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" #-- Debugging flags -#DEBUG_CFLAGS="-g -fvar-tracking-assignments" -#DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" +DEBUG_CFLAGS="-g -fvar-tracking-assignments" +DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" ######################################################################### # BUILD ENVIRONMENT @@ -67,7 +67,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) +# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -80,7 +80,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) #-- upx: Compress binary executable files using UPX #-- debug: Add debugging flags as specified in DEBUG_* variables # -OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) @@ -109,6 +109,8 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) #SRCDEST=/home/sources #-- Source packages: specify a fixed directory where all src packages will be placed #SRCPKGDEST=/home/srcpackages +#-- Log files: specify a fixed directory where all log files will be placed +#LOGDEST=/home/makepkglogs #-- Packager: name/email of the person or organization building packages #PACKAGER="John Doe <john@doe.com>" #-- Specify a key to use for package signing @@ -121,9 +123,10 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) COMPRESSGZ=(gzip -c -f -n) COMPRESSBZ2=(bzip2 -c -f) COMPRESSXZ=(xz -c -z -) +COMPRESSLRZ=(lrzip -q) +COMPRESSLZO=(lzop -q) COMPRESSZ=(compress -c -f) - ######################################################################### # EXTENSION DEFAULTS ######################################################################### diff --git a/abs/core/pacman/pacman.conf.i686 b/abs/core/pacman/pacman.conf.i686 new file mode 100644 index 0000000..92e76b4 --- /dev/null +++ b/abs/core/pacman/pacman.conf.i686 @@ -0,0 +1,90 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +#UseDelta = 0.7 +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs diff --git a/abs/core/pango/PKGBUILD b/abs/core/pango/PKGBUILD index b07ef9c..3adc9a6 100644 --- a/abs/core/pango/PKGBUILD +++ b/abs/core/pango/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 161372 2012-06-10 10:55:15Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango -pkgver=1.30.1 +pkgver=1.36.8 pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64') license=('LGPL') -depends=('glib2' 'cairo' 'libxft' 'libthai' 'freetype2') -makedepends=('gobject-introspection' 'libxt' 'gtk-doc') -options=('!libtool' '!emptydirs') +depends=('libthai' 'cairo' 'libxft' 'harfbuzz') +makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introspection' 'help2man' 'python2') install=pango.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) +source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe') +sha256sums=('18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07') build() { cd ${pkgname}-${pkgver} + rm -f pango-view/pango-view.1.in + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --with-included-modules=basic-fc make @@ -25,5 +26,6 @@ build() { package() { cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/etc/pango" } diff --git a/abs/core/pango/pango.install b/abs/core/pango/pango.install index 73b0f5b..4aa7c4d 100644 --- a/abs/core/pango/pango.install +++ b/abs/core/pango/pango.install @@ -1,21 +1,14 @@ -# arg 1: the new package version post_install() { - # we need to ldconfig first, in case xfree86's libs aren't - # in ld.so.cache yet - sbin/ldconfig -r . usr/bin/pango-querymodules >etc/pango/pango.modules } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { if [ -f usr/etc/pango/pango.modules ]; then rm usr/etc/pango/pango.modules fi - post_install $1 + post_install } -# arg 1: the old package version pre_remove() { rm etc/pango/pango.modules } diff --git a/abs/core/parted/PKGBUILD b/abs/core/parted/PKGBUILD index a0211ff..0fc86f9 100644 --- a/abs/core/parted/PKGBUILD +++ b/abs/core/parted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 199967 2013-11-20 11:26:39Z allan $ +# $Id$ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=parted -pkgver=3.1 -pkgrel=3 +pkgver=3.2 +pkgrel=1 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64') license=('GPL3') @@ -13,6 +13,7 @@ depends=('device-mapper' 'e2fsprogs') makedepends=('pkg-config') install=parted.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('0247b6a7b314f8edeb618159fa95f9cb') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,4 +30,3 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('5d89d64d94bcfefa9ce8f59f4b81bdcb') diff --git a/abs/core/perl_modules/perl-proc-processtable/PKGBUILD b/abs/core/perl_modules/perl-proc-processtable/PKGBUILD new file mode 100644 index 0000000..8f5ffc1 --- /dev/null +++ b/abs/core/perl_modules/perl-proc-processtable/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgname=perl-proc-processtable +pkgver=0.51 +pkgrel=1 +pkgdesc="Provides a consistent interface to process table information." +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/Proc-ProcessTable/" +license=('PerlArtistic') +depends=('perl') +provides=('perl-proc-killall' 'perl-proc-killfam' 'perl-proc-processtable-process') +options=(!emptydirs) +source=("http://search.cpan.org/CPAN/authors/id/J/JW/JWB/Proc-ProcessTable-$pkgver.tar.gz") +md5sums=('711238eb8ce7f5583ffef084d8facceb') + +build() { + cd "$srcdir/Proc-ProcessTable-$pkgver" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "$srcdir/Proc-ProcessTable-$pkgver" + make test +} + +package() { + cd "$srcdir/Proc-ProcessTable-$pkgver" + + make install DESTDIR="${pkgdir}" + find "${pkgdir}" -name perllocal.pod -delete + find "${pkgdir}" -name .packlist -delete +} diff --git a/abs/core/perl_modules/perl-tk/PKGBUILD b/abs/core/perl_modules/perl-tk/PKGBUILD index 21efbdb..6d9a17a 100644 --- a/abs/core/perl_modules/perl-tk/PKGBUILD +++ b/abs/core/perl_modules/perl-tk/PKGBUILD @@ -1,44 +1,48 @@ # $Id$ -# Maintainer: François Charette <francois ατ archlinux δοτ org> +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=perl-tk -_cpanname=Tk -pkgver=804.029 +pkgver=804.032 pkgrel=3 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/${_cpanname}" +url="http://search.cpan.org/dist/Tk" license=('PerlArtistic' 'GPL' 'custom') -depends=('libx11' 'libpng' 'libjpeg' 'tk' 'perl') -options=('!emptydirs') -replaces=('perltk') -provides=('perltk') -source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) -md5sums=('f4aebe6fcdb309a8480514f2ccf8117c') +depends=('libpng' 'libjpeg' 'tk' 'perl') +options=('!emptydirs' '!strip') +source=(http://www.cpan.org/authors/id/S/SR/SREZIC/Tk-${pkgver}.tar.gz + https://github.com/eserte/perl-tk/commit/ba3a92a779f7adcf655b7e45b40ee5b0cb79bc8b.patch + https://github.com/eserte/perl-tk/commit/1ca4589ef5a87999ec564081900bc8fdaed83c74.patch) build() { - cd $srcdir/${_cpanname}-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - /bin/chmod -R u+w * - # The Xlib header is wrong... - sed -i 's/XKeycodeToKeysym\(.*\)unsigned int/XKeycodeToKeysym\1KeyCode/' pTk/Xlib.h + cd Tk-$pkgver + + # FS#40692 + patch -p1 -i ../1ca4589ef5a87999ec564081900bc8fdaed83c74.patch + patch -p1 -i ../ba3a92a779f7adcf655b7e45b40ee5b0cb79bc8b.patch + + perl Makefile.PL INSTALLDIRS=vendor make } #check() { -# cd $srcdir/${_cpanname}-$pkgver +# cd Tk-$pkgver # make test #} package() { - cd $srcdir/${_cpanname}-$pkgver - make install DESTDIR=$pkgdir + cd Tk-$pkgver + make install DESTDIR="$pkgdir" # license install -D -m644 pTk/license.terms \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/tk.license + "${pkgdir}/usr/share/licenses/${pkgname}/tk.license" install -D -m644 pTk/Tix.license \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/tix.license + "${pkgdir}/usr/share/licenses/${pkgname}/tix.license" } +md5sums=('47a84c70d1fd254ccece208303e6e9d5' + '27c00e07b221a41dd6113e677c15af5d' + 'ea4ef20075bfd7da735a87245feeb061') diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD index 47981e4..b092e71 100644 --- a/abs/core/php/PKGBUILD +++ b/abs/core/php/PKGBUILD @@ -7,6 +7,7 @@ pkgname=('php' 'php-apache' 'php-fpm' 'php-embed' + 'php-phpdbg' 'php-pear' 'php-enchant' 'php-gd' @@ -21,21 +22,20 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.5.11 -pkgrel=3 +pkgver=5.6.3 +pkgrel=1 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' -makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' +makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' - 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' - 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd') -source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz" - "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz.asc" + 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'gd' 'icu' + 'curl' 'libxslt' 'openssl' 'db' 'gmp' 'systemd') +source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz" + "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz.asc" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') - prepare() { cd ${srcdir}/${pkgbase}-${pkgver} @@ -85,7 +85,8 @@ build() { --with-enchant=shared,/usr \ --with-fpm-systemd \ --with-freetype-dir=/usr \ - --with-gd=shared \ + --with-xpm-dir=/usr \ + --with-gd=shared,/usr \ --with-gdbm \ --with-gettext=shared \ --with-gmp=shared \ @@ -97,6 +98,7 @@ build() { --with-vpx-dir=/usr \ --with-ldap=shared \ --with-ldap-sasl \ + --with-libzip \ --with-mcrypt=shared \ --with-mhash \ --with-mssql=shared \ @@ -178,6 +180,17 @@ build() { ${_phpextensions} make + # phpdbg + cp -a ${srcdir}/build-php ${srcdir}/build-phpdbg + cd ${srcdir}/build-phpdbg + ./configure ${_phpconfig} \ + --disable-cli \ + --disable-cgi \ + --with-readline \ + --enable-phpdbg \ + ${_phpextensions} + make + # pear cp -a ${srcdir}/build-php ${srcdir}/build-pear cd ${srcdir}/build-pear @@ -201,7 +214,7 @@ build() { package_php() { pkgdesc='An HTML-embedded scripting language' - depends=('pcre' 'libxml2' 'bzip2' 'curl' 'php-gd' 'php-mcrypt') + depends=('pcre' 'libxml2' 'curl' 'libzip' 'php-gd' 'php-mcrypt') backup=('etc/php/php.ini') install='php.install' @@ -252,13 +265,20 @@ package_php-fpm() { } package_php-embed() { - pkgdesc='Embed SAPI for PHP' + pkgdesc='Embedded PHP SAPI library' depends=('php') install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h } +package_php-phpdbg() { + pkgdesc='Interactive PHP debugger' + depends=('php') + + install -D -m755 ${srcdir}/build-phpdbg/sapi/phpdbg/phpdbg ${pkgdir}/usr/bin/phpdbg +} + package_php-pear() { pkgdesc='PHP Extension and Application Repository' depends=('php') @@ -270,90 +290,103 @@ package_php-pear() { } package_php-enchant() { - depends=('php' 'enchant') pkgdesc='enchant module for PHP' + depends=('php' 'enchant') + install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so } package_php-gd() { - depends=('php' 'libpng' 'libjpeg' 'freetype2' 'libvpx') pkgdesc='gd module for PHP' + depends=('php' 'gd') + install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so } package_php-intl() { - depends=('php' 'icu') pkgdesc='intl module for PHP' + depends=('php' 'icu') + install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so } package_php-ldap() { - depends=('php' 'libldap') pkgdesc='ldap module for PHP' + depends=('php' 'libldap') + install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so } package_php-mcrypt() { - depends=('php' 'libmcrypt' 'libltdl') pkgdesc='mcrypt module for PHP' + depends=('php' 'libmcrypt' 'libltdl') + install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so } package_php-mssql() { - depends=('php' 'freetds') pkgdesc='mssql module for PHP' + depends=('php' 'freetds') + install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so } package_php-odbc() { - depends=('php' 'unixodbc') pkgdesc='ODBC modules for PHP' + depends=('php' 'unixodbc') + install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so } package_php-pgsql() { - depends=('php' 'postgresql-libs') pkgdesc='PostgreSQL modules for PHP' + depends=('php' 'postgresql-libs') + install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so } package_php-pspell() { - depends=('php' 'aspell') pkgdesc='pspell module for PHP' + depends=('php' 'aspell') + install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so } package_php-snmp() { - depends=('php' 'net-snmp') pkgdesc='snmp module for PHP' + depends=('php' 'net-snmp') + install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so } package_php-sqlite() { - depends=('php' 'sqlite') pkgdesc='sqlite module for PHP' + depends=('php' 'sqlite') + install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so } package_php-tidy() { - depends=('php' 'tidyhtml') pkgdesc='tidy module for PHP' + depends=('php' 'tidyhtml') + install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so } package_php-xsl() { - depends=('php' 'libxslt') pkgdesc='xsl module for PHP' + depends=('php' 'libxslt') + install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so } -md5sums=('9156fcd4b254cbfa9a7535f931da29d5' +md5sums=('7635f344145a4edd7dff6ecec795aaea' 'SKIP' - '2882de6eb210c826df0872b3ce606765' + '8768a43f8e435e9bbe56ef714214f9b6' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - '9f8263996836e27f5be1483e86ac2e33' - 'e036c721e5ad927cd1613c7475a58b3a' + '6bc1fc4ceee039d21ff3b56aa845cc5a' + '25bc67ad828e8147a817410b68d8016c' 'cc2940f5312ba42e7aa1ddfab74b84c4' 'c60343df74f8e1afb13b084d5c0e47ed') diff --git a/abs/core/php/__changelog b/abs/core/php/__changelog index 26c0ff4..43aa7f6 100644 --- a/abs/core/php/__changelog +++ b/abs/core/php/__changelog @@ -1,8 +1,9 @@ PKGBUILD: package_php: add deps 'php-gd' 'php-mcrypt' since we have them in php.ini + php.ini.patch: short_open_tags = On php.ini.patch: open_basedir commented out -php.ini.patch: error_log = syslog uncommented -pho.ini.patch: +php.ini.patch: error_log = syslog uncommented +php.ini.patch: ==> check and make sure these are uncommented: ==> "extension=ftp.so" ==> "extension=gd.so" diff --git a/abs/core/php/logrotate.d.php-fpm b/abs/core/php/logrotate.d.php-fpm index 1895c5b..2146ddd 100644 --- a/abs/core/php/logrotate.d.php-fpm +++ b/abs/core/php/logrotate.d.php-fpm @@ -3,6 +3,6 @@ notifempty delaycompress postrotate - systemctl reload php-fpm.service || true + /bin/kill -SIGUSR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true endscript } diff --git a/abs/core/php/php-fpm.conf.in.patch b/abs/core/php/php-fpm.conf.in.patch index 4bcdb73..81eabf7 100644 --- a/abs/core/php/php-fpm.conf.in.patch +++ b/abs/core/php/php-fpm.conf.in.patch @@ -1,5 +1,5 @@ ---- sapi/fpm/php-fpm.conf.in 2013-11-12 15:17:27.000000000 +0100 -+++ sapi/fpm/php-fpm.conf.in 2013-11-12 17:27:21.283279538 +0100 +--- sapi/fpm/php-fpm.conf.in 2014-04-29 10:04:30.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2014-05-01 07:36:14.762839158 +0200 @@ -12,7 +12,7 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p argument) @@ -31,10 +31,10 @@ @@ -167,9 +168,9 @@ ; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user - ; mode is set to 0666 + ; mode is set to 0660 -;listen.owner = @php_fpm_user@ -;listen.group = @php_fpm_group@ --;listen.mode = 0666 +-;listen.mode = 0660 +listen.owner = @php_fpm_user@ +listen.group = @php_fpm_group@ +listen.mode = 0660 diff --git a/abs/core/php/php.ini.patch b/abs/core/php/php.ini.patch index c27db10..78f51d4 100644 --- a/abs/core/php/php.ini.patch +++ b/abs/core/php/php.ini.patch @@ -1,5 +1,5 @@ ---- php.ini-production.orig 2014-04-15 22:32:53.462733214 +0000 -+++ php.ini-production 2014-04-15 23:16:41.483582108 +0000 +--- php.ini-production.orig 2014-12-08 15:38:39.686053082 +0000 ++++ php.ini-production 2014-12-08 15:45:54.966578982 +0000 @@ -199,7 +199,7 @@ ; Development Value: Off ; Production Value: Off @@ -9,16 +9,25 @@ ; Allow ASP-style <% %> tags. ; http://php.net/asp-tags +@@ -296,7 +296,7 @@ + ; or per-virtualhost web server configuration file. This directive is + ; *NOT* affected by whether Safe Mode is turned On or Off. + ; http://php.net/open-basedir +-;open_basedir = ++;open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/ + + ; This directive allows you to disable certain functions for security reasons. + ; It receives a comma-delimited list of function names. This directive is @@ -574,7 +574,7 @@ ; Example: ;error_log = php_errors.log - ; Log errors to syslog (Event Log on NT, not valid in Windows 95). + ; Log errors to syslog (Event Log on Windows). -;error_log = syslog +error_log = syslog ;windows.show_crt_warning ; Default value: 0 -@@ -693,7 +693,7 @@ +@@ -709,7 +709,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -27,16 +36,16 @@ ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" -@@ -716,7 +716,7 @@ +@@ -732,7 +732,7 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir -; extension_dir = "./" -+extension_dir = "/usr/lib/php/modules" ++extension_dir = "/usr/lib/php/modules/" ; On windows: ; extension_dir = "ext" -@@ -854,50 +854,48 @@ +@@ -870,49 +870,48 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; @@ -60,8 +69,7 @@ -;extension=php_exif.dll ; Must be after mbstring as it depends on it -;extension=php_mysql.dll -;extension=php_mysqli.dll --;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client --;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client +-;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client -;extension=php_openssl.dll -;extension=php_pdo_firebird.dll -;extension=php_pdo_mysql.dll @@ -101,8 +109,8 @@ +;extension=ldap.so +extension=mcrypt.so +;extension=mssql.so -+extension=mysqli.so +extension=mysql.so ++extension=mysqli.so +;extension=odbc.so +;zend_extension=opcache.so +extension=openssl.so diff --git a/abs/core/pinentry/PKGBUILD b/abs/core/pinentry/PKGBUILD index 072a2b2..2da4a57 100644 --- a/abs/core/pinentry/PKGBUILD +++ b/abs/core/pinentry/PKGBUILD @@ -1,26 +1,24 @@ -# $Id: PKGBUILD 160802 2012-06-06 10:36:53Z tpowa $ +# $Id$ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pinentry -pkgver=0.8.1 -pkgrel=4 +pkgver=0.9.0 +pkgrel=1 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" arch=('i686' 'x86_64') license=('GPL') -url="http://www.gnupg.org/aegypten2" +url="http://gnupg.org/related_software/pinentry/" depends=('ncurses' 'libcap>=2.16') -makedepends=('gtk2' 'qt') +makedepends=('gtk2' 'qt4') optdepends=('gtk2: for gtk2 backend' - 'qt: for qt4 backend') -source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz - qt4-pinentry-window.patch) + 'qt4: for qt4 backend') +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) install=pinentry.install +md5sums=('40a05856cb3accf6679987b7899b0f5a') build() { cd $srcdir/$pkgname-$pkgver - #fix: https://bugs.archlinux.org/task/29998 - patch -Np1 -i ../qt4-pinentry-window.patch for file in qt4/*.moc; do - /usr/bin/moc ${file/.moc/.h} > ${file} + moc-qt4 ${file/.moc/.h} > ${file} done ./configure --prefix=/usr \ --enable-pinentry-curses \ @@ -36,5 +34,3 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install } -md5sums=('81f99904daee5331eb6738408bb024b6' - '450b8713fe42f1bd93311ef84767c3d8') diff --git a/abs/core/pinentry/qt4-pinentry-window.patch b/abs/core/pinentry/qt4-pinentry-window.patch deleted file mode 100644 index 8f9faae..0000000 --- a/abs/core/pinentry/qt4-pinentry-window.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c2ab12b3742c929a225c3753439438edc27bfa81 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky <sochotnicky@redhat.com> -Date: Tue, 1 Feb 2011 14:42:27 +0100 -Subject: [PATCH] Fix qt4 pinentry window created in the background - -This is probably just a workaround. Proper fix is being investigated. -See: -https://bugzilla.redhat.com/show_bug.cgi?id=589532 -http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdialog-sends-window-to-background ---- - qt4/pinentrydialog.cpp | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp -index 541baf4..d634eb6 100644 ---- a/qt4/pinentrydialog.cpp -+++ b/qt4/pinentrydialog.cpp -@@ -69,7 +69,6 @@ void raiseWindow( QWidget* w ) - SetForegroundWindow( w->winId() ); - #endif - w->raise(); -- w->activateWindow(); - } - - QPixmap icon( QStyle::StandardPixmap which ) --- -1.7.3.5 - diff --git a/abs/core/pixman/PKGBUILD b/abs/core/pixman/PKGBUILD index 73a20c4..76c0959 100644 --- a/abs/core/pixman/PKGBUILD +++ b/abs/core/pixman/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 170784 2012-11-11 10:23:18Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=pixman -pkgver=0.28.0 +pkgver=0.32.6 pkgrel=1 pkgdesc="The pixel-manipulation library for X and cairo" arch=(i686 x86_64) url="http://xorg.freedesktop.org" license=('custom') depends=('glibc') -options=('!libtool') source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('cfc7a18a8811bf4ff0890f547c315bda8097f6ad') +sha1sums=('5b730399e1e212e5acaa69a4f1a2c7be1af1cdc4') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --disable-static make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/abs/core/pkg-config/PKGBUILD b/abs/core/pkg-config/PKGBUILD index a235d17..1835d5e 100644 --- a/abs/core/pkg-config/PKGBUILD +++ b/abs/core/pkg-config/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163491 2012-07-13 12:30:49Z allan $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> -# Committer: Judd Vinet <jvinet@zeroflux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=pkg-config -pkgver=0.27 -pkgrel=1 +pkgver=0.28 +pkgrel=2 pkgdesc="A system for managing library compile/link flags" arch=('i686' 'x86_64') url="http://pkgconfig.freedesktop.org/wiki/" @@ -15,7 +15,7 @@ provides=("pkgconfig=${pkgver}") conflicts=('pkgconfig') replaces=('pkgconfig') source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('3a4c9feab14b6719afd8904945d9b4e4') +md5sums=('aa3c86e67551adc3ac865160e34a2a0d') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/abs/core/plymouth/PKGBUILD b/abs/core/plymouth/PKGBUILD index 6126d4f..6f931ec 100644 --- a/abs/core/plymouth/PKGBUILD +++ b/abs/core/plymouth/PKGBUILD @@ -1,6 +1,6 @@ pkgname=plymouth pkgver=0.8.8.52.g37d2e40 -pkgrel=4 +pkgrel=6 pkgdesc="A graphical boot splash screen with kernel mode-setting support (Git version)" url="http://cgit.freedesktop.org/cgit/plymouth/" arch=('i686' 'x86_64') @@ -107,12 +107,12 @@ md5sums=('SKIP' '62c3b4e894330a2ca4c2b8fbcaba083c' 'e6d573b1913f3aa020cbde3863ee80f0' '225b953976e1c824f62ba406a63c18c7' - 'f0110fba1e77cd22c32d1727399d0b8a' - '95e987cfbc2d30a2cea215394eb9ac20' + '552347553a9a551eae8fb02a7007757e' + '00213e9b7e6407d40f37207a53059b74' '4f3be343eea9956bbc94d615d5f41def' '7f21ba9a85733ff945c23012cff55a89' '3bb0b8008edfad9e23703674341766a0' '42fddd683720dbacbe6e30b4b7892f3c' '412a1a89ca960370071746b0af8c0ac5' '37479b134827dc307b3c55bfb2711e99' - 'ab8a557d10f74bec5c94ed6cae34729c') + 'c5ebb2ad172770dee8a375954c23f2eb') diff --git a/abs/core/plymouth/__changelog b/abs/core/plymouth/__changelog index 6b8e8c1..441448d 100644 --- a/abs/core/plymouth/__changelog +++ b/abs/core/plymouth/__changelog @@ -1,4 +1,6 @@ pulled from AUR plymouth-git 12/3/13 -removed systemd as a dep -removed --enable-systemd configure option -add v86d as dep +PKGBUILD: removed systemd as a dep +PKGBUILD: removed --enable-systemd configure option +PKGBUILD: add v86d as dep +plymouth.install: call plymouth_config.py --mkinitcpio to rebuild image +plymouth.functions: comments out ply_client --quit on fail message diff --git a/abs/core/plymouth/plymouth.functions b/abs/core/plymouth/plymouth.functions index b866643..7b30fe9 100644 --- a/abs/core/plymouth/plymouth.functions +++ b/abs/core/plymouth/plymouth.functions @@ -20,7 +20,7 @@ if [[ -x /usr/bin/plymouth && -x /usr/sbin/plymouthd ]]; then } stat_fail() { - ply_client --quit + #ply_client --quit std_stat_fail "$@" } diff --git a/abs/core/plymouth/plymouth.install b/abs/core/plymouth/plymouth.install index 99aa7ee..759786a 100644 --- a/abs/core/plymouth/plymouth.install +++ b/abs/core/plymouth/plymouth.install @@ -1,50 +1,5 @@ post_install() { -cat <<EOF - -=========== - -1. To make Plymouth work: - 1.1. Add "plymouth" to HOOKS after "base" and "udev" in /etc/mkinitcpio.conf - 1.2. Add 'quiet splash' to the grub command line - 1.3. Rebuild your initrd image (# mkinitcpio -p [kernel preset name]). - E.g.: sudo mkinitcpio -p linux - -=========== - -2. To enable encryption, replace "encrypt" with "plymouth-encrypt" in - mkinitcpio.conf and rebuild your initrd image. - -=========== - -3. You will also need to rebuild your initrd image every time you change your - theme (the default is set as 'spinfinity'). - - To list all plymouth themes: - plymouth-set-default-theme -l - - To change theme and rebuild initrd image: - # plymouth-set-default-theme -R <theme> - -=========== - -4. For Smooth Transition to Display Manager you have to: - 4.1. See the Wiki Page (link in 5) to prepare your Display Manager - 4.2. Disable your Display Manager Unit - E.g. : # systemctl disable kdm.service - 4.3. Enable the respective DM-plymouth Unit (GDM, KDM, LXDM units provided) - E.g. : # systemctl enable kdm-plymouth.service - -=========== - -5. For more information please visit the Wiki page: - https://wiki.archlinux.org/index.php/Plymouth - -=========== - -OBS. If you have any leftover "kill Plymouth" lines in /etc/rc.local or -~/.xinitrc they are no longer required. - -EOF + plymouth_config.py --mkinitcpio } post_upgrade() { diff --git a/abs/core/plymouth/system-release b/abs/core/plymouth/system-release index 850183e..eec61fb 100644 --- a/abs/core/plymouth/system-release +++ b/abs/core/plymouth/system-release @@ -1 +1 @@ -Arch Linux +LinHES diff --git a/abs/core/poppler/PKGBUILD b/abs/core/poppler/PKGBUILD index d1e213e..aed359e 100644 --- a/abs/core/poppler/PKGBUILD +++ b/abs/core/poppler/PKGBUILD @@ -1,27 +1,22 @@ -# $Id: PKGBUILD 163501 2012-07-13 16:26:14Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler -pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.2 +pkgname=('poppler' 'poppler-glib' 'poppler-qt4') +pkgver=0.29.0 pkgrel=1 arch=(i686 x86_64) license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') -options=('!libtool' '!emptydirs') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu' 'git' 'python2') +options=('!emptydirs') url="http://poppler.freedesktop.org/" -_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a -source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz - http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('45dd2c16c8c4d1a39e830e45745c4e25' - '9dc64c254a31e570507bdd4ad4ba629a') +source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz + git://anongit.freedesktop.org/poppler/test) +md5sums=('7a5d87b7f62db636cc59f73bbd240811' + 'SKIP') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -i -e '/AC_PATH_XTRA/d' configure.ac - - autoreconf -fi - + cd ${pkgbase}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --enable-cairo-output \ @@ -33,48 +28,49 @@ build() { } check() { - cd "${srcdir}" - ln -sf test-${_testtag} test - cd ${pkgbase}-${pkgver} + cd "${srcdir}/${pkgbase}-${pkgver}" LANG=en_US.UTF8 make check } package_poppler() { pkgdesc="PDF rendering library based on xpdf 3.0" - depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') + depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms2') + optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters') conflicts=("poppler-qt3<${pkgver}") cd "${srcdir}/${pkgbase}-${pkgver}" sed -e 's/^glib_subdir =.*/glib_subdir =/' \ - -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile + -e 's/^qt4_subdir =.*/qt4_subdir =/' \ + -e 's/^qt5_subdir =.*/qt5_subdir =/' -i Makefile make DESTDIR="${pkgdir}" install - rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc + rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4,qt5}.pc } package_poppler-glib() { pkgdesc="Poppler glib bindings" depends=("poppler=${pkgver}" 'glib2') - cd "${srcdir}/${pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${pkgbase}-${pkgver}/glib" - make DESTDIR="${pkgdir}" install + cd "${pkgbase}-${pkgver}" + make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES + make -C glib DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" + install -m644 poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" rm -f "${pkgdir}"/usr/lib/libpoppler.* rm -f "${pkgdir}/usr/bin/poppler-glib-demo" } -package_poppler-qt() { - pkgdesc="Poppler Qt bindings" - depends=("poppler=${pkgver}" 'qt') +package_poppler-qt4() { + pkgdesc="Poppler Qt4 bindings" + provides=("poppler-qt=${pkgver}") + replaces=('poppler-qt') + conflicts=('poppler-qt') + depends=("poppler=${pkgver}" 'qt4') - cd "${srcdir}/${pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${pkgbase}-${pkgver}/qt4" - make DESTDIR="${pkgdir}" install + cd "${pkgbase}-${pkgver}" + make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES + make -C qt4 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" + install -m644 poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" rm -f "${pkgdir}"/usr/lib/libpoppler.* } diff --git a/abs/core/poppler/__changelog b/abs/core/poppler/__changelog new file mode 100644 index 0000000..0701dff --- /dev/null +++ b/abs/core/poppler/__changelog @@ -0,0 +1 @@ +PKGBUILD: remove qt5 stuff diff --git a/abs/core/procps-ng/PKGBUILD b/abs/core/procps-ng/PKGBUILD index 3942603..f30e5dc 100644 --- a/abs/core/procps-ng/PKGBUILD +++ b/abs/core/procps-ng/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 201333 2013-12-09 03:38:18Z bisson $ +# $Id$ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> pkgname=procps-ng -pkgver=3.3.9 +pkgver=3.3.10 pkgrel=1 pkgdesc='Utilities for monitoring your system and its processes' url='http://sourceforge.net/projects/procps-ng/' license=('GPL' 'LGPL') arch=('i686' 'x86_64') -depends=('ncurses') +depends=('ncurses' 'systemd') source=("http://downloads.sourceforge.net/project/${pkgname}/Production/${pkgname}-${pkgver}.tar.xz") -sha1sums=('088c77631745fc75ee41fc29c254a4069be4869a') +sha1sums=('484db198d6a18a42b4011d5ecb2cb784a81b0e4f') groups=('base') @@ -21,6 +21,11 @@ replaces=('procps' 'sysvinit-tools') install=install +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's:<ncursesw/:<:g' -i watch.c +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ @@ -30,6 +35,8 @@ build() { --libdir=/usr/lib \ --bindir=/usr/bin \ --sbindir=/usr/bin \ + --enable-watch8bit \ + --with-systemd \ make } diff --git a/abs/core/python2/PKGBUILD b/abs/core/python2/PKGBUILD index d670374..a9d67a1 100644 --- a/abs/core/python2/PKGBUILD +++ b/abs/core/python2/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 157413 2012-04-28 09:27:14Z allan $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributer: Allan McRae <allan@archlinux.org> -# Contributer: Jason Chu <jason@archlinux.org> +# $Id$ +# Maintainer: Felix Yan <felixonmars@archlinux.org> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> pkgname=python2 -pkgver=2.7.3 -pkgrel=2 +pkgver=2.7.9 +pkgrel=1 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') license=('PSF') url="http://www.python.org/" depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi') -makedepends=('tk') -optdepends=('tk: for IDLE') +makedepends=('tk' 'bluez-libs') +checkdepends=('gdb') +optdepends=('tk: for IDLE' + 'python2-setuptools' + 'python2-pip') conflicts=('python<3') -options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) -sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357') +sha1sums=('3172f6e957713c2d9fca462cc16068222fd1b9d3') -build() { - cd "${srcdir}/Python-${pkgver}" +prepare() { + cd Python-${pkgver} # Temporary workaround for FS#22322 # See http://bugs.python.org/issue10835 for upstream report @@ -32,56 +35,88 @@ build() { # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py + sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \ + Lib/distutils/tests/test_install_scripts.py + + # TODO: Still not passed + # Silent test_gdb failures on 'no symbol table loaded'. + #sed -i '/ignore_patterns = (/a "No symbol table is loaded. Use the \\"file\\" command.",' \ + # Lib/test/test_gdb.py + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball rm -r Modules/expat rm -r Modules/zlib rm -r Modules/_ctypes/{darwin,libffi}* + # clean up #!s + find . -name '*.py' | \ + xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" + + # Workaround asdl_c.py error after we touched the shebangs + touch Include/Python-ast.h Python/Python-ast.c +} + +build() { + cd "${srcdir}/Python-${pkgver}" + export OPT="${CFLAGS}" - ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \ - --enable-unicode=ucs4 --with-system-expat --with-system-ffi \ - --with-dbmliborder=gdbm:ndbm + ./configure --prefix=/usr \ + --enable-shared \ + --with-threads \ + --enable-ipv6 \ + --enable-unicode=ucs4 \ + --with-system-expat \ + --with-system-ffi \ + --with-dbmliborder=gdbm:ndbm \ + --without-ensurepip make } +check() { + # As of 2.7.9, 2 tests failed: + # test_gdb test_mhlib + # Besides, test_thread disabled as it will stuck + + cd Python-${pkgver} + LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_thread || warning "Tests failed" +} + package() { - cd "${srcdir}/Python-${pkgver}" + cd Python-${pkgver} make DESTDIR="${pkgdir}" altinstall maninstall - ln -sf python${_pybasever} "${pkgdir}/usr/bin/python2" - ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config" - ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1" - #jm + #LinHES ln -sf python2 "${pkgdir}/usr/bin/python" - - ln -sf ../../libpython${_pybasever}.so \ - "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so" + rm "${pkgdir}"/usr/share/man/man1/python.1 + + ln -sf python${_pybasever} "${pkgdir}"/usr/bin/python2 + ln -sf python${_pybasever}-config "${pkgdir}"/usr/bin/python2-config + ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python2.1 - mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/" + # FS#33954 + ln -sf python-${_pybasever}.pc "${pkgdir}"/usr/lib/pkgconfig/python2.pc + + ln -sf ../../libpython${_pybasever}.so "${pkgdir}"/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so + + mv "${pkgdir}"/usr/bin/smtpd.py "${pkgdir}"/usr/lib/python${_pybasever}/ # some useful "stuff" install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts} - install -m755 Tools/i18n/{msgfmt,pygettext}.py \ - "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/" - install -m755 Tools/scripts/{README,*py} \ - "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/" + install -m755 Tools/i18n/{msgfmt,pygettext}.py "${pkgdir}"/usr/lib/python${_pybasever}/Tools/i18n/ + install -m755 Tools/scripts/{README,*py} "${pkgdir}"/usr/lib/python${_pybasever}/Tools/scripts/ # fix conflicts with python mv "${pkgdir}"/usr/bin/idle{,2} mv "${pkgdir}"/usr/bin/pydoc{,2} mv "${pkgdir}"/usr/bin/2to3{,-2.7} - # clean up #!s - find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \ - xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" - # clean-up reference to build directory - sed -i "s#${srcdir}/Python-${pkgver}:##" \ - "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile" + sed -i "s#${srcdir}/Python-${pkgver}:##" "${pkgdir}"/usr/lib/python${_pybasever}/config/Makefile # license - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/abs/core/python2/__changelog b/abs/core/python2/__changelog index 59380ff..d8cc127 100644 --- a/abs/core/python2/__changelog +++ b/abs/core/python2/__changelog @@ -1 +1 @@ -add symlink making python2->python +PKGBUILD: add symlink making python2->python diff --git a/abs/core/python_modules/pygtk/PKGBUILD b/abs/core/python_modules/pygtk/PKGBUILD index e82fdbe..9e9f145 100644 --- a/abs/core/python_modules/pygtk/PKGBUILD +++ b/abs/core/python_modules/pygtk/PKGBUILD @@ -1,29 +1,34 @@ -# $Id: PKGBUILD 148886 2012-02-05 11:54:15Z ibiru $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=pygtk pkgver=2.24.0 -pkgrel=3 +pkgrel=5 pkgdesc="Python bindings for the GTK widget set" arch=('i686' 'x86_64') license=('LGPL') depends=('libglade' 'python2-cairo' 'pygobject') makedepends=('python2-numpy' 'pygobject2-devel') optdepends=('python2-numpy') -options=('!libtool') url="http://www.pygtk.org/" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 python27.patch) sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912' '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" #https://bugzilla.gnome.org/show_bug.cgi?id=623965 patch -Np1 -i "${srcdir}/python27.patch" + sed -i -e 's#env python$#env python2#' examples/pygtk-demo/{,demos/}*.py +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr make } @@ -32,6 +37,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" - - sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py } diff --git a/abs/core/python_modules/python-parted/PKGBUILD b/abs/core/python_modules/python-parted/PKGBUILD index 4374e09..0e2aa3c 100644 --- a/abs/core/python_modules/python-parted/PKGBUILD +++ b/abs/core/python_modules/python-parted/PKGBUILD @@ -1,17 +1,32 @@ +# Maintainer: Nikos Skalkotos <skalkoto at gmail dot com> +# Contributor: Achilleas Pipinellis <axilleas archlinux info> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: kfgz <kfgz at interia pl> +# Contributor: Gökmen Görgen <gkmngrgn at gmail dot com> +# Contributor: Baurzhan Muftakhidinov <baurthefirst (at) gmail (dot) com> + +_pkgname=pyparted pkgname=python-parted -__pkgname=pyparted -pkgver=3.8 -pkgrel=1 -pkgdesc="Python bindings for libparted" +pkgver=3.10.1 +pkgrel=2 +pkgdesc="Python module for GNU parted" +url="https://github.com/dcantrell/pyparted" arch=('i686' 'x86_64') -license=('LGPL' 'MPL') -depends=('python2' 'parted>=3.1' 'python-decorator') -options=('!libtool') -source=(https://fedorahosted.org/releases/p/y/pyparted/pyparted-${pkgver}.tar.gz) -url="https://fedorahosted.org/pyparted/" +license=('GPL2') +depends=('python2' 'parted>=3.0') +makedepends=('pkg-config') +conflicts=('pyparted-git') +replaces=('pyparted') +source=("https://github.com/dcantrell/${_pkgname}/archive/${_pkgname}-${pkgver}.tar.gz") build() { - cd "${srcdir}/${__pkgname}-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" + cd "${srcdir}/${_pkgname}-${_pkgname}-${pkgver}" + python2 setup.py build +} + +package() { + cd "${srcdir}/${_pkgname}-${_pkgname}-${pkgver}" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build } -md5sums=('e9cd0c94c71ac17755f71a8e1561eac2') +sha512sums=('d2842ba919808ccb757f6852e17c725b7db6e94db31548366fbdf2376960f8cf6ce239cb33282b4eca02f20a94f85bd58e8fc1d40834670c9684f5903c3515e5') + diff --git a/abs/core/python_modules/python-parted/__changelog b/abs/core/python_modules/python-parted/__changelog new file mode 100644 index 0000000..3cf54c1 --- /dev/null +++ b/abs/core/python_modules/python-parted/__changelog @@ -0,0 +1 @@ +From AUR python2-pyparted diff --git a/abs/core/python_modules/python-pillow/PKGBUILD b/abs/core/python_modules/python-pillow/PKGBUILD index fc93f2d..461c4a7 100644 --- a/abs/core/python_modules/python-pillow/PKGBUILD +++ b/abs/core/python_modules/python-pillow/PKGBUILD @@ -3,10 +3,9 @@ # Contributor: minder pkgbase=python-pillow -#pkgname=(python-pillow python2-pillow) pkgname=(python2-pillow) -pkgver=2.5.3 -pkgrel=2 +pkgver=2.6.1 +pkgrel=1 _appname=Pillow _py2basever=2.7 _py3basever=3.4m @@ -16,7 +15,7 @@ url="http://python-pillow.github.io/" license=('BSD') makedepends=('python2-setuptools' 'lcms' 'libwebp' 'tk') source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip") -md5sums=('9879437c28ee0ad6ea04b93d0be2c2d7') +md5sums=('f86e88a0f79f226dcdbf045b404cbdeb') build() { cd "$srcdir" diff --git a/abs/core/python_modules/python-pybluez/PKGBUILD b/abs/core/python_modules/python-pybluez/PKGBUILD index f667d66..e48f941 100644 --- a/abs/core/python_modules/python-pybluez/PKGBUILD +++ b/abs/core/python_modules/python-pybluez/PKGBUILD @@ -1,24 +1,31 @@ -# $Id: PKGBUILD 26298 2010-09-14 17:18:19Z schuay $ +# $Id: PKGBUILD 66132 2012-02-23 01:40:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: cs-cam - me.at.camdaniel.com -pkgname=python-pybluez -pkgver=0.18 -pkgrel=3 +pkgbase=python-pybluez +pkgname=(python2-pybluez) +pkgver=0.20 +pkgrel=2 pkgdesc="Python wrapper for the BlueZ Bluetooth stack" arch=('i686' 'x86_64') url="http://code.google.com/p/pybluez/" license=('GPL') -provides=('pybluez') -conflicts=('pybluez') -replaces=('pybluez') -depends=('python2' 'bluez') -source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz) -md5sums=('be8c8ce615c3189fda1aaf3d568314b2') +makedepends=('python2' 'bluez-libs') +source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.zip) +md5sums=('1e7fad332d50f089bbce69070c877ef6') + +#package_python-pybluez() { +# depends=('python' 'bluez-libs') + +# cd $srcdir/PyBluez-$pkgver +# python setup.py install --root=$pkgdir +# ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python3.3/site-packages/_bluetooth.so +#} + +package_python2-pybluez() { + depends=('python2' 'bluez-libs') -build() { cd $srcdir/PyBluez-$pkgver python2 setup.py install --root=$pkgdir - ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.6/site-packages/_bluetooth.so +# ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so } - diff --git a/abs/core/python_modules/python-pybluez/__changelog b/abs/core/python_modules/python-pybluez/__changelog new file mode 100644 index 0000000..488d3cf --- /dev/null +++ b/abs/core/python_modules/python-pybluez/__changelog @@ -0,0 +1 @@ +PKGBUILD: rm py 3 stuff diff --git a/abs/core/python_modules/python-simplejson/PKGBUILD b/abs/core/python_modules/python-simplejson/PKGBUILD new file mode 100644 index 0000000..73dc754 --- /dev/null +++ b/abs/core/python_modules/python-simplejson/PKGBUILD @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: David Moore <davidm@sjsoft.com> + +pkgbase=python-simplejson +pkgname=('python2-simplejson') +pkgver=3.6.5 +pkgrel=1 +pkgdesc='Simple, fast, extensible JSON encoder/decoder for Python' +license=('MIT') +arch=('x86_64' 'i686') +url='http://undefined.org/python/#simplejson' +makedepends=('python2-setuptools' 'git') +source=("git://github.com/simplejson/simplejson.git#tag=v$pkgver") +md5sums=('SKIP') + +#package_python-simplejson() { +# depends=('python') + +# cd simplejson +# python setup.py install --root="$pkgdir" +# install -Dm644 "$srcdir/simplejson/LICENSE.txt" \ +# "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +#} + +package_python2-simplejson() { + depends=('python2') + + cd simplejson + python2 setup.py install --root="$pkgdir" + install -Dm644 "$srcdir/simplejson/LICENSE.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/python_modules/python-simplejson/__changelog b/abs/core/python_modules/python-simplejson/__changelog new file mode 100644 index 0000000..488d3cf --- /dev/null +++ b/abs/core/python_modules/python-simplejson/__changelog @@ -0,0 +1 @@ +PKGBUILD: rm py 3 stuff diff --git a/abs/core/python_modules/pywebkitgtk/PKGBUILD b/abs/core/python_modules/pywebkitgtk/PKGBUILD index 9fec0ff..b89fc60 100644 --- a/abs/core/python_modules/pywebkitgtk/PKGBUILD +++ b/abs/core/python_modules/pywebkitgtk/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 148894 2012-02-05 11:54:35Z ibiru $ +# $Id$ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: kasa <biuta.jr@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=pywebkitgtk pkgver=1.1.8 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings to the WebKit GTK+ port" arch=('i686' 'x86_64') url="http://code.google.com/p/pywebkitgtk/" license=('LGPL') -depends=('libwebkit' 'pygtk') -options=('!libtool' '!makeflags') +depends=('webkitgtk2' 'pygtk') +options=('!makeflags') source=(http://pywebkitgtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) md5sums=('158335385354ba38090c9324b37bf225') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/qt/PKGBUILD b/abs/core/qt/PKGBUILD deleted file mode 100644 index 8c0d260..0000000 --- a/abs/core/qt/PKGBUILD +++ /dev/null @@ -1,136 +0,0 @@ -# $Id: PKGBUILD 162529 2012-06-27 06:33:44Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=qt -pkgname=('qt' 'qt-private-headers') -pkgver=4.8.2 -pkgrel=3 -arch=('i686' 'x86_64') -url='http://qt-project.org/' -license=('GPL3' 'LGPL') -makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus' - 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' - 'mysql' 'unixodbc' 'gtk2' ) -options=('!libtool') -_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" -source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" - 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop' - 'improve-cups-support.patch' - 'fix-assistant-crash.patch') -md5sums=('3c1146ddf56247e16782f96910a8423b' - 'fc211414130ab2764132e7370f8e5caa' - '85179f5e0437514f8639957e1d8baf62' - 'f11852b97583610f3dbb669ebc3e21bc' - '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'c439c7731c25387352d8453ca7574971' - 'e9c11e4606b7f55ae405e3e76f863dc1') - -build() { - cd "${srcdir}"/${_pkgfqn} - - # (FS#28381) (KDEBUG#180051) - patch -p1 -i "${srcdir}"/improve-cups-support.patch - - patch -p1 -i "${srcdir}"/fix-assistant-crash.patch - - export QT4DIR="${srcdir}"/${_pkgfqn} - export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - - sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf - sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf - sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf - - ./configure -v -confirm-license -opensource \ - -prefix /usr \ - -docdir /usr/share/doc/qt \ - -plugindir /usr/lib/qt/plugins \ - -importdir /usr/lib/qt/imports \ - -datadir /usr/share/qt \ - -translationdir /usr/share/qt/translations \ - -sysconfdir /etc/xdg \ - -examplesdir /usr/share/doc/qt/examples \ - -demosdir /usr/share/doc/qt/demos \ - -plugin-sql-{mysql,sqlite,odbc} \ - -system-sqlite \ - -no-phonon \ - -no-phonon-backend \ - -no-webkit \ - -graphicssystem raster \ - -openssl-linked \ - -nomake demos \ - -nomake examples \ - -nomake docs \ - -silent \ - -no-rpath \ - -optimized-qmake \ - -reduce-relocations \ - -dbus-linked \ - -no-openvg - make -} - -package_qt() { - pkgdesc='A cross-platform application and UI framework' - depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus' - 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') - optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' - 'unixodbc: ODBC driver' - 'libfbclient: Firebird/iBase driver' - 'libxinerama: Xinerama support' - 'libxcursor: Xcursor support' - 'libxfixes: Xfixes support') - install='qt.install' - - cd "${srcdir}"/${_pkgfqn} - make INSTALL_ROOT="${pkgdir}" install - - # install missing icons and desktop files - for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do - size=$(echo $(basename ${icon}) | cut -d- -f2) - install -p -D -m644 ${icon} \ - "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" - done - install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \ - "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png" - install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \ - "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" - install -p -D -m644 tools/designer/src/designer/images/designer.png \ - "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" - install -d "${pkgdir}/usr/share/applications" - install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \ - "${pkgdir}/usr/share/applications/" - - # install license addition - install -D -m644 LGPL_EXCEPTION.txt \ - ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt - - # Fix wrong path in pkgconfig files - find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ - -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; - - # Fix wrong path in prl files - find "${pkgdir}/usr/lib" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; -} - -package_qt-private-headers(){ - pkgdesc="Qt private headers for development" - depends=("qt=${pkgver}") - - install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} - install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script} - - for i in QtCore QtDeclarative QtGui QtScript; do - cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \ - "${pkgdir}"/usr/include/${i}/ - done - - for i in corelib declarative gui script; do - cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/ - done -} diff --git a/abs/core/qt/__changelog b/abs/core/qt/__changelog deleted file mode 100644 index 5e878fe..0000000 --- a/abs/core/qt/__changelog +++ /dev/null @@ -1,2 +0,0 @@ -remove cups support, postgresql libs -libfbclient diff --git a/abs/core/qt/qtconfig.desktop b/abs/core/qt/qtconfig.desktop deleted file mode 100644 index 46dcf9e..0000000 --- a/abs/core/qt/qtconfig.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Qt Config -Comment=Configure Qt behavior, styles, fonts -Exec=/usr/bin/qtconfig -Icon=qtlogo -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Settings; -NoDisplay=true diff --git a/abs/core/qt4/CVE-2014-0190.patch b/abs/core/qt4/CVE-2014-0190.patch new file mode 100644 index 0000000..e97ee7b --- /dev/null +++ b/abs/core/qt4/CVE-2014-0190.patch @@ -0,0 +1,32 @@ +Don't crash on broken GIF images + +Broken GIF images could set invalid width and height +values inside the image, leading to Qt creating a null +QImage for it. In that case we need to abort decoding +the image and return an error. + +Initial patch by Rich Moore. + +Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5 + +Task-number: QTBUG-38367 +Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a +Security-advisory: CVE-2014-0190 + +diff -up qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367 qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp +--- qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367 2014-04-10 13:37:12.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp 2014-04-24 15:58:54.515862458 -0500 +@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, co + memset(bits, 0, image->byteCount()); + } + ++ // Check if the previous attempt to create the image failed. If it ++ // did then the image is broken and we should give up. ++ if (image->isNull()) { ++ state = Error; ++ return -1; ++ } ++ + disposePrevious(image); + disposed = false; + diff --git a/abs/core/qt4/PKGBUILD b/abs/core/qt4/PKGBUILD new file mode 100644 index 0000000..f045f76 --- /dev/null +++ b/abs/core/qt4/PKGBUILD @@ -0,0 +1,156 @@ +# $Id$ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=qt4 +pkgver=4.8.6 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL' 'FDL' 'custom') +pkgdesc='A cross-platform application and UI framework' +depends=('libtiff' 'libpng' 'sqlite' 'ca-certificates' 'dbus' + 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng') +makedepends=('mysql' 'unixodbc' 'gtk2' + 'mesa') +optdepends=('qtchooser: set the default Qt toolkit' + 'libmysqlclient: mysql driver' + 'unixodbc: ODBC driver' + 'libfbclient: Firebird/iBase driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support' + 'icu: Unicode support') +install="${pkgname}.install" +replaces=('qt<=4.8.4') +conflicts=('qt') +options=('staticlibs') # libQtUiTools builds as static only +_pkgfqn="qt-everywhere-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz" + 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' + 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop' + 'improve-cups-support.patch' + 'moc-boost-workaround.patch' + 'CVE-2014-0190.patch') +md5sums=('2edbe4d6c2eff33ef91732602f3518eb' + 'a16638f4781e56e7887ff8212a322ecc' + '8a28b3f52dbeb685d4b69440b520a3e1' + '9727c406c240990870c905696a8c5bd1' + '0e384663d3dd32abe35f5331c4147569' + 'b859c5673e5098c39f72b2252947049e' + 'c439c7731c25387352d8453ca7574971' + 'da387bde22ae1c446f12525d2a31f070' + '34ed257109afb83342cfe514c8abe027') + +prepare() { + cd ${_pkgfqn} + + # (FS#28381) (KDEBUG#180051) + patch -p1 -i "${srcdir}"/improve-cups-support.patch + + # QTBUG#22829 + patch -p1 -i "${srcdir}"/moc-boost-workaround.patch + + # QTBUG#38367 + patch -p1 -i "${srcdir}"/CVE-2014-0190.patch + + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf + + cp mkspecs/common/linux{,32}.conf + sed -i "/^QMAKE_LIBDIR\s/s|=|= /usr/lib32|g" mkspecs/common/linux32.conf + sed -i "s|common/linux.conf|common/linux32.conf|" mkspecs/linux-g++-32/qmake.conf +} + +build() { + export QT4DIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + + cd ${_pkgfqn} + + ./configure -confirm-license -opensource \ + -prefix /usr \ + -bindir /usr/lib/qt4/bin \ + -headerdir /usr/include/qt4 \ + -docdir /usr/share/doc/qt4 \ + -plugindir /usr/lib/qt4/plugins \ + -importdir /usr/lib/qt4/imports \ + -datadir /usr/share/qt4 \ + -translationdir /usr/share/qt4/translations \ + -sysconfdir /etc/xdg \ + -examplesdir /usr/share/doc/qt4/examples \ + -demosdir /usr/share/doc/qt4/demos \ + -plugin-sql-{mysql,sqlite,odbc} \ + -system-sqlite \ + -no-phonon \ + -no-phonon-backend \ + -no-webkit \ + -graphicssystem raster \ + -openssl-linked \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -silent \ + -no-rpath \ + -optimized-qmake \ + -reduce-relocations \ + -dbus-linked \ + -no-openvg \ + -v + make +} + +package() { + cd ${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install + + # install missing icons and desktop files + install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ + "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/qt4logo.png + install -D -m644 tools/assistant/tools/assistant/images/assistant.png \ + "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/assistant-qt4.png + install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \ + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/assistant-qt4.png + install -D -m644 tools/designer/src/designer/images/designer.png \ + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/designer-qt4.png + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -D -m644 ${icon} \ + "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/linguist-qt4.png + done + install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer.png \ + "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt4.png + install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \ + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt4.png + + install -d "${pkgdir}"/usr/share/applications + install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig,qdbusviewer}-qt4.desktop \ + "${pkgdir}"/usr/share/applications/ + + # Useful symlinks for cmake and configure scripts + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt4/bin/*; do + ln -s /usr/lib/qt4/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt4 + done + + # install license addition + install -D -m644 LGPL_EXCEPTION.txt \ + ${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt + + # Fix wrong libs path in pkgconfig files + find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; + + # Fix wrong bins path in pkgconfig files + find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ + -exec sed -i 's|/usr/bin/|/usr/lib/qt4/bin/|g' {} \; + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + # The TGA plugin is broken (FS#33568) + rm "${pkgdir}"/usr/lib/qt4/plugins/imageformats/libqtga.so +} diff --git a/abs/core/qt4/__changelog b/abs/core/qt4/__changelog new file mode 100644 index 0000000..e9a8775 --- /dev/null +++ b/abs/core/qt4/__changelog @@ -0,0 +1,3 @@ +PKGBUILD: remove deps cups, postgresql-libs, libfbclient + change mariadb to mysql + change ./configure option to -plugin-sql-{mysql,sqlite,odbc} diff --git a/abs/core/qt/assistant.desktop b/abs/core/qt4/assistant-qt4.desktop index a9e98c4..d874d61 100644 --- a/abs/core/qt/assistant.desktop +++ b/abs/core/qt4/assistant-qt4.desktop @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Qt Assistant -Comment=Shows Qt documentation and examples -Exec=/usr/bin/assistant -Icon=assistant +Name=Qt4 Assistant +Comment=Shows Qt4 documentation and examples +Exec=assistant-qt4 +Icon=assistant-qt4 Terminal=false Encoding=UTF-8 Type=Application diff --git a/abs/core/qt/designer.desktop b/abs/core/qt4/designer-qt4.desktop index 9b7b6e9..86ea4ed 100644 --- a/abs/core/qt/designer.desktop +++ b/abs/core/qt4/designer-qt4.desktop @@ -1,9 +1,9 @@ [Desktop Entry] -Name=Qt Designer +Name=Qt4 Designer GenericName=Interface Designer -Comment=Design GUIs for Qt applications -Exec=/usr/bin/designer -Icon=designer +Comment=Design GUIs for Qt4 applications +Exec=designer-qt4 +Icon=designer-qt4 MimeType=application/x-designer; Terminal=false Encoding=UTF-8 diff --git a/abs/core/qt/fix-assistant-crash.patch b/abs/core/qt4/fix-assistant-crash.patch index 67bbbc4..67bbbc4 100644 --- a/abs/core/qt/fix-assistant-crash.patch +++ b/abs/core/qt4/fix-assistant-crash.patch diff --git a/abs/core/qt/improve-cups-support.patch b/abs/core/qt4/improve-cups-support.patch index e0305e1..e0305e1 100644 --- a/abs/core/qt/improve-cups-support.patch +++ b/abs/core/qt4/improve-cups-support.patch diff --git a/abs/core/qt/linguist.desktop b/abs/core/qt4/linguist-qt4.desktop index 8cbe865..765c882 100644 --- a/abs/core/qt/linguist.desktop +++ b/abs/core/qt4/linguist-qt4.desktop @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Qt Linguist -Comment=Add translations to Qt applications -Exec=/usr/bin/linguist -Icon=linguist +Name=Qt4 Linguist +Comment=Add translations to Qt4 applications +Exec=linguist-qt4 +Icon=linguist-qt4 MimeType=text/vnd.trolltech.linguist;application/x-linguist; Terminal=false Encoding=UTF-8 diff --git a/abs/core/qt4/moc-boost-workaround.patch b/abs/core/qt4/moc-boost-workaround.patch new file mode 100644 index 0000000..027f806 --- /dev/null +++ b/abs/core/qt4/moc-boost-workaround.patch @@ -0,0 +1,12 @@ +diff -upr qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp +--- qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp 2014-04-10 21:37:12.000000000 +0300 ++++ qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp 2014-11-06 02:24:44.287305916 +0200 +@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv) + + // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829 + pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; ++ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; ++ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"]; + + QByteArray filename; + QByteArray output; diff --git a/abs/core/qt4/qdbusviewer-qt4.desktop b/abs/core/qt4/qdbusviewer-qt4.desktop new file mode 100644 index 0000000..2d4218c --- /dev/null +++ b/abs/core/qt4/qdbusviewer-qt4.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt4 QDbusViewer +GenericName=D-Bus Debugger +Comment=Debug D-Bus applications +Exec=qdbusviewer-qt4 +Icon=qdbusviewer-qt4 +Terminal=false +Type=Application +Categories=Qt;Development;Debugger; + diff --git a/abs/core/qt/qt.install b/abs/core/qt4/qt4.install index 5495fb1..5495fb1 100644 --- a/abs/core/qt/qt.install +++ b/abs/core/qt4/qt4.install diff --git a/abs/core/qt4/qtconfig-qt4.desktop b/abs/core/qt4/qtconfig-qt4.desktop new file mode 100644 index 0000000..5789631 --- /dev/null +++ b/abs/core/qt4/qtconfig-qt4.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt4 Config +Comment=Configure Qt4 behavior, styles, fonts +Exec=qtconfig-qt4 +Icon=qt4logo +Terminal=false +Type=Application +Categories=Qt;Settings; +NoDisplay=true diff --git a/abs/core/qtwebkit/PKGBUILD b/abs/core/qtwebkit/PKGBUILD index 8c289f4..f02a975 100644 --- a/abs/core/qtwebkit/PKGBUILD +++ b/abs/core/qtwebkit/PKGBUILD @@ -1,106 +1,66 @@ -# $Id: PKGBUILD 159414 2012-05-23 22:31:17Z andrea $ +# $Id$ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit -pkgver=2.2.2 +pkgver=2.3.4 pkgrel=1 arch=('i686' 'x86_64') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' license=('LGPL2.1' 'GPL3') -depends=('qt' 'gstreamer0.10-base') -makedepends=('python2' 'mesa' 'gperf') +depends=('qt4' 'systemd' 'gst-plugins-base-libs') +makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa') conflicts=('qt<4.8') -_qtver=4.8.2 -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-source.tar.gz" - "ftp://ftp.archlinux.org/other/${pkgname}/qwebview-${_qtver}.tar.xz" - 'glibc.patch' - 'fix-build.patch') -sha1sums=('914d7cc099e5b6181c2d74fc7a74e1b4478b75a4' - '33c83272ed8110180ee6e7e3733e68cc513e2802' - '9e47ba5725a2ebd072b8bff31fa2f71aa83f0333' - 'c6dfb001b0412a8adfcb7f1f565a24314a753448') +_qtver=4.8.6 +source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz" + "http://download.qt-project.org/official_releases/qt/4.8/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz" + 'use-python2.patch' + 'qwebview.patch') +sha1sums=('31bc60de1cf26bb0766d539b4d564651ddbb0650' + 'ddf9c20ca8309a116e0466c42984238009525da6' + '315b6ff603f35e5492a036f7082f6aa075dfb607' + 'c3df6107233f466a032e36681cee07f16536657c') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/use-python2.patch + + cd ../qt-everywhere-opensource-src-${_qtver} + patch -p1 -i "${srcdir}"/qwebview.patch +} build() { - cd "${srcdir}"/${pkgname}-${pkgver}-source - - patch -p1 -i "${srcdir}"/glibc.patch - patch -p1 -i "${srcdir}"/fix-build.patch - - # move headers - mv include Source/ + cd ${pkgname}-${pkgver} - cd Source - qmake - cd ../ + OPTS="--no-webkit2" + if [ "${CARCH}" = "i686" ]; then + # FS#33418 + OPTS="${OPTS} --no-force-sse2" + fi - make -C Source + export QTDIR=/usr + export PATH="/usr/lib/qt4/bin:$PATH" + Tools/Scripts/build-webkit --qt \ + --makeargs="${MAKEFLAGS}" \ + --prefix=/usr \ + ${OPTS} # Build the QWebView plugin (FS#27914) - cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview - qmake + cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview + qmake-qt4 make } package() { - cd "${srcdir}"/${pkgname}-${pkgver}-source - make INSTALL_ROOT="${pkgdir}" -C Source install + cd ${pkgname}-${pkgver} + make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install - cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview + cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview make INSTALL_ROOT="${pkgdir}" install -} - -_source() { - local _current_dir=$(pwd) - local _tmp=$(mktemp -d --tmpdir) - - cd _tmp - git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git - - # fetch the make-package.py script - git clone git://qt.gitorious.org/qtwebkit/tools.git - - # create the qtwebkit tarball - cd qtwebkit - git checkout -b ${pkgname}-${pkgver} ${pkgname}-${pkgver} - - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - ../tools/make-package.py - python2 ../tools/make-package.py - - mv ${pkgname}-${pkgver}-source.tar.gz ${_current_dir}/ - - cd .. - - # create the qwebview plugin tarball - mkdir qwebview-${_qtver} - cd qwebview-${_qtver} - wget http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz - tar xf qt-everywhere-opensource-src-${_qtver}.tar.gz - mkdir -p ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/ - cp -ra qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview \ - ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/ - - cat > ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pro <<"EOF" -TEMPLATE = subdirs -CONFIG += ordered - -REQUIRES = !CONFIG(static,shared|static) -contains(QT_CONFIG, webkit): SUBDIRS += qwebview -EOF - - cat > $(_tmp)/header.txt <<"EOF" -INCLUDEPATH += ../../../Source/include -LIBS += -L../../../Source/lib - -EOF - - cat $(_tmp)/header.txt qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/plugins.pri > \ - ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pri - - tar cJf qwebview-${_qtver}.tar.xz ${pkgname}-${pkgver}-source - mv qwebview-${_qtver}.tar.xz ${_current_dir}/ + # Fix wrong libs path in pkgconfig file + perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/QtWebKit.pc - rm -rf ${_tmp} + # Fix wrong path in prl file + sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' "${pkgdir}"/usr/lib/libQtWebKit.prl } diff --git a/abs/core/qtwebkit/fix-build.patch b/abs/core/qtwebkit/fix-build.patch deleted file mode 100644 index 46313bb..0000000 --- a/abs/core/qtwebkit/fix-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror qtwebkit-2.2.2-source/Source/WebKit.pri ---- qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror 2012-05-22 09:30:37.000000000 -0500 -+++ qtwebkit-2.2.2-source/Source/WebKit.pri 2012-05-22 09:51:42.126610618 -0500 -@@ -102,7 +102,7 @@ CONFIG -= warn_on - - # Treat warnings as errors on x86/Linux/GCC - linux-g++* { -- !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -+ #!CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror - - greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { - if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) { - -diff -up webkit-qtwebkit/Source/common.pri.me webkit-qtwebkit/Source/common.pri ---- webkit-qtwebkit/Source/common.pri.me 2012-01-24 14:51:49.000000000 +0100 -+++ webkit-qtwebkit/Source/common.pri 2012-01-24 14:52:01.000000000 +0100 -@@ -3,12 +3,12 @@ - contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 - contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 - --linux-g++ { --isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -- message(Using gold linker) -- QMAKE_LFLAGS+=-fuse-ld=gold --} --} -+#linux-g++ { -+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -+# message(Using gold linker) -+# QMAKE_LFLAGS+=-fuse-ld=gold -+#} -+#} - - # We use this flag on production branches - # See https://bugs.webkit.org/show_bug.cgi?id=60824 -diff -up webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h.me webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h diff --git a/abs/core/qtwebkit/glibc.patch b/abs/core/qtwebkit/glibc.patch deleted file mode 100644 index bd7cb94..0000000 --- a/abs/core/qtwebkit/glibc.patch +++ /dev/null @@ -1,339 +0,0 @@ -diff -up webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am ---- webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 2011-11-09 16:32:47.000000000 +0100 -+++ webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am 2011-12-21 12:50:19.000000000 +0100 -@@ -438,7 +438,6 @@ javascriptcore_sources += \ - Source/JavaScriptCore/wtf/gobject/GRefPtr.h \ - Source/JavaScriptCore/wtf/gobject/GTypedefs.h \ - Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \ -- Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \ - Source/JavaScriptCore/wtf/HashCountedSet.h \ - Source/JavaScriptCore/wtf/HashFunctions.h \ - Source/JavaScriptCore/wtf/HashIterators.h \ -diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp ---- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 2011-11-09 16:32:47.000000000 +0100 -+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp 2011-12-21 12:50:19.000000000 +0100 -@@ -37,18 +37,6 @@ template <> void freeOwnedGPtr<GList>(GL - g_list_free(ptr); - } - --template <> void freeOwnedGPtr<GCond>(GCond* ptr) --{ -- if (ptr) -- g_cond_free(ptr); --} -- --template <> void freeOwnedGPtr<GMutex>(GMutex* ptr) --{ -- if (ptr) -- g_mutex_free(ptr); --} -- - template <> void freeOwnedGPtr<GPatternSpec>(GPatternSpec* ptr) - { - if (ptr) -diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h ---- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 2011-11-09 16:32:47.000000000 +0100 -+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h 2011-12-21 12:50:19.000000000 +0100 -@@ -35,8 +35,6 @@ namespace WTF { - template <typename T> inline void freeOwnedGPtr(T* ptr); - template<> void freeOwnedGPtr<GError>(GError*); - template<> void freeOwnedGPtr<GList>(GList*); --template<> void freeOwnedGPtr<GCond>(GCond*); --template<> void freeOwnedGPtr<GMutex>(GMutex*); - template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*); - template<> void freeOwnedGPtr<GDir>(GDir*); - -diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h ---- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 2011-11-09 16:32:47.000000000 +0100 -+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2011-12-21 12:50:19.000000000 +0100 -@@ -39,7 +39,6 @@ typedef void* gpointer; - typedef struct _GAsyncResult GAsyncResult; - typedef struct _GCancellable GCancellable; - typedef struct _GCharsetConverter GCharsetConverter; --typedef struct _GCond GCond; - typedef struct _GDir GDir; - typedef struct _GdkAtom* GdkAtom; - typedef struct _GdkCursor GdkCursor; -@@ -52,7 +51,6 @@ typedef struct _GFile GFile; - typedef struct _GHashTable GHashTable; - typedef struct _GInputStream GInputStream; - typedef struct _GList GList; --typedef struct _GMutex GMutex; - typedef struct _GPatternSpec GPatternSpec; - typedef struct _GPollableOutputStream GPollableOutputStream; - typedef struct _GSocketClient GSocketClient; -diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp ---- webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231 2011-12-21 12:52:25.000000000 +0100 -+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp 2011-12-21 12:52:28.000000000 +0100 -@@ -1,248 +0,0 @@ --/* -- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. -- * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com) -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 3. Neither the name of Apple Inc. ("Apple") nor the names of -- * its contributors may be used to endorse or promote products derived -- * from this software without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY -- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY -- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -- --#include "config.h" --#include "Threading.h" -- --#if !USE(PTHREADS) -- --#include "CurrentTime.h" --#include "HashMap.h" --#include "MainThread.h" --#include "RandomNumberSeed.h" --#include <wtf/StdLibExtras.h> -- --#include <glib.h> --#include <limits.h> -- --namespace WTF { -- --typedef HashMap<ThreadIdentifier, GThread*> ThreadMap; -- --static Mutex* atomicallyInitializedStaticMutex; -- --static Mutex& threadMapMutex() --{ -- DEFINE_STATIC_LOCAL(Mutex, mutex, ()); -- return mutex; --} -- --void initializeThreading() --{ -- if (!g_thread_supported()) -- g_thread_init(NULL); -- ASSERT(g_thread_supported()); -- -- if (!atomicallyInitializedStaticMutex) { -- atomicallyInitializedStaticMutex = new Mutex; -- threadMapMutex(); -- initializeRandomNumberGenerator(); -- } --} -- --void lockAtomicallyInitializedStaticMutex() --{ -- ASSERT(atomicallyInitializedStaticMutex); -- atomicallyInitializedStaticMutex->lock(); --} -- --void unlockAtomicallyInitializedStaticMutex() --{ -- atomicallyInitializedStaticMutex->unlock(); --} -- --static ThreadMap& threadMap() --{ -- DEFINE_STATIC_LOCAL(ThreadMap, map, ()); -- return map; --} -- --static ThreadIdentifier identifierByGthreadHandle(GThread*& thread) --{ -- MutexLocker locker(threadMapMutex()); -- -- ThreadMap::iterator i = threadMap().begin(); -- for (; i != threadMap().end(); ++i) { -- if (i->second == thread) -- return i->first; -- } -- -- return 0; --} -- --static ThreadIdentifier establishIdentifierForThread(GThread*& thread) --{ -- ASSERT(!identifierByGthreadHandle(thread)); -- -- MutexLocker locker(threadMapMutex()); -- -- static ThreadIdentifier identifierCount = 1; -- -- threadMap().add(identifierCount, thread); -- -- return identifierCount++; --} -- --static GThread* threadForIdentifier(ThreadIdentifier id) --{ -- MutexLocker locker(threadMapMutex()); -- -- return threadMap().get(id); --} -- --static void clearThreadForIdentifier(ThreadIdentifier id) --{ -- MutexLocker locker(threadMapMutex()); -- -- ASSERT(threadMap().contains(id)); -- -- threadMap().remove(id); --} -- --ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*) --{ -- GThread* thread; -- if (!(thread = g_thread_create(entryPoint, data, TRUE, 0))) { -- LOG_ERROR("Failed to create thread at entry point %p with data %p", entryPoint, data); -- return 0; -- } -- -- ThreadIdentifier threadID = establishIdentifierForThread(thread); -- return threadID; --} -- --void initializeCurrentThreadInternal(const char*) --{ --} -- --int waitForThreadCompletion(ThreadIdentifier threadID, void** result) --{ -- ASSERT(threadID); -- -- GThread* thread = threadForIdentifier(threadID); -- -- void* joinResult = g_thread_join(thread); -- if (result) -- *result = joinResult; -- -- clearThreadForIdentifier(threadID); -- return 0; --} -- --void detachThread(ThreadIdentifier) --{ --} -- --ThreadIdentifier currentThread() --{ -- GThread* currentThread = g_thread_self(); -- if (ThreadIdentifier id = identifierByGthreadHandle(currentThread)) -- return id; -- return establishIdentifierForThread(currentThread); --} -- --void yield() --{ -- g_thread_yield(); --} -- --Mutex::Mutex() -- : m_mutex(g_mutex_new()) --{ --} -- --Mutex::~Mutex() --{ --} -- --void Mutex::lock() --{ -- g_mutex_lock(m_mutex.get()); --} -- --bool Mutex::tryLock() --{ -- return g_mutex_trylock(m_mutex.get()); --} -- --void Mutex::unlock() --{ -- g_mutex_unlock(m_mutex.get()); --} -- --ThreadCondition::ThreadCondition() -- : m_condition(g_cond_new()) --{ --} -- --ThreadCondition::~ThreadCondition() --{ --} -- --void ThreadCondition::wait(Mutex& mutex) --{ -- g_cond_wait(m_condition.get(), mutex.impl().get()); --} -- --bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime) --{ -- // Time is in the past - return right away. -- if (absoluteTime < currentTime()) -- return false; -- -- // Time is too far in the future for g_cond_timed_wait - wait forever. -- if (absoluteTime > INT_MAX) { -- wait(mutex); -- return true; -- } -- -- int timeSeconds = static_cast<int>(absoluteTime); -- int timeMicroseconds = static_cast<int>((absoluteTime - timeSeconds) * 1000000.0); -- -- GTimeVal targetTime; -- targetTime.tv_sec = timeSeconds; -- targetTime.tv_usec = timeMicroseconds; -- -- return g_cond_timed_wait(m_condition.get(), mutex.impl().get(), &targetTime); --} -- --void ThreadCondition::signal() --{ -- g_cond_signal(m_condition.get()); --} -- --void ThreadCondition::broadcast() --{ -- g_cond_broadcast(m_condition.get()); --} -- -- --} -- --#endif // !USE(PTHREADS) -diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h ---- webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 2011-11-09 16:32:47.000000000 +0100 -+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h 2011-12-21 12:50:19.000000000 +0100 -@@ -44,8 +44,6 @@ - - #if USE(PTHREADS) - #include <pthread.h> --#elif PLATFORM(GTK) --#include "GOwnPtr.h" - #endif - - #if PLATFORM(QT) -@@ -66,10 +64,6 @@ typedef pthread_rwlock_t PlatformReadWri - typedef void* PlatformReadWriteLock; - #endif - typedef pthread_cond_t PlatformCondition; --#elif PLATFORM(GTK) --typedef GOwnPtr<GMutex> PlatformMutex; --typedef void* PlatformReadWriteLock; // FIXME: Implement. --typedef GOwnPtr<GCond> PlatformCondition; - #elif PLATFORM(QT) - typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex; - typedef void* PlatformReadWriteLock; // FIXME: Implement. diff --git a/abs/core/qtwebkit/qwebview.patch b/abs/core/qtwebkit/qwebview.patch new file mode 100644 index 0000000..066bc79 --- /dev/null +++ b/abs/core/qtwebkit/qwebview.patch @@ -0,0 +1,21 @@ +--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000 ++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000 +@@ -1,3 +1,6 @@ ++INCLUDEPATH += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include ++LIBS += -L../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/lib ++ + CONFIG += designer + win32|mac: CONFIG+= debug_and_release + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000 ++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000 +@@ -2,9 +2,4 @@ + CONFIG += ordered + + REQUIRES = !CONFIG(static,shared|static) +-contains(QT_CONFIG, qt3support): SUBDIRS += widgets +-win32: SUBDIRS += activeqt +-# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d + contains(QT_CONFIG, webkit): SUBDIRS += qwebview +-contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets +-contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview diff --git a/abs/core/qtwebkit/use-python2.patch b/abs/core/qtwebkit/use-python2.patch new file mode 100644 index 0000000..b144443 --- /dev/null +++ b/abs/core/qtwebkit/use-python2.patch @@ -0,0 +1,57 @@ +--- webkit-qtwebkit-23/Source/JavaScriptCore/DerivedSources.pri~ 2013-01-09 11:29:16.452266719 +0000 ++++ webkit-qtwebkit-23/Source/JavaScriptCore/DerivedSources.pri 2013-01-09 11:30:18.188538725 +0000 +@@ -85,14 +85,14 @@ + retgen.output = RegExpJitTables.h + retgen.script = $$PWD/create_regex_tables + retgen.input = retgen.script +-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} ++retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT} + GENERATORS += retgen + + #GENERATOR: "KeywordLookup.h": decision tree used by the lexer + klgen.output = KeywordLookup.h + klgen.script = $$PWD/KeywordLookupGenerator.py + klgen.input = KEYWORDLUT_FILES +-klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} ++klgen.commands = python2 $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} + GENERATORS += klgen + + EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION +@@ -117,7 +117,7 @@ + disassembler.input = DISASSEMBLER_FILES + disassembler.script = $$PWD/disassembler/udis86/itab.py + disassembler.depends = $$DISASSEMBLER_DEPENDENCY +- disassembler.commands = python $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} ++ disassembler.commands = python2 $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} + disassembler.CONFIG += no_link + GENERATORS += disassembler + } +--- webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri~ 2013-01-09 11:46:01.165612894 +0000 ++++ webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri 2013-01-09 11:46:27.465404725 +0000 +@@ -779,7 +779,7 @@ + inspectorValidate.output = InspectorProtocolVersion.h + inspectorValidate.input = INSPECTOR_JSON + inspectorValidate.script = $$PWD/inspector/generate-inspector-protocol-version +-inspectorValidate.commands = python $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} ++inspectorValidate.commands = python2 $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} + inspectorValidate.depends = $$PWD/inspector/generate-inspector-protocol-version + inspectorValidate.add_output_to_sources = false + GENERATORS += inspectorValidate +@@ -787,7 +787,7 @@ + inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp InspectorTypeBuilder.cpp + inspectorJSON.input = INSPECTOR_JSON + inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py +-inspectorJSON.commands = python $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH} ++inspectorJSON.commands = python2 $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH} + inspectorJSON.depends = $$inspectorJSON.script + GENERATORS += inspectorJSON + +@@ -908,7 +908,7 @@ + entities.output = HTMLEntityTable.cpp + entities.input = HTML_ENTITIES + entities.script = $$PWD/html/parser/create-html-entity-table +-entities.commands = python $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES ++entities.commands = python2 $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES + entities.clean = ${QMAKE_FILE_OUT} + entities.depends = $$PWD/html/parser/create-html-entity-table + GENERATORS += entities diff --git a/abs/core/rsyslog/PKGBUILD b/abs/core/rsyslog/PKGBUILD index 638c68d..89739bc 100644 --- a/abs/core/rsyslog/PKGBUILD +++ b/abs/core/rsyslog/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=5.8.6 -pkgrel=12 +pkgver=5.8.13 +pkgrel=3 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') @@ -47,9 +47,9 @@ package() { install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} install -D -m755 ${srcdir}/log_care.sh ${pkgdir}/etc/cron.daily/log_care } -md5sums=('c46db0496066b82faf735bd4222208d7' +md5sums=('8d228a8b622f90b320c95f38be7fc5bb' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '1a0cd4530dd5d1439456d5ae230574d9' - 'a4dd3846116b02f35d48c8987b30394b' + '8dd27270e882e8707924dbca0c66f66f' 'c71fa75857ff7b9e24e41457e89c76ca' 'cd39e6edc1fcbbae2093c40c880e0079') diff --git a/abs/core/rsyslog/rsyslog.conf.linhes b/abs/core/rsyslog/rsyslog.conf.linhes index ecdc1f4..dc1317c 100644 --- a/abs/core/rsyslog/rsyslog.conf.linhes +++ b/abs/core/rsyslog/rsyslog.conf.linhes @@ -10,6 +10,8 @@ $ModLoad imuxsock # provides support for local system logging (e.g. via logger c $ModLoad imklog # kernel logging (formerly provided by rklogd) $FileCreateMode 0644 $DirCreateMode 0755 +$SystemLogRateLimitInterval 2 +$SystemLogRateLimitBurst 500 # Log all kernel messages to the console. # Logging much else clutters up the screen. @@ -21,10 +23,13 @@ $template DynCron,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_cron.log" $template DynBoot,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_boot.log" $template DynSpooler,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_spooler.log" $template DynLighttpd,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_lighttpd.log" +$template DynMythExpress,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythexpress.log" if $programname contains 'lighttpd' then ?DynLighttpd & ~ +if $programname startswith 'mythexpress' then ?DynMythExpress +& ~ # Log anything (except mail) of level info or higher. # Don't log private authentication messages! diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index fd78f72..de02476 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts -pkgver=8.2 -pkgrel=3 +pkgver=8.3 +pkgrel=6 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runit.install b/abs/core/runit-scripts/runit.install index 4ec6a9f..3cf5036 100755 --- a/abs/core/runit-scripts/runit.install +++ b/abs/core/runit-scripts/runit.install @@ -39,6 +39,12 @@ post_upgrade(){ then rm -r /etc/sv/lircd fi + + # add irexec + if [ -e /service/remotes ] && [ ! -e /service/irexec ] + then + add_service.sh irexec + fi } diff --git a/abs/core/runit-scripts/runitscripts/1 b/abs/core/runit-scripts/runitscripts/1 index 9f92530..05c3707 100755 --- a/abs/core/runit-scripts/runitscripts/1 +++ b/abs/core/runit-scripts/runitscripts/1 @@ -55,4 +55,10 @@ run_hook multi_start mountpoint -q /proc/sys/fs/binfmt_misc || mount /proc/sys/fs/binfmt_misc &>/dev/null || mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc /usr/lib/systemd/systemd-binfmt +# Stop bootlogd and clean up /var/log/boot +bootlogd_stop +sed -i -r -e 's/\^\[\[[0-9]?;?[0-9]?[0-9]?;?[0-9]?[0-9]?[ms]//g' \ + -e 's/\^\[(\[1?[0-9]1|%)G//g' -e 's/\^\[\[0;1//g' \ + -e 's/\^\[(\[?[0-9]{1,})G//g' /var/log/boot + rm -f /run/nologin diff --git a/abs/core/runit-scripts/runitscripts/3 b/abs/core/runit-scripts/runitscripts/3 index 062f2c6..2a9fb0d 100755 --- a/abs/core/runit-scripts/runitscripts/3 +++ b/abs/core/runit-scripts/runitscripts/3 @@ -13,6 +13,10 @@ if [ -e "$pidfile" ]; then plypid=`cat "$pidfile"` if [ -n "$plypid" ]; then kill -s CONT "$plypid" + plymouthd --mode=shutdown --pid-file=/run/plymouthd + plymouth --show-splash + kill "$plypid" + add_omit_pids `cat /run/plymouthd` fi fi @@ -42,6 +46,4 @@ ethtool -s eth0 wol g 2>/dev/null ethtool -s eth1 wol g 2>/dev/null ethtool -s eth2 wol g 2>/dev/null -plymouth quit --retain-splash - /etc/rc.shutdown diff --git a/abs/core/runit-scripts/runitscripts/services/irexec/run b/abs/core/runit-scripts/runitscripts/services/irexec/run new file mode 100644 index 0000000..01b775a --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/irexec/run @@ -0,0 +1,14 @@ +#!/bin/sh +exec 2>&1 +export TERM=linux + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/profile + +if [[ -z $(pidof lircd) ]]; then + stat_runit "No lircd process, can't start irexec" +else + stat_runit "Starting irexec" + exec /usr/bin/irexec /etc/lircrc +fi diff --git a/abs/core/runit-scripts/runitscripts/services/mythexpress/run b/abs/core/runit-scripts/runitscripts/services/mythexpress/run index 06e4a1b..05c9b17 100755 --- a/abs/core/runit-scripts/runitscripts/services/mythexpress/run +++ b/abs/core/runit-scripts/runitscripts/services/mythexpress/run @@ -5,4 +5,4 @@ export TERM=linux . /etc/rc.d/functions /usr/bin/svwaitup -s 10 /service/avahi stat_runit "Starting MythExpress" -exec chpst -u http node /usr/mythexpress/app.js +exec chpst -u http node /usr/mythexpress/mythexpress.js diff --git a/abs/core/runit-scripts/runitscripts/services/pwrstatd/run b/abs/core/runit-scripts/runitscripts/services/pwrstatd/run new file mode 100755 index 0000000..3b9c029 --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/pwrstatd/run @@ -0,0 +1,8 @@ +#!/bin/sh +exec 2>&1 + +. /etc/rc.conf +. /etc/rc.d/functions + +stat_runit "Starting CyberPower PowerPanel Daemon" +exec /usr/bin/pwrstatd diff --git a/abs/core/runit-scripts/runitscripts/services/xvnc/run b/abs/core/runit-scripts/runitscripts/services/xvnc/run new file mode 100644 index 0000000..c1ef573 --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/xvnc/run @@ -0,0 +1,17 @@ +#!/bin/sh +exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions + +sv start frontend || exit 1 + +stat_runit "Starting x11vnc" +. /etc/systemconfig +if [ -e /etc/x11vnc.cfg ] +then + . /etc/x11vnc.cfg + exec chpst -umythtv x11vnc $x11vnc_options +else + exec chpst -umythtv x11vnc -forever -rfbport 5902 --passwd $xvncpassword +fi diff --git a/abs/core/sdl/PKGBUILD b/abs/core/sdl/PKGBUILD index 9e3b3e3..4a86859 100644 --- a/abs/core/sdl/PKGBUILD +++ b/abs/core/sdl/PKGBUILD @@ -1,35 +1,67 @@ -# $Id: PKGBUILD 147154 2012-01-23 14:30:05Z heftig $ +# $Id$ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=sdl pkgver=1.2.15 -pkgrel=1 +pkgrel=7 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" arch=('i686' 'x86_64') url="http://www.libsdl.org" license=('LGPL') depends=('glibc' 'libxext' 'libxrender' 'libx11') -makedepends=('alsa-lib' 'mesa' ) -options=('!libtool') +makedepends=('alsa-lib' 'mesa' 'glu') +optdepends=('alsa-lib: ALSA audio driver') +options=('staticlibs') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz + SDL-1.2.10-GrabNotViewable.patch + SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch + SDL-1.2.15-const_XData32.patch + SDL-1.2.15-ignore_insane_joystick_axis.patch + SDL-1.2.15-no-default-backing-store.patch + SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-disable-mmx.patch) + sdl-1.2.14-disable-mmx.patch + libsdl-1.2.15-resizing.patch + X11_KeyToUnicode.patch) md5sums=('9d96df8417572a2afb781a7c4c811a85' + '37ad001a4d2ff924a5fab356b49f8a78' + '8d5a61a0adf1a302695a30141f402712' + 'd6a1bfa054507f281338626e5f12d74b' + 'e382e5b7449e95969c5ba4084b0aab39' + '1b0578c76453813eb4eaf0125ce242db' + '321377e38e2db7f1baf43c392e165dd5' '04d8c179f125e04bcd4c9d60e013c2d7' - 'e5c16b7611f62c7cb25f0534eff68852') + 'e5c16b7611f62c7cb25f0534eff68852' + '3dd50347d8856160a9cbd7f80383a1f8' + 'edea272dff4698470877c016d818918d') + +prepare() { + cd SDL-$pkgver + patch -Np1 -i ../SDL-1.2.10-GrabNotViewable.patch + patch -Np1 -i ../SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch + patch -Np1 -i ../SDL-1.2.15-const_XData32.patch + patch -Np1 -i ../SDL-1.2.15-ignore_insane_joystick_axis.patch + patch -Np1 -i ../SDL-1.2.15-no-default-backing-store.patch + + # https://bugs.freedesktop.org/show_bug.cgi?id=27222 + patch -Np1 -i ../SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch + + patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch + patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch + patch -Np1 -i ../libsdl-1.2.15-resizing.patch + patch -Np1 -i ../X11_KeyToUnicode.patch +} build() { - cd ${srcdir}/SDL-${pkgver} - patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch - ./configure --prefix=/usr --disable-nasm --enable-alsa --disable-esd \ + cd SDL-$pkgver + ./configure --prefix=/usr --disable-nasm --enable-alsa \ --with-x --disable-rpath --disable-static make } package() { - cd ${srcdir}/SDL-${pkgver} - make DESTDIR=${pkgdir} install + cd SDL-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/abs/core/sdl/SDL-1.2.10-GrabNotViewable.patch b/abs/core/sdl/SDL-1.2.10-GrabNotViewable.patch new file mode 100644 index 0000000..128cf35 --- /dev/null +++ b/abs/core/sdl/SDL-1.2.10-GrabNotViewable.patch @@ -0,0 +1,22 @@ +Makes SDL-1.2 SDL_WM_GrabInput() non-blocking in case of SDL window is not +viewable. Patch provided by <pbonzini@redhat.com>. +See <http://bugzilla.libsdl.org/show_bug.cgi?id=1155>. + +--- ./src/video/x11/SDL_x11wm.c 2007-12-31 04:48:13.000000000 +0000 ++++ ./src/video/x11/SDL_x11wm.c 2009-01-15 10:27:14.000000000 +0000 +@@ -351,13 +351,14 @@ SDL_GrabMode X11_GrabInputNoLock(_THIS, + result = XGrabPointer(SDL_Display, SDL_Window, True, 0, + GrabModeAsync, GrabModeAsync, + SDL_Window, None, CurrentTime); +- if ( result == GrabSuccess ) { ++ if ( result == GrabSuccess || result == GrabNotViewable ) { + break; + } + SDL_Delay(100); + } + if ( result != GrabSuccess ) { + /* Uh, oh, what do we do here? */ ; ++ return(SDL_GRAB_OFF); + } + /* Now grab the keyboard */ + XGrabKeyboard(SDL_Display, WMwindow, True, diff --git a/abs/core/sdl/SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch b/abs/core/sdl/SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch new file mode 100644 index 0000000..fdf910e --- /dev/null +++ b/abs/core/sdl/SDL-1.2.15-SDL_EnableUNICODE_drops_keyboard_events.patch @@ -0,0 +1,73 @@ +# HG changeset patch +# User Sam Lantinga <slouken@libsdl.org> +# Date 1397799374 25200 +# Thu Apr 17 22:36:14 2014 -0700 +# Branch SDL-1.2 +# Node ID 0aade9c0203f717fe4b823a176c3c040f1a709f8 +# Parent 22a7f096bb9d4d596f35a93e33608825693462b0 +Fixed bug 2325 - SDL_EnableUNICODE sometimes drops keyboard events completely + +Rafał Mużyło + +The most annoying part of this bug is that though I've found it in two separate apps, I don't have a trivial testcase for it. + +The problem seems to be a condition race, as it's triggered quite randomly (therefore it will be hard to tell whether it really gets fixed, if a probable fix is found). + +While it's specific to SDL 1.2, it seems quite similar to the problem described and fixed in http://forums.libsdl.org/viewtopic.php?p=40503. + +Now, I should start describing the problem. + +A game uses Escape to open menu (the exact key might not be important). Upon opening, it calls SDL_EnableUNICODE(1). Upon closing it calls SDL_EnableUNICODE(0). + +I have an IME running. + +Game uses SDL_PollEvent to get the events. + +If Escape is pressed repeatedly, menu is opened and closed, till it eventually freezes in open state. +"freezes" in this context means "app itself still runs, but no keyboard events are getting delivered (though - for example - mouse events still are)". "getting delivered" should mean "SDL_PollEvent is not receiving any". +If it matters, the last delivered keyboard event is a keypress, the release never arrives. + +It seems (no guarantees, due to random nature of the freeze) that unsetting XMODIFIERS (which - AFAIU - will disable IME as far as SDL is concerned) prevents the freeze, therefore the reference to that SDL2 thread. + +diff -r 22a7f096bb9d -r 0aade9c0203f src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Sun Dec 01 00:00:17 2013 -0500 ++++ b/src/video/x11/SDL_x11events.c Thu Apr 17 22:36:14 2014 -0700 +@@ -395,6 +395,8 @@ + { + int posted; + XEvent xevent; ++ int orig_event_type; ++ KeyCode orig_keycode; + + SDL_memset(&xevent, '\0', sizeof (XEvent)); /* valgrind fix. --ryan. */ + XNextEvent(SDL_Display, &xevent); +@@ -410,9 +412,29 @@ + #ifdef X_HAVE_UTF8_STRING + /* If we are translating with IM, we need to pass all events + to XFilterEvent, and discard those filtered events immediately. */ ++ orig_event_type = xevent.type; ++ if (orig_event_type == KeyPress || orig_event_type == KeyRelease) { ++ orig_keycode = xevent.xkey.keycode; ++ } else { ++ orig_keycode = 0; ++ } + if ( SDL_TranslateUNICODE + && SDL_IM != NULL + && XFilterEvent(&xevent, None) ) { ++ if (orig_keycode) { ++ SDL_keysym keysym; ++ static XComposeStatus state; ++ char keybuf[32]; ++ ++ keysym.scancode = xevent.xkey.keycode; ++ keysym.sym = X11_TranslateKeycode(SDL_Display, xevent.xkey.keycode); ++ keysym.mod = KMOD_NONE; ++ keysym.unicode = 0; ++ if (orig_event_type == KeyPress && XLookupString(&xevent.xkey, keybuf, sizeof(keybuf), NULL, &state)) ++ keysym.unicode = (Uint8)keybuf[0]; ++ ++ SDL_PrivateKeyboard(orig_event_type == KeyPress ? SDL_PRESSED : SDL_RELEASED, &keysym); ++ } + return 0; + } + #endif diff --git a/abs/core/sdl/SDL-1.2.15-const_XData32.patch b/abs/core/sdl/SDL-1.2.15-const_XData32.patch new file mode 100644 index 0000000..0f1c07c --- /dev/null +++ b/abs/core/sdl/SDL-1.2.15-const_XData32.patch @@ -0,0 +1,16 @@ +libX11-1.5.99.901 has changed prototype of _XData32 + +<http://bugzilla.libsdl.org/show_bug.cgi?id=1769> + +diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h +--- a/src/video/x11/SDL_x11sym.h Wed Feb 27 15:20:31 2013 -0800 ++++ b/src/video/x11/SDL_x11sym.h Wed Mar 27 16:07:23 2013 +0100 +@@ -165,7 +165,7 @@ + */ + #ifdef LONG64 + SDL_X11_MODULE(IO_32BIT) +-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) ++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) + SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) + #endif + diff --git a/abs/core/sdl/SDL-1.2.15-ignore_insane_joystick_axis.patch b/abs/core/sdl/SDL-1.2.15-ignore_insane_joystick_axis.patch new file mode 100644 index 0000000..33340fd --- /dev/null +++ b/abs/core/sdl/SDL-1.2.15-ignore_insane_joystick_axis.patch @@ -0,0 +1,20 @@ +changeset: 6324:95abff7adcc2 +branch: SDL-1.2 +parent: 6306:2b923729fd01 +user: Ryan C. Gordon <icculus@icculus.org> +date: Sun Jun 03 04:49:25 2012 -0400 +summary: Linux evdev: ignore joystick axis events if they aren't in a sane range. + +diff -r 2b923729fd01 -r 95abff7adcc2 src/joystick/linux/SDL_sysjoystick.c +--- a/src/joystick/linux/SDL_sysjoystick.c Sat May 12 23:32:51 2012 -0700 ++++ b/src/joystick/linux/SDL_sysjoystick.c Sun Jun 03 04:49:25 2012 -0400 +@@ -1106,6 +1106,9 @@ + } + break; + case EV_ABS: ++ if (code > ABS_MISC) { ++ break; ++ } + switch (code) { + case ABS_HAT0X: + case ABS_HAT0Y: diff --git a/abs/core/sdl/SDL-1.2.15-no-default-backing-store.patch b/abs/core/sdl/SDL-1.2.15-no-default-backing-store.patch new file mode 100644 index 0000000..4d5209d --- /dev/null +++ b/abs/core/sdl/SDL-1.2.15-no-default-backing-store.patch @@ -0,0 +1,24 @@ +Do not harness backing store by default + +xorg-server 1.15 enables backing store if composite extension is enabled +(default settings). Harnessing backing store through compositor leads to +tearing effect. + +This patch reverts default harnessing backing store to conditional use if +SDL_VIDEO_X11_BACKINGSTORE environment variable exists. + +<https://bugzilla.libsdl.org/show_bug.cgi?id=2383> +<https://bugzilla.redhat.com/show_bug.cgi?id=1073057> + +diff -up SDL-1.2.15/src/video/x11/SDL_x11video.c.jx SDL-1.2.15/src/video/x11/SDL_x11video.c +--- SDL-1.2.15/src/video/x11/SDL_x11video.c.jx 2012-01-19 01:30:06.000000000 -0500 ++++ SDL-1.2.15/src/video/x11/SDL_x11video.c 2014-03-04 14:39:34.691545549 -0500 +@@ -1088,7 +1088,7 @@ static int X11_CreateWindow(_THIS, SDL_S + } + } + +-#if 0 /* This is an experiment - are the graphics faster now? - nope. */ ++#if 1 /* This is an experiment - are the graphics faster now? - nope. */ + if ( SDL_getenv("SDL_VIDEO_X11_BACKINGSTORE") ) + #endif + /* Cache the window in the server, when possible */ diff --git a/abs/core/sdl/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch b/abs/core/sdl/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch new file mode 100644 index 0000000..087a134 --- /dev/null +++ b/abs/core/sdl/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch @@ -0,0 +1,44 @@ +From 4b56fa058a45b7c804d1a5fcaf7a70db0bd0581c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz> +Date: Tue, 1 Jan 2013 21:25:15 +0100 +Subject: [PATCH] x11: Bypass SetGammaRamp when changing gamma + +Recent Xorg has broken dynamic colors setting, so calling SDL_SetGamme() +does not have any effect here. Recent means xorg-server >= 1.7, since 2010. +See <https://bugs.freedesktop.org/show_bug.cgi?id=27222>. +--- + src/video/SDL_gamma.c | 15 ++------------- + 1 files changed, 2 insertions(+), 13 deletions(-) + +diff --git a/src/video/SDL_gamma.c b/src/video/SDL_gamma.c +index 4fd0370..464ab88 100644 +--- a/src/video/SDL_gamma.c ++++ b/src/video/SDL_gamma.c +@@ -92,22 +92,11 @@ static void CalculateGammaFromRamp(float *gamma, Uint16 *ramp) + + int SDL_SetGamma(float red, float green, float blue) + { +- int succeeded; ++ int succeeded = -1; + SDL_VideoDevice *video = current_video; + SDL_VideoDevice *this = current_video; + +- succeeded = -1; +- /* Prefer using SetGammaRamp(), as it's more flexible */ +- { +- Uint16 ramp[3][256]; +- +- CalculateGammaRamp(red, ramp[0]); +- CalculateGammaRamp(green, ramp[1]); +- CalculateGammaRamp(blue, ramp[2]); +- succeeded = SDL_SetGammaRamp(ramp[0], ramp[1], ramp[2]); +- } +- if ( (succeeded < 0) && video->SetGamma ) { +- SDL_ClearError(); ++ if ( video->SetGamma ) { + succeeded = video->SetGamma(this, red, green, blue); + } + return succeeded; +-- +1.7.8.6 + diff --git a/abs/core/sdl/X11_KeyToUnicode.patch b/abs/core/sdl/X11_KeyToUnicode.patch new file mode 100644 index 0000000..5f0f325 --- /dev/null +++ b/abs/core/sdl/X11_KeyToUnicode.patch @@ -0,0 +1,52 @@ + +# HG changeset patch +# User Sam Lantinga <slouken@libsdl.org> +# Date 1327258041 18000 +# Node ID 900a0fae90ca65cff55a70a17b9ec39d2ddccbcf +# Parent 5273dfd19a5e8c5736a0d417bd441f704c5355f8 +Fixed bug 1390 - X11_KeyToUnicode + +manuel.montezelo 2012-01-22 08:56:18 PST + +We had the following bug report at Debian: +http://bugs.debian.org/376560 + +Same one in Ubuntu: +https://bugs.launchpad.net/ubuntu/+source/libsdl1.2/+bug/66217 + +We've been including a patch since then (attached) to actually export the +symbol, since 2006. In the last release the function seems to be there, alive +and kicking. + +It's affecting other people too: +http://www.garagegames.com/community/forums/viewthread/52287 + +diff -r 5273dfd19a5e -r 900a0fae90ca src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Sat Jan 21 12:06:51 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Sun Jan 22 13:47:21 2012 -0500 +@@ -1246,8 +1246,11 @@ + * sequences (dead accents, compose key sequences) will not work since the + * state has been irrevocably lost. + */ ++extern DECLSPEC Uint16 SDLCALL X11_KeyToUnicode(SDLKey, SDLMod); ++ + Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers) + { ++ static int warning = 0; + struct SDL_VideoDevice *this = current_video; + char keybuf[32]; + int i; +@@ -1255,6 +1258,12 @@ + XKeyEvent xkey; + Uint16 unicode; + ++ if ( warning ) { ++ warning = 0; ++ fprintf(stderr, "WARNING: Application is using X11_KeyToUnicode().\n"); ++ fprintf(stderr, "This is not an official SDL function, please report this as a bug.\n"); ++ } ++ + if ( !this || !SDL_Display ) { + return 0; + } + diff --git a/abs/core/sdl/__changelog b/abs/core/sdl/__changelog new file mode 100644 index 0000000..3bb2d10 --- /dev/null +++ b/abs/core/sdl/__changelog @@ -0,0 +1 @@ +PKGBUILD: remove libpulse dep and opt dep diff --git a/abs/core/sdl/libsdl-1.2.15-resizing.patch b/abs/core/sdl/libsdl-1.2.15-resizing.patch new file mode 100644 index 0000000..0655a13 --- /dev/null +++ b/abs/core/sdl/libsdl-1.2.15-resizing.patch @@ -0,0 +1,63 @@ +Description: Revert change that breaks window corner resizing + http://bugzilla.libsdl.org/show_bug.cgi?id=1430 +Author: Andrew Caudwell <acaudwell@gmail.com> +Last-Update: 2012-04-10 +Bug-Debian: http://bugs.debian.org/665779 + +diff -r c787fb1b5699 src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 +@@ -57,12 +57,6 @@ + static SDLKey MISC_keymap[256]; + SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); + +-/* +- Pending resize target for ConfigureNotify (so outdated events don't +- cause inappropriate resize events) +-*/ +-int X11_PendingConfigureNotifyWidth = -1; +-int X11_PendingConfigureNotifyHeight = -1; + + #ifdef X_HAVE_UTF8_STRING + Uint32 Utf8ToUcs4(const Uint8 *utf8) +@@ -825,16 +819,6 @@ + #ifdef DEBUG_XEVENTS + printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); + #endif +- if ((X11_PendingConfigureNotifyWidth != -1) && +- (X11_PendingConfigureNotifyHeight != -1)) { +- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && +- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { +- /* Event is from before the resize, so ignore. */ +- break; +- } +- X11_PendingConfigureNotifyWidth = -1; +- X11_PendingConfigureNotifyHeight = -1; +- } + if ( SDL_VideoSurface ) { + if ((xevent.xconfigure.width != SDL_VideoSurface->w) || + (xevent.xconfigure.height != SDL_VideoSurface->h)) { +diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h +--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 +@@ -27,8 +27,3 @@ + extern void X11_InitOSKeymap(_THIS); + extern void X11_PumpEvents(_THIS); + extern void X11_SetKeyboardState(Display *display, const char *key_vec); +- +-/* Variables to be exported */ +-extern int X11_PendingConfigureNotifyWidth; +-extern int X11_PendingConfigureNotifyHeight; +- +diff -r c787fb1b5699 src/video/x11/SDL_x11video.c +--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 +@@ -1182,8 +1182,6 @@ + current = NULL; + goto done; + } +- X11_PendingConfigureNotifyWidth = width; +- X11_PendingConfigureNotifyHeight = height; + } else { + if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { + current = NULL; diff --git a/abs/core/sdparm/PKGBUILD b/abs/core/sdparm/PKGBUILD index d983def..80e2c55 100644 --- a/abs/core/sdparm/PKGBUILD +++ b/abs/core/sdparm/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 148461 2012-02-01 12:06:03Z stephane $ +# $Id$ # Maintainer: # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: grimi@poczta.fm pkgname=sdparm -pkgver=1.07 +pkgver=1.08 pkgrel=1 pkgdesc="An utility similar to hdparm but for SCSI devices" arch=('i686' 'x86_64') url="http://sg.danny.cz/sg/sdparm.html" license=('BSD') -depends=('glibc') -source=("http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz") -md5sums=('c807f9db3dd7af175214be0d7fece494') +depends=('glibc' 'bash') +source=("http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz") +md5sums=('d290e6b45d690bfa2cc05700ec119073') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING \ diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD index 40aeefb..372fe8f 100755 --- a/abs/core/system-templates/PKGBUILD +++ b/abs/core/system-templates/PKGBUILD @@ -1,13 +1,16 @@ pkgname=system-templates -pkgver=8.2 -pkgrel=2 +pkgver=8.3 +pkgrel=7 conflicts=( ) pkgdesc="Templates used for system configuration" depends=() arch=('i686' 'x86_64') - source=() + package() { + #copy in most recent list of xscreensavers + cp -a $startdir/../../extra/xscreensaver/xscreensavers $startdir/templates/xscreensavers + MVDIR=$pkgdir/usr/MythVantage mkdir -p $MVDIR/templates #copy in all the installer specific stuff diff --git a/abs/core/system-templates/templates/fstab.conf.template b/abs/core/system-templates/templates/fstab.conf.template index e2f5278..e2f5278 100755..100644 --- a/abs/core/system-templates/templates/fstab.conf.template +++ b/abs/core/system-templates/templates/fstab.conf.template diff --git a/abs/core/system-templates/templates/mysql.txt b/abs/core/system-templates/templates/mysql.txt index 04531b5..04531b5 100755..100644 --- a/abs/core/system-templates/templates/mysql.txt +++ b/abs/core/system-templates/templates/mysql.txt diff --git a/abs/core/system-templates/templates/real_change_chan.sh b/abs/core/system-templates/templates/real_change_chan.sh index efeba88..efeba88 100755..100644 --- a/abs/core/system-templates/templates/real_change_chan.sh +++ b/abs/core/system-templates/templates/real_change_chan.sh diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/Lircmap.xml index 64dc7df..64dc7df 100644 --- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/xbmc.xml +++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/Lircmap.xml diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/Lircmap.xml index 64dc7df..64dc7df 100644 --- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/xbmc.xml +++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/Lircmap.xml diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/Lircmap.xml index 64dc7df..64dc7df 100644 --- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/xbmc.xml +++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/Lircmap.xml diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/Lircmap.xml index 64dc7df..64dc7df 100644 --- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/xbmc.xml +++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/Lircmap.xml diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/Lircmap.xml index 64dc7df..64dc7df 100644 --- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/xbmc.xml +++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/Lircmap.xml diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/Lircmap.xml index 64dc7df..64dc7df 100644 --- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/xbmc.xml +++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/Lircmap.xml diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/Lircmap.xml index 64dc7df..64dc7df 100644 --- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/xbmc.xml +++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/Lircmap.xml diff --git a/abs/core/system-templates/templates/remotes/favorites/dvico/Lircmap.xml b/abs/core/system-templates/templates/remotes/favorites/dvico/Lircmap.xml new file mode 100644 index 0000000..5c09546 --- /dev/null +++ b/abs/core/system-templates/templates/remotes/favorites/dvico/Lircmap.xml @@ -0,0 +1,53 @@ +<!-- This file contains the mapping of LIRC keys to XBMC keys used in Keymap.xml --> +<!-- --> +<!-- How to add remotes --> +<!-- <remote device="name_Lirc_calls_the_remote"> --> +<!-- --> +<!-- For the commands the layout following layout is used --> +<!-- <XBMC_COMMAND>LircButtonName</XBMC_COMMAND> --> +<!-- --> +<!-- For a list of XBMC_COMMAND's check out the <remote> sections of keymap.xml --> + +<lircmap> + <remote device="DVICO_MCE"> + <play>playpause</play> + <pause>mute</pause> + <stop>stop</stop> + <forward>ff</forward> + <reverse>rew</reverse> + <left>left</left> + <right>right</right> + <up>up</up> + <down>down</down> + <select>ok</select> + <pageplus>ch_up</pageplus> + <pageminus>ch_down</pageminus> + <back>back</back> + <menu>dvd_menu</menu> + <title>guide</title> + <info>more</info> + <skipplus>skip</skipplus> + <skipminus>replay</skipminus> + <display>ratio</display> + <start>alt_tab</start> + <record>rec</record> + <volumeplus>vol_up</volumeplus> + <volumeminus>vol_down</volumeminus> + <power>power_onoff</power> + <myvideo>cfp</myvideo> + <mymusic>mp3</mymusic> + <mypictures>photo</mypictures> + <mytv>dtv</mytv> + <one>1</one> + <two>2</two> + <three>3</three> + <four>4</four> + <five>5</five> + <six>6</six> + <seven>7</seven> + <eight>8</eight> + <nine>9</nine> + <zero>0</zero> + <star>start</star> + </remote> +</lircmap> diff --git a/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc b/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc new file mode 100644 index 0000000..c241c2b --- /dev/null +++ b/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc @@ -0,0 +1,46 @@ +begin + prog = irxevent + button = back + config = Key Escape CurrentWindow +end +begin + prog = irxevent + button = stop + config = Key ctrl-w CurrentWindow +end +begin + prog = irxevent + button = up + config = Key Up CurrentWindow +end +begin + prog = irxevent + button = down + config = Key Down CurrentWindow +end +begin + prog = irxevent + button = left + config = Key Left CurrentWindow +end +begin + prog = irxevent + button = right + config = Key Right CurrentWindow +end +begin + prog = irxevent + button = ok + config = Key Return CurrentWindow +end +begin + prog = irxevent + button = ch_up + config = Key alt-Right CurrentWindow +end +begin + prog = irxevent + button = ch_down + config = Key alt-Left CurrentWindow +end + diff --git a/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb b/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb new file mode 100644 index 0000000..51b8cab --- /dev/null +++ b/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb @@ -0,0 +1,46 @@ +begin + prog = irxevent + button = Back + config = Key Escape CurrentWindow +end +begin + prog = irxevent + button = Stop + config = Key ctrl-w CurrentWindow +end +begin + prog = irxevent + button = Up + config = Key Up CurrentWindow +end +begin + prog = irxevent + button = Down + config = Key Down CurrentWindow +end +begin + prog = irxevent + button = Left + config = Key Left CurrentWindow +end +begin + prog = irxevent + button = Right + config = Key Right CurrentWindow +end +begin + prog = irxevent + button = OK + config = Key Return CurrentWindow +end +begin + prog = irxevent + button = ChannelUp + config = Key alt-Right CurrentWindow +end +begin + prog = irxevent + button = ChannelDown + config = Key alt-Left CurrentWindow +end + diff --git a/abs/core/system-templates/templates/remotes/receiver_usb.id b/abs/core/system-templates/templates/remotes/receiver_usb.id index f30428c..e03dec0 100644 --- a/abs/core/system-templates/templates/remotes/receiver_usb.id +++ b/abs/core/system-templates/templates/remotes/receiver_usb.id @@ -8,8 +8,12 @@ 1509:9242|mce| "FIC eHome Infrared Transceiver 1509/9242"|favorites 1934:0602|mce| "Fintek eHome Infrared Transceiver 1934/0602"|favorites 147a:e015|mce| "Formosa eHome Infrared Transceiver 147a/e015"|favorites +147a:e016|mce| "Formosa eHome Infrared Transceiver 147a/e016"|favorites 147a:e017|mce| "Formosa aim / Trust MCE Infrared Receiver147a/e017"|favorites 147a:e018|mce| "Formosa Industrial Computing 147a/e018"|favorites +147a:e03a|mce| "Formosa eHome Infrared Transceiver 147a/e03a"|favorites +147a:e03c|mce| "Formosa eHome Infrared Transceiver 147a/e03c"|favorites +147a:e042|mce| "Formosa eHome Infrared Transceiver 147a/e042"|favorites 107b:3009|mce| "Gateway eHome Infrared Transceiver 107b/3009"|favorites 195d:7002|mce| "Itron ione Libra Q-11 195d/7002"|favorites 043e:9803|mce| "LG eHome Infrared Transceiver 043e/9803|favorites" @@ -30,5 +34,7 @@ 1784:0006|mce| "Topseed HP eHome Infrared Transceiver 1784/0006"|favorites 1784:0007|mce| "Topseed HP eHome Infrared Transceiver 1784/0007"|favorites 1784:0008|mce| "Topseed eHome Infrared Transceiver 1784/0008"|favorites +1784:000a|mce| "TopSeed eHome Infrared Transceiver 1784/000a"|favorites +1784:0011|mce| "TopSeed eHome Infrared Transceiver 1784/0011"|favorites 045e:006d|mce-old| "USB Microsoft IR Transceiver Driver 045e/006d"|favorites 0019:00b4|Jetway| "Nuvoton w836x7hg Infrared Remote Transceiver"|other diff --git a/abs/core/system-templates/templates/xorg/304xx_supported.txt b/abs/core/system-templates/templates/xorg/304xx_supported.txt new file mode 100644 index 0000000..3edbe77 --- /dev/null +++ b/abs/core/system-templates/templates/xorg/304xx_supported.txt @@ -0,0 +1,136 @@ +http://www.nvidia.com/object/IO_32667.html + +NVIDIA GPU product Device PCI ID +GeForce 6800 Ultra 0x0040 +GeForce 6800 0x0041 +GeForce 6800 LE 0x0042 +GeForce 6800 XE 0x0043 +GeForce 6800 XT 0x0044 +GeForce 6800 GT 0x0045 +GeForce 6800 GT 0x0046 +GeForce 6800 GS 0x0047 +GeForce 6800 XT 0x0048 +Quadro FX 4000 0x004E +GeForce 7800 GTX 0x0090 +GeForce 7800 GTX 0x0091 +GeForce 7800 GT 0x0092 +GeForce 7800 GS 0x0093 +GeForce 7800 SLI 0x0095 +GeForce Go 7800 0x0098 +GeForce Go 7800 GTX 0x0099 +Quadro FX 4500 0x009D +GeForce 6800 GS 0x00C0 +GeForce 6800 0x00C1 +GeForce 6800 LE 0x00C2 +GeForce 6800 XT 0x00C3 +GeForce Go 6800 0x00C8 +GeForce Go 6800 Ultra 0x00C9 +Quadro FX Go1400 0x00CC +Quadro FX 3450/4000 SDI 0x00CD +Quadro FX 1400 0x00CE +GeForce 6600 GT 0x00F1 +GeForce 6600 0x00F2 +GeForce 6200 0x00F3 +GeForce 6600 LE 0x00F4 +GeForce 7800 GS 0x00F5 +GeForce 6800 GS 0x00F6 +Quadro FX 3400/Quadro FX 4000 0x00F8 +GeForce 6800 Ultra 0x00F9 +GeForce 6600 GT 0x0140 +GeForce 6600 0x0141 +GeForce 6600 LE 0x0142 +GeForce 6600 VE 0x0143 +GeForce Go 6600 0x0144 +GeForce 6610 XL 0x0145 +GeForce Go 6600 TE/6200 TE 0x0146 +GeForce 6700 XL 0x0147 +GeForce Go 6600 0x0148 +GeForce Go 6600 GT 0x0149 +Quadro NVS 440 0x014A +Quadro FX 540M 0x014C +Quadro FX 550 0x014D +Quadro FX 540 0x014E +GeForce 6200 0x014F +GeForce 6500 0x0160 +GeForce 6200 TurboCache(TM) 0x0161 +GeForce 6200SE TurboCache(TM) 0x0162 +GeForce 6200 LE 0x0163 +GeForce Go 6200 0x0164 +Quadro NVS 285 0x0165 +GeForce Go 6400 0x0166 +GeForce Go 6200 0x0167 +GeForce Go 6400 0x0168 +GeForce 6250 0x0169 +GeForce 7100 GS 0x016A +GeForce 7350 LE 0x01D0 +GeForce 7300 LE 0x01D1 +GeForce 7550 LE 0x01D2 +GeForce 7300 SE/7200 GS 0x01D3 +GeForce Go 7200 0x01D6 +GeForce Go 7300 0x01D7 +GeForce Go 7400 0x01D8 +Quadro NVS 110M 0x01DA +Quadro NVS 120M 0x01DB +Quadro FX 350M 0x01DC +GeForce 7500 LE 0x01DD +Quadro FX 350 0x01DE +GeForce 7300 GS 0x01DF +GeForce 6800 0x0211 +GeForce 6800 LE 0x0212 +GeForce 6800 GT 0x0215 +GeForce 6800 XT 0x0218 +GeForce 6200 0x0221 +GeForce 6200 A-LE 0x0222 +GeForce 6150 0x0240 +GeForce 6150 LE 0x0241 +GeForce 6100 0x0242 +GeForce Go 6150 0x0244 +Quadro NVS 210S / GeForce 6150LE 0x0245 +GeForce Go 6100 0x0247 +GeForce 7900 GTX 0x0290 +GeForce 7900 GT/GTO 0x0291 +GeForce 7900 GS 0x0292 +GeForce 7950 GX2 0x0293 +GeForce 7950 GX2 0x0294 +GeForce 7950 GT 0x0295 +GeForce Go 7950 GTX 0x0297 +GeForce Go 7900 GS 0x0298 +Quadro NVS 510M 0x0299 +Quadro FX 2500M 0x029A +Quadro FX 1500M 0x029B +Quadro FX 5500 0x029C +Quadro FX 3500 0x029D +Quadro FX 1500 0x029E +Quadro FX 4500 X2 0x029F +GeForce 7600 GT 0x02E0 +GeForce 7600 GS 0x02E1 +GeForce 7300 GT 0x02E2 +GeForce 7900 GS 0x02E3 +GeForce 7950 GT 0x02E4 +GeForce 7650 GS 0x038B +GeForce 7650 GS 0x0390 +GeForce 7600 GT 0x0391 +GeForce 7600 GS 0x0392 +GeForce 7300 GT 0x0393 +GeForce 7600 LE 0x0394 +GeForce 7300 GT 0x0395 +GeForce Go 7700 0x0397 +GeForce Go 7600 0x0398 +GeForce Go 7600 GT 0x0399 +Quadro FX 560M 0x039C +Quadro FX 560 0x039E +GeForce 6150SE nForce 430 0x03D0 +GeForce 6100 nForce 405 0x03D1 +GeForce 6100 nForce 400 0x03D2 +GeForce 6100 nForce 420 0x03D5 +GeForce 7025 / nForce 630a 0x03D6 +GeForce 7150M / nForce 630M 0x0531 +GeForce 7000M / nForce 610M 0x0533 +GeForce 7050 PV / nForce 630a 0x053A +GeForce 7050 PV / nForce 630a 0x053B +GeForce 7025 / nForce 630a 0x053E +GeForce 7150 / nForce 630i 0x07E0 +GeForce 7100 / nForce 630i 0x07E1 +GeForce 7050 / nForce 630i 0x07E2 +GeForce 7050 / nForce 610i 0x07E3 +GeForce 7050 / nForce 620i 0x07E5 diff --git a/abs/core/system-templates/templates/xorg/340xx_supported.txt b/abs/core/system-templates/templates/xorg/340xx_supported.txt new file mode 100644 index 0000000..00d6b7b --- /dev/null +++ b/abs/core/system-templates/templates/xorg/340xx_supported.txt @@ -0,0 +1,281 @@ +http://www.nvidia.com/object/IO_32667.html + +NVIDIA GPU product Device PCI ID Subdevice PCI ID +GeForce 8800 GTX 0x0191 +GeForce 8800 GTS 0x0193 +GeForce 8800 Ultra 0x0194 +Tesla C870 0x0197 +Quadro FX 5600 0x019D +Quadro FX 4600 0x019E +GeForce 8600 GTS 0x0400 +GeForce 8600 GT 0x0401 +GeForce 8600 GT 0x0402 +GeForce 8600 GS 0x0403 +GeForce 8400 GS 0x0404 +GeForce 9500M GS 0x0405 +GeForce 8300 GS 0x0406 +GeForce 8600M GT 0x0407 +GeForce 9650M GS 0x0408 +GeForce 8700M GT 0x0409 +Quadro FX 370 0x040A +Quadro NVS 320M 0x040B +Quadro FX 570M 0x040C +Quadro FX 1600M 0x040D +Quadro FX 570 0x040E +Quadro FX 1700 0x040F +GeForce GT 330 0x0410 +GeForce 8400 SE 0x0420 +GeForce 8500 GT 0x0421 +GeForce 8400 GS 0x0422 +GeForce 8300 GS 0x0423 +GeForce 8400 GS 0x0424 +GeForce 8600M GS 0x0425 +GeForce 8400M GT 0x0426 +GeForce 8400M GS 0x0427 +GeForce 8400M G 0x0428 +Quadro NVS 140M 0x0429 +Quadro NVS 130M 0x042A +Quadro NVS 135M 0x042B +GeForce 9400 GT 0x042C +Quadro FX 360M 0x042D +GeForce 9300M G 0x042E +Quadro NVS 290 0x042F +GeForce GTX 295 0x05E0 +GeForce GTX 280 0x05E1 +GeForce GTX 260 0x05E2 +GeForce GTX 285 0x05E3 +GeForce GTX 275 0x05E6 +Tesla C1060 0x05E7 +Tesla T10 Processor 0x05E7 0x0595 +Tesla T10 Processor 0x05E7 0x068F +Tesla M1060 0x05E7 0x0697 +Tesla M1060 0x05E7 0x0714 +Tesla M1060 0x05E7 0x0743 +GeForce GTX 260 0x05EA +GeForce GTX 295 0x05EB +Quadroplex 2200 D2 0x05ED +Quadroplex 2200 S4 0x05F8 +Quadro CX 0x05F9 +Quadro FX 5800 0x05FD +Quadro FX 4800 0x05FE +Quadro FX 3800 0x05FF +GeForce 8800 GTS 512 0x0600 +GeForce 9800 GT 0x0601 +GeForce 8800 GT 0x0602 +GeForce GT 230 0x0603 +GeForce 9800 GX2 0x0604 +GeForce 9800 GT 0x0605 +GeForce 8800 GS 0x0606 +GeForce GTS 240 0x0607 +GeForce 9800M GTX 0x0608 +GeForce 8800M GTS 0x0609 +GeForce 8800 GS 0x0609 0x00A7 +GeForce GTX 280M 0x060A +GeForce 9800M GT 0x060B +GeForce 8800M GTX 0x060C +GeForce 8800 GS 0x060D +GeForce GTX 285M 0x060F +GeForce 9600 GSO 0x0610 +GeForce 8800 GT 0x0611 +GeForce 9800 GTX/9800 GTX+ 0x0612 +GeForce 9800 GTX+ 0x0613 +GeForce 9800 GT 0x0614 +GeForce GTS 250 0x0615 +GeForce 9800M GTX 0x0617 +GeForce GTX 260M 0x0618 +Quadro FX 4700 X2 0x0619 +Quadro FX 3700 0x061A +Quadro VX 200 0x061B +Quadro FX 3600M 0x061C +Quadro FX 2800M 0x061D +Quadro FX 3700M 0x061E +Quadro FX 3800M 0x061F +GeForce GT 230 0x0621 +GeForce 9600 GT 0x0622 +GeForce 9600 GS 0x0623 +GeForce 9600 GSO 512 0x0625 +GeForce GT 130 0x0626 +GeForce GT 140 0x0627 +GeForce 9800M GTS 0x0628 +GeForce 9700M GTS 0x062A +GeForce 9800M GS 0x062B +GeForce 9800M GTS 0x062C +GeForce 9600 GT 0x062D +GeForce 9600 GT 0x062E +GeForce GT 130 0x062E 0x0605 +GeForce 9700 S 0x0630 +GeForce GTS 160M 0x0631 +GeForce GTS 150M 0x0632 +GeForce 9600 GSO 0x0635 +GeForce 9600 GT 0x0637 +Quadro FX 1800 0x0638 +Quadro FX 2700M 0x063A +GeForce 9500 GT 0x0640 +GeForce 9400 GT 0x0641 +GeForce 9500 GT 0x0643 +GeForce 9500 GS 0x0644 +GeForce 9500 GS 0x0645 +GeForce GT 120 0x0646 +GeForce 9600M GT 0x0647 +GeForce 9600M GS 0x0648 +GeForce 9600M GT 0x0649 +GeForce GT 220M 0x0649 0x202D +GeForce 9700M GT 0x064A +GeForce 9500M G 0x064B +GeForce 9650M GT 0x064C +GeForce G 110M 0x0651 +GeForce GT 130M 0x0652 +GeForce GT 240M LE 0x0652 0x0850 +GeForce GT 120M 0x0653 +GeForce GT 220M 0x0654 +GeForce GT 320M 0x0654 0x14A2 +GeForce GT 320M 0x0654 0x14D2 +GeForce GT 120 0x0655 0x0633 +GeForce GT 120 0x0656 0x0693 +Quadro FX 380 0x0658 +Quadro FX 580 0x0659 +Quadro FX 1700M 0x065A +GeForce 9400 GT 0x065B +Quadro FX 770M 0x065C +GeForce 9300 GE 0x06E0 +GeForce 9300 GS 0x06E1 +GeForce 8400 0x06E2 +GeForce 8400 SE 0x06E3 +GeForce 8400 GS 0x06E4 +GeForce 9300M GS 0x06E5 +GeForce G100 0x06E6 +GeForce 9300 SE 0x06E7 +GeForce 9200M GS 0x06E8 +GeForce 9200M GE 0x06E8 0x360B +GeForce 9300M GS 0x06E9 +Quadro NVS 150M 0x06EA +Quadro NVS 160M 0x06EB +GeForce G 105M 0x06EC +GeForce G 103M 0x06EF +GeForce G105M 0x06F1 +Quadro NVS 420 0x06F8 +Quadro FX 370 LP 0x06F9 +Quadro FX 370 Low Profile 0x06F9 0x060D +Quadro NVS 450 0x06FA +Quadro FX 370M 0x06FB +Quadro NVS 295 0x06FD +HICx16 + Graphics 0x06FF +HICx8 + Graphics 0x06FF 0x0711 +GeForce 8200M 0x0840 +GeForce 9100M G 0x0844 +GeForce 8200M G 0x0845 +GeForce 9200 0x0846 +GeForce 9100 0x0847 +GeForce 8300 0x0848 +GeForce 8200 0x0849 +nForce 730a 0x084A +GeForce 9200 0x084B +nForce 980a/780a SLI 0x084C +nForce 750a SLI 0x084D +GeForce 8100 / nForce 720a 0x084F +GeForce 9400 0x0860 +GeForce 9400 0x0861 +GeForce 9400M G 0x0862 +GeForce 9400M 0x0863 +GeForce 9300 0x0864 +ION 0x0865 +GeForce 9400M G 0x0866 +GeForce 9400M 0x0866 0x00B1 +GeForce 9400 0x0867 +nForce 760i SLI 0x0868 +GeForce 9400 0x0869 +GeForce 9400 0x086A +GeForce 9300 / nForce 730i 0x086C +GeForce 9200 0x086D +GeForce 9100M G 0x086E +GeForce 8200M G 0x086F +GeForce 9400M 0x0870 +GeForce 9200 0x0871 +GeForce G102M 0x0872 +GeForce G205M 0x0872 0x1C42 +GeForce G102M 0x0873 +GeForce G205M 0x0873 0x1C52 +ION 0x0874 +ION 0x0876 +GeForce 9400 0x087A +ION 0x087D +ION LE 0x087E +ION LE 0x087F +GeForce 320M 0x08A0 +GeForce 320M 0x08A2 +GeForce 320M 0x08A3 +GeForce 320M 0x08A4 +GeForce 320M 0x08A5 +GeForce GT 220 0x0A20 +GeForce 315 0x0A22 +GeForce 210 0x0A23 +GeForce 405 0x0A26 +GeForce 405 0x0A27 +GeForce GT 230M 0x0A28 +GeForce GT 330M 0x0A29 +GeForce GT 230M 0x0A2A +GeForce GT 330M 0x0A2B +NVS 5100M 0x0A2C +GeForce GT 320M 0x0A2D +GeForce GT 415 0x0A32 +GeForce GT 240M 0x0A34 +GeForce GT 325M 0x0A35 +Quadro 400 0x0A38 +Quadro FX 880M 0x0A3C +GeForce G210 0x0A60 +GeForce 205 0x0A62 +GeForce 310 0x0A63 +Second Generation ION 0x0A64 +GeForce 210 0x0A65 +GeForce 310 0x0A66 +GeForce 315 0x0A67 +GeForce G105M 0x0A68 +GeForce G105M 0x0A69 +NVS 2100M 0x0A6A +NVS 3100M 0x0A6C +GeForce 305M 0x0A6E +Second Generation ION 0x0A6E 0x3607 +Second Generation ION 0x0A6F +GeForce 310M 0x0A70 +Second Generation ION 0x0A70 0x3605 +Second Generation ION 0x0A70 0x3617 +GeForce 305M 0x0A71 +GeForce 310M 0x0A72 +GeForce 305M 0x0A73 +Second Generation ION 0x0A73 0x3607 +Second Generation ION 0x0A73 0x3610 +GeForce G210M 0x0A74 +GeForce G210 0x0A74 0x903A +GeForce 310M 0x0A75 +Second Generation ION 0x0A75 0x3605 +Second Generation ION 0x0A76 +Quadro FX 380 LP 0x0A78 +GeForce 315M 0x0A7A +GeForce 405 0x0A7A 0x0003 +GeForce 405M 0x0A7A 0x3950 +GeForce 405M 0x0A7A 0x397D +GeForce 405 0x0A7A 0x3980 +GeForce 405 0x0A7A 0x8006 +GeForce 405 0x0A7A 0x90B4 +GeForce 405 0x0A7A 0xAA51 +GeForce 405 0x0A7A 0xAA58 +GeForce 405 0x0A7A 0xAC71 +GeForce 405 0x0A7A 0xAC82 +Quadro FX 380M 0x0A7C +GeForce GT 330 0x0CA0 +GeForce GT 320 0x0CA2 +GeForce GT 240 0x0CA3 +GeForce GT 340 0x0CA4 +GeForce GT 220 0x0CA5 +GeForce GT 330 0x0CA7 +GeForce GTS 260M 0x0CA8 +GeForce GTS 250M 0x0CA9 +GeForce GT 220 0x0CAC +GeForce GT 335M 0x0CAF +GeForce GTS 350M 0x0CB0 +GeForce GTS 360M 0x0CB1 +Quadro FX 1800M 0x0CBC +GeForce 9300 GS 0x10C0 +GeForce 8400GS 0x10C3 +GeForce 405 0x10C5 +NVS 300 0x10D8 diff --git a/abs/core/system-templates/templates/xorg/nvidia_supported.txt b/abs/core/system-templates/templates/xorg/nvidia_supported.txt new file mode 100644 index 0000000..b19ef90 --- /dev/null +++ b/abs/core/system-templates/templates/xorg/nvidia_supported.txt @@ -0,0 +1,620 @@ +#http://us.download.nvidia.com/XFree86/Linux-x86_64/343.36/README/supportedchips.html + +#NVIDIA GeForce GPUs + +#NVIDIA GPU product Device PCI ID* VDPAU features +GeForce GTX 480 06C0 C +GeForce GTX 465 06C4 C +GeForce GTX 480M 06CA C +GeForce GTX 470 06CD C +GeForce GT 440 0DC0 C +GeForce GTS 450 0DC4 C +GeForce GTS 450 0DC5 C +GeForce GTS 450 0DC6 C +GeForce GT 555M 0DCD C +GeForce GT 555M 0DCE C +GeForce GTX 460M 0DD1 C +GeForce GT 445M 0DD2 C +GeForce GT 435M 0DD3 C +GeForce GT 550M 0DD6 C +GeForce GT 440 0DE0 C +GeForce GT 430 0DE1 C +GeForce GT 420 0DE2 C +GeForce GT 635M 0DE3 C +GeForce GT 520 0DE4 C +GeForce GT 530 0DE5 C +GeForce GT 610 0DE7 C +GeForce GT 620M 0DE8 C +GeForce GT 630M 0DE9 C +GeForce GT 620M 0DE9 1025 0692 C +GeForce GT 620M 0DE9 1025 0725 C +GeForce GT 620M 0DE9 1025 0728 C +GeForce GT 620M 0DE9 1025 072B C +GeForce GT 620M 0DE9 1025 072E C +GeForce GT 620M 0DE9 1025 0753 C +GeForce GT 620M 0DE9 1025 0754 C +GeForce GT 640M LE 0DE9 17AA 3977 C +GeForce GT 635M 0DE9 1B0A 2210 C +GeForce 610M 0DEA C +GeForce 615 0DEA 17AA 365A C +GeForce 615 0DEA 17AA 365B C +GeForce 615 0DEA 17AA 365E C +GeForce 615 0DEA 17AA 3660 C +GeForce 615 0DEA 17AA 366C C +GeForce GT 555M 0DEB C +GeForce GT 525M 0DEC C +GeForce GT 520M 0DED C +GeForce GT 415M 0DEE C +GeForce GT 425M 0DF0 C +GeForce GT 420M 0DF1 C +GeForce GT 435M 0DF2 C +GeForce GT 420M 0DF3 C +GeForce GT 540M 0DF4 C +GeForce GT 630M 0DF4 152D 0952 C +GeForce GT 630M 0DF4 152D 0953 C +GeForce GT 525M 0DF5 C +GeForce GT 550M 0DF6 C +GeForce GT 520M 0DF7 C +GeForce GTX 460 0E22 C +GeForce GTX 460 SE 0E23 C +GeForce GTX 460 0E24 C +GeForce GTX 470M 0E30 C +GeForce GTX 485M 0E31 C +GeForce GT 630 0F00 C +GeForce GT 620 0F01 C +GeForce GT 730 0F02 C +GeForce GT 640 0FC0 C +GeForce GT 640 0FC1 C +GeForce GT 630 0FC2 C +GeForce GTX 650 0FC6 D +GeForce GT 740 0FC8 D +GeForce GT 755M 0FCD D +GeForce GT 640M LE 0FCE C +GeForce GT 650M 0FD1 D +GeForce GT 640M 0FD2 D +GeForce GT 640M LE 0FD2 1028 0595 C +GeForce GT 640M LE 0FD2 1028 05B2 C +GeForce GT 640M LE 0FD3 C +GeForce GTX 660M 0FD4 D +GeForce GT 650M 0FD5 D +GeForce GT 640M 0FD8 D +GeForce GT 645M 0FD9 D +GeForce GT 740M 0FDF D +GeForce GTX 660M 0FE0 D +GeForce GT 730M 0FE1 D +GeForce GT 745M 0FE2 D +GeForce GT 745M 0FE3 D +GeForce GT 745A 0FE3 17AA 3675 D +GeForce GT 750M 0FE4 D +GeForce GT 750M 0FE9 D +GeForce GT 755M 0FEA D +GeForce 710A 0FEC C +GeForce GTX TITAN Z 1001 D +GeForce GTX 780 1004 D +GeForce GTX TITAN 1005 D +GeForce GTX 780 1007 D +GeForce GTX 780 Ti 1008 D +GeForce GTX 780 Ti 100A D +GeForce GTX TITAN Black 100C D +GeForce GT 520 1040 C +GeForce 510 1042 D +GeForce 605 1048 D +GeForce GT 620 1049 C +GeForce GT 610 104A C +GeForce GT 625 (OEM) 104B D +GeForce GT 625 104B 1043 844C D +GeForce GT 625 104B 1043 846B D +GeForce GT 625 104B 1462 B590 D +GeForce GT 625 104B 174B 0625 D +GeForce GT 625 104B 174B A625 D +GeForce GT 705 104C D +GeForce GT 520M 1050 C +GeForce GT 520MX 1051 D +GeForce GT 520M 1052 C +GeForce 410M 1054 D +GeForce 410M 1055 D +GeForce 610M 1058 C +GeForce 610 1058 103C 2AED D +GeForce 610 1058 103C 2AF1 D +GeForce 610M 1059 C +GeForce 610M 105A C +GeForce 705M 105B C +GeForce 705A 105B 103C 2AFB D +GeForce GTX 580 1080 C +GeForce GTX 570 1081 C +GeForce GTX 560 Ti 1082 C +GeForce GTX 560 1084 C +GeForce GTX 570 1086 C +GeForce GTX 560 Ti 1087 C +GeForce GTX 590 1088 C +GeForce GTX 580 1089 C +GeForce GTX 580 108B C +GeForce 820M 1140 1019 0799 C +GeForce GT 720M 1140 1019 999F C +GeForce GT 620M 1140 1025 0600 C +GeForce GT 620M 1140 1025 0606 C +GeForce GT 620M 1140 1025 064A C +GeForce GT 620M 1140 1025 064C C +GeForce GT 620M 1140 1025 067A C +GeForce GT 620M 1140 1025 0680 C +GeForce 710M 1140 1025 0686 C +GeForce 710M 1140 1025 0689 C +GeForce 710M 1140 1025 068B C +GeForce 710M 1140 1025 068D C +GeForce 710M 1140 1025 068E C +GeForce 710M 1140 1025 0691 C +GeForce GT 620M 1140 1025 0692 C +GeForce GT 620M 1140 1025 0694 C +GeForce GT 620M 1140 1025 0702 C +GeForce GT 620M 1140 1025 0719 C +GeForce GT 620M 1140 1025 0725 C +GeForce GT 620M 1140 1025 0728 C +GeForce GT 620M 1140 1025 072B C +GeForce GT 620M 1140 1025 072E C +GeForce GT 620M 1140 1025 0732 C +GeForce GT 720M 1140 1025 0763 C +GeForce 710M 1140 1025 0773 C +GeForce 710M 1140 1025 0774 C +GeForce GT 720M 1140 1025 0776 C +GeForce 710M 1140 1025 077A C +GeForce 710M 1140 1025 077B C +GeForce 710M 1140 1025 077C C +GeForce 710M 1140 1025 077D C +GeForce 710M 1140 1025 077E C +GeForce 710M 1140 1025 077F C +GeForce GT 720M 1140 1025 0781 C +GeForce GT 720M 1140 1025 0798 C +GeForce GT 720M 1140 1025 0799 C +GeForce GT 720M 1140 1025 079B C +GeForce GT 720M 1140 1025 079C C +GeForce GT 720M 1140 1025 0807 C +GeForce 820M 1140 1025 0821 C +GeForce GT 720M 1140 1025 0823 C +GeForce GT 720M 1140 1025 0830 C +GeForce GT 720M 1140 1025 0833 C +GeForce GT 720M 1140 1025 0837 C +GeForce 820M 1140 1025 083E C +GeForce 710M 1140 1025 0841 C +GeForce 820M 1140 1025 0853 C +GeForce 820M 1140 1025 0854 C +GeForce 820M 1140 1025 0855 C +GeForce 820M 1140 1025 0856 C +GeForce 820M 1140 1025 0857 C +GeForce 820M 1140 1025 0858 C +GeForce 820M 1140 1025 0868 C +GeForce 810M 1140 1025 0869 C +GeForce 820M 1140 1025 0873 C +GeForce 820M 1140 1025 0878 C +GeForce 820M 1140 1025 087B C +GeForce 820M 1140 1025 0881 C +GeForce 820M 1140 1025 088A C +GeForce 820M 1140 1025 0921 C +GeForce 810M 1140 1025 092E C +GeForce 820M 1140 1025 092F C +GeForce 820M 1140 1025 093A C +GeForce 820M 1140 1025 093C C +GeForce 820M 1140 1025 093F C +GeForce 820M 1140 1025 0945 C +GeForce GT 630M 1140 1028 054D C +GeForce GT 630M 1140 1028 054E C +GeForce GT 620M 1140 1028 0554 C +GeForce GT 620M 1140 1028 0557 C +GeForce GT625M 1140 1028 0562 C +GeForce GT 630M 1140 1028 0565 C +GeForce GT 630M 1140 1028 0568 C +GeForce GT 630M 1140 1028 0590 C +GeForce GT625M 1140 1028 0592 C +GeForce GT625M 1140 1028 0594 C +GeForce GT625M 1140 1028 0595 C +GeForce GT625M 1140 1028 05A2 C +GeForce GT625M 1140 1028 05B1 C +GeForce GT625M 1140 1028 05B3 C +GeForce GT 630M 1140 1028 05DA C +GeForce GT 720M 1140 1028 05DE C +GeForce GT 720M 1140 1028 05E0 C +GeForce GT 630M 1140 1028 05E8 C +GeForce GT 720M 1140 1028 05F4 C +GeForce GT 720M 1140 1028 060F C +GeForce 820M 1140 1028 064E C +GeForce 820M 1140 1028 0652 C +GeForce 820M 1140 1028 0653 C +GeForce 820M 1140 1028 0662 C +GeForce 820M 1140 1028 068D C +GeForce GT 630M 1140 103C 18EF C +GeForce GT 630M 1140 103C 18F9 C +GeForce GT 630M 1140 103C 18FB C +GeForce GT 630M 1140 103C 18FD C +GeForce GT 630M 1140 103C 18FF C +GeForce 820M 1140 103C 218A C +GeForce 820M 1140 103C 21BB C +GeForce 820M 1140 103C 21BC C +GeForce 820M 1140 103C 220E C +GeForce 820M 1140 103C 2212 C +GeForce 820M 1140 103C 2218 C +GeForce 820M 1140 103C 225B C +GeForce 820M 1140 103C 225D C +GeForce 820M 1140 103C 226D C +GeForce 820M 1140 103C 226F C +GeForce 820M 1140 103C 22D2 C +GeForce 820M 1140 103C 22D9 C +GeForce GT 720A 1140 103C 2AEF C +GeForce 710A 1140 103C 2AF9 C +GeForce GT 720M 1140 1043 11FD C +GeForce GT 720M 1140 1043 124D C +GeForce GT 720M 1140 1043 126D C +GeForce GT 720M 1140 1043 131D C +GeForce GT 720M 1140 1043 13FD C +GeForce GT 720M 1140 1043 14C7 C +GeForce GT 620M 1140 1043 1507 C +GeForce 820M 1140 1043 15AD C +GeForce 820M 1140 1043 15ED C +GeForce 820M 1140 1043 160D C +GeForce 820M 1140 1043 163D C +GeForce 820M 1140 1043 165D C +GeForce 820M 1140 1043 166D C +GeForce 820M 1140 1043 16CD C +GeForce 820M 1140 1043 16DD C +GeForce 820M 1140 1043 170D C +GeForce 820M 1140 1043 176D C +GeForce 820M 1140 1043 178D C +GeForce 820M 1140 1043 179D C +GeForce GT 620M 1140 1043 2132 C +GeForce GT 720M 1140 1043 21BA C +GeForce GT 720M 1140 1043 21FA C +GeForce GT 720M 1140 1043 220A C +GeForce GT 720M 1140 1043 221A C +GeForce GT 710M 1140 1043 223A C +GeForce GT 710M 1140 1043 224A C +GeForce 820M 1140 1043 227A C +GeForce 820M 1140 1043 228A C +GeForce GT 720M 1140 1043 8595 C +GeForce GT 720M 1140 1043 85EA C +GeForce 820M 1140 1043 85EB C +GeForce 820M 1140 1043 85EC C +GeForce GT 720M 1140 1043 85EE C +GeForce 820M 1140 1043 85F3 C +GeForce 820M 1140 1043 860E C +GeForce 820M 1140 1043 861A C +GeForce 820M 1140 1043 861B C +GeForce 820M 1140 1043 8628 C +GeForce 820M 1140 1043 8643 C +GeForce 820M 1140 1043 864C C +GeForce 820M 1140 1043 8652 C +GeForce GT 720M 1140 105B 0DAC C +GeForce GT 720M 1140 105B 0DAD C +GeForce GT 720M 1140 105B 0EF3 C +GeForce GT720M 1140 1072 152D C +GeForce GT 720M 1140 10CF 17F5 C +GeForce 710M 1140 1179 FA01 C +GeForce 710M 1140 1179 FA02 C +GeForce 710M 1140 1179 FA03 C +GeForce 710M 1140 1179 FA05 C +GeForce 710M 1140 1179 FA11 C +GeForce 710M 1140 1179 FA13 C +GeForce 710M 1140 1179 FA18 C +GeForce 710M 1140 1179 FA19 C +GeForce 710M 1140 1179 FA21 C +GeForce 710M 1140 1179 FA23 C +GeForce 710M 1140 1179 FA2A C +GeForce 710M 1140 1179 FA32 C +GeForce 710M 1140 1179 FA33 C +GeForce 710M 1140 1179 FA36 C +GeForce 710M 1140 1179 FA38 C +GeForce 710M 1140 1179 FA42 C +GeForce 710M 1140 1179 FA43 C +GeForce 710M 1140 1179 FA45 C +GeForce 710M 1140 1179 FA47 C +GeForce 710M 1140 1179 FA49 C +GeForce 710M 1140 1179 FA58 C +GeForce 710M 1140 1179 FA59 C +GeForce 710M 1140 1179 FA88 C +GeForce 710M 1140 1179 FA89 C +GeForce GT 620M 1140 144D B092 C +GeForce GT 630M 1140 144D C0D5 C +GeForce GT 620M 1140 144D C0D7 C +GeForce 820M 1140 144D C10D C +GeForce GT 620M 1140 144D C652 C +GeForce 710M 1140 144D C709 C +GeForce 710M 1140 144D C711 C +GeForce 710M 1140 144D C736 C +GeForce 710M 1140 144D C737 C +GeForce 820M 1140 144D C745 C +GeForce 820M 1140 144D C750 C +GeForce GT 710M 1140 1462 10B8 C +GeForce GT 720M 1140 1462 10E9 C +GeForce 820M 1140 1462 1116 C +GeForce 720M 1140 1462 AA33 C +GeForce GT 720M 1140 1462 AAA2 C +GeForce 820M 1140 1462 AAA3 C +GeForce GT 720M 1140 1462 ACB2 C +GeForce GT 720M 1140 1462 ACC1 C +GeForce 720M 1140 1462 AE61 C +GeForce GT 720M 1140 1462 AE65 C +GeForce 820M 1140 1462 AE6A C +GeForce GT 720M 1140 1462 AE71 C +GeForce 820M 1140 14C0 0083 C +GeForce 620M 1140 152D 0926 C +GeForce GT 630M 1140 152D 0982 C +GeForce GT 630M 1140 152D 0983 C +GeForce GT820M 1140 152D 1005 C +GeForce 710M 1140 152D 1012 C +GeForce 820M 1140 152D 1019 C +GeForce GT 630M 1140 152D 1030 C +GeForce 710M 1140 152D 1055 C +GeForce GT 720M 1140 152D 1067 C +GeForce GT720M 1140 152D 1072 C +GeForce GT 720M 1140 152D 1083 C +GeForce 820M 1140 152D 1092 C +GeForce GT 720M 1140 17AA 2213 C +GeForce GT 720M 1140 17AA 2220 C +GeForce GT620M 1140 17AA 3656 C +GeForce 820A 1140 17AA 36A9 C +GeForce GT 720M 1140 17AA 3800 C +GeForce GT 720M 1140 17AA 3801 C +GeForce GT 720M 1140 17AA 3802 C +GeForce GT 720M 1140 17AA 3803 C +GeForce GT 720M 1140 17AA 3804 C +GeForce GT 720M 1140 17AA 3806 C +GeForce GT 720M 1140 17AA 3808 C +GeForce 820M 1140 17AA 380D C +GeForce 820M 1140 17AA 380E C +GeForce 820M 1140 17AA 380F C +GeForce 820M 1140 17AA 3811 C +GeForce 820M 1140 17AA 3812 C +GeForce 820M 1140 17AA 3813 C +GeForce 820M 1140 17AA 3816 C +GeForce 820M 1140 17AA 3817 C +GeForce 820M 1140 17AA 3818 C +GeForce 820M 1140 17AA 381A C +GeForce 820M 1140 17AA 381C C +GeForce 610M 1140 17AA 3901 C +GeForce 710M 1140 17AA 3902 C +GeForce 710M 1140 17AA 3903 C +GeForce GT 625M 1140 17AA 3904 C +GeForce GT 720M 1140 17AA 3905 C +GeForce 820M 1140 17AA 3907 C +GeForce GT 720M 1140 17AA 3910 C +GeForce GT 720M 1140 17AA 3912 C +GeForce 820M 1140 17AA 3913 C +GeForce 610M 1140 17AA 3983 C +GeForce 610M 1140 17AA 5001 C +GeForce GT 720M 1140 17AA 5003 C +GeForce 705M 1140 17AA 5005 C +GeForce GT 620M 1140 17AA 500D C +GeForce 710M 1140 17AA 5014 C +GeForce 710M 1140 17AA 5017 C +GeForce 710M 1140 17AA 5019 C +GeForce 710M 1140 17AA 501A C +GeForce GT 720M 1140 17AA 501F C +GeForce 710M 1140 17AA 5025 C +GeForce 710M 1140 17AA 5027 C +GeForce 710M 1140 17AA 502A C +GeForce GT 720M 1140 17AA 502B C +GeForce 710M 1140 17AA 502D C +GeForce GT 720M 1140 17AA 502E C +GeForce GT 720M 1140 17AA 502F C +GeForce 705M 1140 17AA 5030 C +GeForce 705M 1140 17AA 5031 C +GeForce 820M 1140 17AA 5032 C +GeForce 820M 1140 17AA 5033 C +GeForce 710M 1140 17AA 503E C +GeForce 820M 1140 17AA 503F C +GeForce 820M 1140 17AA 5040 C +GeForce 710M 1140 1854 0177 C +GeForce 710M 1140 1854 0180 C +GeForce GT 720M 1140 1854 0190 C +GeForce GT 720M 1140 1854 0192 C +GeForce GT 620M 1140 1B0A 20DD C +GeForce GT 620M 1140 1B0A 20DF C +GeForce 820M 1140 1B0A 210E C +GeForce GT 720M 1140 1B0A 2202 C +GeForce 820M 1140 1B0A 90D7 C +GeForce 820M 1140 1B0A 90DD C +GeForce GTX 680 1180 D +GeForce GTX 660 Ti 1183 D +GeForce GTX 770 1184 D +GeForce GTX 660 1185 D +GeForce GTX 760 1185 10DE 106F D +GeForce GTX 760 1187 D +GeForce GTX 690 1188 D +GeForce GTX 670 1189 D +GeForce GTX 760 Ti OEM 1189 10DE 1074 D +GeForce GTX 760 (192-bit) 118E D +GeForce GTX 760 Ti OEM 1193 D +GeForce GTX 660 1195 D +GeForce GTX 880M 1198 D +GeForce GTX 870M 1199 D +GeForce GTX 760 1199 1458 D001 D +GeForce GTX 860M 119A D +GeForce GTX 775M 119D D +GeForce GTX 780M 119E D +GeForce GTX 780M 119F D +GeForce GTX 680M 11A0 D +GeForce GTX 670MX 11A1 D +GeForce GTX 675MX 11A2 D +GeForce GTX 680MX 11A3 D +GeForce GTX 675MX 11A7 D +GeForce GTX 660 11C0 D +GeForce GTX 650 Ti BOOST 11C2 D +GeForce GTX 650 Ti 11C3 D +GeForce GTX 645 11C4 D +GeForce GT 740 11C5 D +GeForce GTX 650 Ti 11C6 D +GeForce GTX 650 11C8 D +GeForce GTX 770M 11E0 D +GeForce GTX 765M 11E1 D +GeForce GTX 765M 11E2 D +GeForce GTX 760M 11E3 D +GeForce GTX 760A 11E3 17AA 3683 D +GeForce GTX 560 Ti 1200 C +GeForce GTX 560 1201 C +GeForce GTX 460 SE v2 1203 C +GeForce GTX 460 v2 1205 C +GeForce GTX 555 1206 C +GeForce GT 645 1207 C +GeForce GTX 560 SE 1208 C +GeForce GTX 570M 1210 C +GeForce GTX 580M 1211 C +GeForce GTX 675M 1212 C +GeForce GTX 670M 1213 C +GeForce GT 545 1241 C +GeForce GT 545 1243 C +GeForce GTX 550 Ti 1244 C +GeForce GTS 450 1245 C +GeForce GT 550M 1246 C +GeForce GT 555M 1247 C +GeForce GT 635M 1247 1043 212A C +GeForce GT 635M 1247 1043 212B C +GeForce GT 635M 1247 1043 212C C +GeForce GT 555M 1248 C +GeForce GTS 450 1249 C +GeForce GT 640 124B C +GeForce GT 555M 124D C +GeForce GT 635M 124D 1462 10CC C +GeForce GTX 560M 1251 C +GeForce GT 635 1280 D +GeForce GT 710 1281 D +GeForce GT 640 1282 C +GeForce GT 630 1284 C +GeForce GT 720 1286 D +GeForce GT 730 1287 C +GeForce GT 720 1288 D +GeForce GT 730M 1290 D +GeForce GT 730A 1290 103C 2AFA D +GeForce GT 735M 1291 D +GeForce GT 740M 1292 D +GeForce GT 740A 1292 17AA 3675 D +GeForce GT 740A 1292 17AA 3684 D +GeForce GT 730M 1293 D +GeForce 710M 1295 D +GeForce 710A 1295 103C 2B0D C +GeForce 710A 1295 103C 2B0F C +GeForce 810A 1295 103C 2B20 D +GeForce 810A 1295 103C 2B21 D +GeForce 825M 1296 D +GeForce GT 720M 1298 C +GeForce 830M 1340 E +GeForce 830A 1340 103C 2B2B E +GeForce 840M 1341 E +GeForce 840A 1341 17AA 3697 E +GeForce 840A 1341 17AA 3699 E +GeForce 840A 1341 17AA 369C E +GeForce GTX 750 Ti 1380 E +GeForce GTX 750 1381 E +GeForce GTX 745 1382 E +GeForce 845M 1390 E +GeForce GTX 850M 1391 E +GeForce GTX 850A 1391 17AA 3697 E +GeForce GTX 860M 1392 E +GeForce GTX 750 Ti 1392 1043 861E E +GeForce 840M 1393 E +GeForce GTX 980 13C0 E +GeForce GTX 970 13C2 E + +#NVIDIA Quadro GPUs + +#NVIDIA GPU product Device PCI ID* VDPAU features +Quadro 6000 06D8 C +Quadro 5000 06D9 C +Quadro 5000M 06DA C +Quadro 6000 06DC C +Quadro 4000 06DD C +Quadro 2000 0DD8 C +Quadro 2000D 0DD8 10DE 0914 C +Quadro 2000M 0DDA C +Quadro 600 0DF8 C +Quadro 500M 0DF9 C +Quadro 1000M 0DFA C +Quadro 3000M 0E3A C +Quadro 4000M 0E3B C +Quadro K420 0FF3 D +Quadro K1100M 0FF6 D +Quadro K500M 0FF8 D +Quadro K2000D 0FF9 D +Quadro K600 0FFA D +Quadro K2000M 0FFB D +Quadro K1000M 0FFC D +Quadro K2000 0FFE D +Quadro 410 0FFF D +Quadro K6000 103A D +Quadro K5200 103C D +Quadro 5010M 109A C +Quadro 7000 109B C +Quadro K4200 11B4 D +Quadro K3100M 11B6 D +Quadro K4100M 11B7 D +Quadro K5100M 11B8 D +Quadro K5000 11BA D +Quadro K5000M 11BC D +Quadro K4000M 11BD D +Quadro K3000M 11BE D +Quadro K4000 11FA D +Quadro K2100M 11FC D +Quadro K610M 12B9 D +Quadro K510M 12BA D +Quadro K2200 13BA E +Quadro K620 13BB E + +#NVIDIA NVS GPUs + +#NVIDIA GPU product Device PCI ID* VDPAU features +NVS 5400M 0DEF C +NVS 5200M 0DFC C +NVS 510 0FFD D +NVS 4200M 1056 D +NVS 4200M 1057 D +NVS 315 107C D +NVS 310 107D D +NVS 5200M 1140 1043 10DD C +NVS 5200M 1140 1043 10ED C +NVS 5200M 1140 1043 2136 C +NVS 5200M 1140 144D C0E2 C +NVS 5200M 1140 144D C0E3 C +NVS 5200M 1140 144D C0E4 C +NVS 5200M 1140 17AA 2200 C + +#NVIDIA Tesla GPUs + +#NVIDIA GPU product Device PCI ID* VDPAU features +Tesla C2050 / C2070 06D1 C +Tesla C2050 06D1 10DE 0771 C +Tesla C2070 06D1 10DE 0772 C +Tesla M2070 06D2 C +Tesla X2070 06D2 10DE 088F C +Tesla T20 Processor 06DE C +Tesla S2050 06DE 10DE 0773 C +Tesla M2050 06DE 10DE 082F C +Tesla X2070 06DE 10DE 0840 C +Tesla M2050 06DE 10DE 0842 C +Tesla M2050 06DE 10DE 0846 C +Tesla M2050 06DE 10DE 0866 C +Tesla M2050 06DE 10DE 0907 C +Tesla M2050 06DE 10DE 091E C +Tesla M2070-Q 06DF C +Tesla K20Xm 1021 D +Tesla K20c 1022 D +Tesla K40m 1023 D +Tesla K40c 1024 D +Tesla K20s 1026 D +Tesla K40st 1027 D +Tesla K20m 1028 D +Tesla K40s 1029 D +Tesla M2090 1091 C +Tesla X2090 1091 10DE 088E C +Tesla X2090 1091 10DE 0891 C +Tesla X2090 1091 10DE 0974 C +Tesla X2090 1091 10DE 098D C +Tesla M2075 1094 C +Tesla C2075 1096 C +Tesla C2050 1096 10DE 0911 C +Tesla K10 118F D +Tesla K8 1194 D + +#NVIDIA GRID GPUs + +#NVIDIA GPU product Device PCI ID* VDPAU features +GRID K340 0FEF D +GRID K1 0FF2 D +GRID K520 118A D +GRID K2 11BF D + diff --git a/abs/core/system-templates/templates/xscreensavers b/abs/core/system-templates/templates/xscreensavers index 887bef9..46e7c93 100644 --- a/abs/core/system-templates/templates/xscreensavers +++ b/abs/core/system-templates/templates/xscreensavers @@ -10,6 +10,7 @@ atlantis attraction atunnel barcode +binaryring blaster blinkbox blitspin @@ -28,7 +29,9 @@ carousel ccurve celtic circuit +cityflow cloudlife +companioncube compass coral crackberg @@ -67,6 +70,8 @@ fontglide fuzzyflakes galaxy gears +geodesic +geodesicgears gflux glblur glcells @@ -85,9 +90,9 @@ greynetic halftone halo helix +hexadrop +hilbert hopalong -hyperball -hypercube hypertorus hypnowheel ifs @@ -97,10 +102,10 @@ interference intermomentary jigglypuff jigsaw -juggle juggler3d julia kaleidescope +kaleidocycle klein kumppa lament @@ -141,10 +146,12 @@ polyominoes polytopes pong popsquares +projectiveplane providence pulsar pyro qix +quasicrystal queens rd-bomb ripples @@ -152,6 +159,7 @@ rocks rorschach rotzoomer rubik +rubikblocks sballs shadebobs sierpinski @@ -172,14 +180,18 @@ stonerview strange substrate superquadrics +surfaces swirl tangram +tessellimage thornbird timetunnel topblock triangle +tronbit truchet twang +unknownpleasures vermiculate vidwhacker voronoi @@ -187,6 +199,7 @@ wander webcollage webcollage-helper whirlwindwarp +winduprobot wormhole xanalogtv xflame diff --git a/abs/core/tcl/PKGBUILD b/abs/core/tcl/PKGBUILD index 19b78fc..a25e754 100644 --- a/abs/core/tcl/PKGBUILD +++ b/abs/core/tcl/PKGBUILD @@ -1,52 +1,58 @@ -# $Id: PKGBUILD 170721 2012-11-10 04:48:01Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Committer: Judd Vinet <jvinet@zeroflux.org> +# $Id$ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=tcl -pkgver=8.5.13 +pkgver=8.6.3 pkgrel=1 pkgdesc="The Tcl scripting language" arch=('i686' 'x86_64') url="http://tcl.sourceforge.net/" license=('custom') +depends=('zlib') +options=('staticlibs') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) -md5sums=('fa3a9bf9b2d6ed2431f1baa46f4058b8') +sha1sums=('026b4b6330205bdc49af12332ee17c2b01f76d37') + +prepare() { + cd tcl${pkgver} + # we build the tcl sqlite interface in sqlite-tcl package + rm -rf pkgs/sqlite3* +} build() { - cd ${srcdir}/tcl${pkgver}/unix - - if [ "$CARCH" = "x86_64" ]; then - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit - else - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-64bit - fi - + cd tcl${pkgver}/unix + [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT make } check() { - cd ${srcdir}/tcl${pkgver}/unix + cd tcl${pkgver}/unix make test } -package() -{ - cd ${srcdir}/tcl${pkgver}/unix - - make INSTALL_ROOT=${pkgdir} install install-private-headers - ln -sf tclsh8.5 ${pkgdir}/usr/bin/tclsh - - # install license - install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +package() { + cd tcl${pkgver}/unix + make INSTALL_ROOT="${pkgdir}" install install-private-headers + ln -sf tclsh${pkgver%.*} "${pkgdir}/usr/bin/tclsh" + ln -sf libtcl${pkgver%.*}.so "${pkgdir}/usr/lib/libtcl.so" + install -Dm644 ../license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # remove buildroot traces - sed -i \ - -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib," \ - -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/include'," \ - -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/lib," \ - -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/lib," \ - -e "s,^TCL_LIB_FILE='libtcl8.5..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.5\$\{TCL_DBGX\}.so\"," \ - -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/lib'," \ - -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/lib'," \ - ${pkgdir}/usr/lib/tclConfig.sh + sed -e "s#${srcdir}/tcl${pkgver}/unix#/usr/lib#" \ + -e "s#${srcdir}/tcl${pkgver}#/usr/include#" \ + -i "${pkgdir}/usr/lib/tclConfig.sh" + + tdbcver=tdbc1.0.2 + sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$tdbcver#/usr/lib/$tdbcver#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/generic#/usr/include#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/library#/usr/lib/tcl${pkgver%.*}#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver#/usr/include#" \ + -i "${pkgdir}/usr/lib/$tdbcver/tdbcConfig.sh" + + itclver=itcl4.0.2 + sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$itclver#/usr/lib/$itclver#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver/generic#/usr/include#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver#/usr/include#" \ + -i "${pkgdir}/usr/lib/$itclver/itclConfig.sh" } diff --git a/abs/core/tk/PKGBUILD b/abs/core/tk/PKGBUILD index b9bf237..9b2872c 100644 --- a/abs/core/tk/PKGBUILD +++ b/abs/core/tk/PKGBUILD @@ -1,56 +1,39 @@ -# $Id: PKGBUILD 170723 2012-11-10 04:52:11Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> +# $Id$ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=tk -pkgver=8.5.13 +pkgver=8.6.3 pkgrel=1 pkgdesc="A windowing toolkit for use with tcl" arch=('i686' 'x86_64') url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') +options=('staticlibs') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) -md5sums=('1fc7dbb7495160756dbc805224afa360') +sha1sums=('244ddc0f64cc3d429c9d86135d0bbe2cf06c9360') build() { - cd ${srcdir}/tk${pkgver}/unix - - if [ "$CARCH" = "x86_64" ]; then - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit - else - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-64bit - fi - + cd tk${pkgver}/unix + [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-rpath $BIT make } -#check() { -# cd ${srcdir}/tk${pkgver}/unix +check() { + cd tk${pkgver}/unix # make test -#} +} package() { - cd ${srcdir}/tk${pkgver}/unix - - make INSTALL_ROOT=${pkgdir} install install-private-headers - ln -sf wish8.5 ${pkgdir}/usr/bin/wish - - # install private headers (FS#14388) - cd ${srcdir}/tk${pkgver} - for dir in compat generic generic/ttk unix; do - install -dm755 ${pkgdir}/usr/include/tk-private/$dir - install -m644 -t ${pkgdir}/usr/include/tk-private/$dir $dir/*.h - done - - # install license - install -Dm644 license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd tk${pkgver}/unix + make INSTALL_ROOT="${pkgdir}" install install-private-headers + ln -sf wish${pkgver%.*} "${pkgdir}/usr/bin/wish" + ln -sf libtk${pkgver%.*}.so "${pkgdir}/usr/lib/libtk.so" + install -Dm644 license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # remove buildroot traces - sed -i \ - -e "s,^TK_BUILD_LIB_SPEC='-L.*/unix,TK_BUILD_LIB_SPEC='-L/usr/lib," \ - -e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='/usr/include'," \ - -e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix,TK_BUILD_STUB_LIB_SPEC='-L/usr/lib," \ - -e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='/usr/lib," \ - ${pkgdir}/usr/lib/tkConfig.sh + sed -e "s#${srcdir}/tk${pkgver}/unix#/usr/lib#" \ + -e "s#${srcdir}/tk${pkgver}#/usr/include#" \ + -i "${pkgdir}/usr/lib/tkConfig.sh" } diff --git a/abs/core/ttf-dejavu/PKGBUILD b/abs/core/ttf-dejavu/PKGBUILD index 35f8e15..cfedc62 100644 --- a/abs/core/ttf-dejavu/PKGBUILD +++ b/abs/core/ttf-dejavu/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=ttf-dejavu -pkgver=2.33 -pkgrel=4 +pkgver=2.34 +pkgrel=1 pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters" arch=('any') url="http://dejavu-fonts.org/wiki/Main_Page" @@ -14,7 +14,7 @@ depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-mkfontscale' 'xorg-mkfontdir' provides=('ttf-font') install=ttf-dejavu.install source=(http://downloads.sourceforge.net/project/dejavu/dejavu/${pkgver}/dejavu-fonts-ttf-${pkgver}.tar.bz2) -md5sums=('8b601e91725b6d69141b0fcf527948c0') +md5sums=('161462de16e2ca79873bc2b0d2e6c74c') package() { install -dm755 "${pkgdir}"/etc/fonts/conf.avail diff --git a/abs/core/tzdata/PKGBUILD b/abs/core/tzdata/PKGBUILD index 1f4c16a..f380cab 100644 --- a/abs/core/tzdata/PKGBUILD +++ b/abs/core/tzdata/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 163845 2012-07-21 11:06:11Z andyrtr $ +# $Id$ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=tzdata -pkgver=2012d +pkgver=2014i pkgrel=1 pkgdesc="Sources for time zone and daylight saving time data" arch=('any') url="http://www.iana.org/time-zones" license=('GPL') options=('!emptydirs') -source=(http://www.iana.org/time-zones/repository/releases/${pkgname}${pkgver}.tar.gz) -sha1sums=('65d98727233bfd3f5d20dceafab0a81ae2cb5527') +source=(http://www.iana.org/time-zones/repository/releases/${pkgname}${pkgver}.tar.gz{,.asc}) +sha1sums=('4e44c5ff587a8afd187275338510aeabeaaf2181' + 'SKIP') timezones=('africa' 'antarctica' 'asia' 'australasia' 'europe' 'northamerica' 'southamerica' 'pacificnew' 'etcetera' 'backward' - 'systemv' 'factory' - 'solar87' 'solar88' 'solar89') + 'systemv' 'factory') package() { cd ${srcdir} zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo ${timezones[@]} zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo/posix ${timezones[@]} zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo/right -L leapseconds ${timezones[@]} + zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo -p America/New_York - install -m444 -t ${pkgdir}/usr/share/zoneinfo iso3166.tab zone.tab + install -m444 -t ${pkgdir}/usr/share/zoneinfo iso3166.tab zone1970.tab zone.tab # zone.tab is depricated and will go soon } diff --git a/abs/core/util-linux/0001-lsblk-fix-D-segfault.patch b/abs/core/util-linux/0001-lsblk-fix-D-segfault.patch deleted file mode 100644 index 8e4d7c6..0000000 --- a/abs/core/util-linux/0001-lsblk-fix-D-segfault.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 71d842c01992b3678de4da4773ed54f08c0ab4f6 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Mon, 18 Nov 2013 11:27:35 +0100 -Subject: [PATCH] lsblk: fix -D segfault - -References: https://bugzilla.redhat.com/show_bug.cgi?id=1031262 -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - misc-utils/lsblk.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index 9f7f1b6..9b53be3 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -903,7 +903,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line - if (cxt->discard && p) - tt_line_set_data(ln, col, p); - else -- tt_line_set_data(ln, col, "0"); -+ tt_line_set_data(ln, col, xstrdup("0")); - break; - case COL_DGRAN: - if (lsblk->bytes) -@@ -936,7 +936,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line - if (cxt->discard && p) - tt_line_set_data(ln, col, p); - else -- tt_line_set_data(ln, col, "0"); -+ tt_line_set_data(ln, col, xstrdup("0")); - break; - case COL_WSAME: - if (lsblk->bytes) -@@ -948,7 +948,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line - "queue/write_same_max_bytes", &x) == 0) - p = size_to_human_string(SIZE_SUFFIX_1LETTER, x); - } -- tt_line_set_data(ln, col, p ? p : "0"); -+ tt_line_set_data(ln, col, p ? p : xstrdup("0")); - break; - }; - } --- -1.8.4.2 - diff --git a/abs/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch b/abs/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch deleted file mode 100644 index 34040b9..0000000 --- a/abs/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c8e5e6e7323642f7e6f12ee5f5231b0ec44c40ab Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Thu, 21 Nov 2013 12:25:27 -0500 -Subject: [PATCH] pylibmount: correctly import from pylibmount.so - -Without this, python is unable to find the module: - -$ python -c 'import libmount' -Traceback (most recent call last): - File "<string>", line 1, in <module> - File "/usr/lib/python3.3/site-packages/libmount/__init__.py", line 1, in <module> - from pylibmount import * -ImportError: No module named 'pylibmount' - -Signed-off-by: Dave Reisner <dreisner@archlinux.org> ---- - libmount/python/libmount/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libmount/python/libmount/__init__.py b/libmount/python/libmount/__init__.py -index 243c639..09104e2 100644 ---- a/libmount/python/libmount/__init__.py -+++ b/libmount/python/libmount/__init__.py -@@ -1,2 +1,2 @@ --from pylibmount import * -+from .pylibmount import * - --- -1.8.4.2 - diff --git a/abs/core/util-linux/PKGBUILD b/abs/core/util-linux/PKGBUILD index 53aa53e..0f8936d 100755 --- a/abs/core/util-linux/PKGBUILD +++ b/abs/core/util-linux/PKGBUILD @@ -1,43 +1,26 @@ -# $Id: PKGBUILD 201467 2013-12-12 15:33:24Z dreisner $ +# $Id$ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> -pkgname=util-linux -pkgver=2.24 -pkgrel=2 +pkgbase=util-linux +pkgname=(util-linux libutil-linux) +pkgver=2.25.2 +pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') -groups=('base' 'base-devel') -depends=('pam' 'shadow' 'coreutils' 'glibc') -optdepends=('python: python bindings to libmount') makedepends=('systemd' 'python2') -# checkdepends=('bc') -conflicts=('util-linux-ng' 'eject') -provides=("util-linux-ng=$pkgver" 'eject') license=('GPL2') options=('strip' 'debug') -source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.24/$pkgname-$pkgver.tar.xz" - 0001-lsblk-fix-D-segfault.patch - 0001-pylibmount-correctly-import-from-pylibmount.so.patch +source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.25/$pkgname-$pkgver.tar.xz" uuidd.tmpfiles - pam-login - pam-common - pam-su) -backup=(etc/pam.d/chfn - etc/pam.d/chsh - etc/pam.d/login - etc/pam.d/su - etc/pam.d/su-l) -install=util-linux.install - -prepare() { - cd "$pkgname-$pkgver" - - patch -Np1 <"$srcdir"/0001-lsblk-fix-D-segfault.patch - patch -Np1 <"$srcdir"/0001-pylibmount-correctly-import-from-pylibmount.so.patch -} + pam-{login,common,su}) +md5sums=('cab3d7be354000f629bc601238b629b3' + 'a39554bfd65cccfd8254bb46922f4a67' + '4368b3f98abd8a32662e094c54e7f9b1' + 'a31374fef2cba0ca34dfc7078e2969e4' + 'fa85e5cce5d723275b14365ba71a8aad') build() { cd "$pkgname-$pkgver" @@ -56,18 +39,22 @@ build() { --enable-socket-activation \ --with-python=2 -# --enable-reset \ # part of ncurses -# --enable-last \ # not compat - make } -#check() { -# fails for some reason in chroot, works outside -# make -C "$pkgname-$pkgver" check -#} +package_util-linux() { + conflicts=('util-linux-ng' 'eject') + provides=("util-linux-ng=$pkgver" 'eject') + depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libutil-linux') + optdepends=('python: python bindings to libmount') + install=util-linux.install + groups=('base' 'base-devel') + backup=(etc/pam.d/chfn + etc/pam.d/chsh + etc/pam.d/login + etc/pam.d/su + etc/pam.d/su-l) -package() { cd "$pkgname-$pkgver" make DESTDIR="${pkgdir}" install @@ -91,12 +78,16 @@ package() { mv {,usr/}sbin/* usr/bin rmdir sbin usr/sbin - + ### create libutil-linux split + rm -rf "$srcdir/_libutil-linux" + install -dm755 "$srcdir"/_libutil-linux/usr/lib + cd "$srcdir"/_libutil-linux + mv "$pkgdir"/usr/lib/lib*.{a,so}* usr/lib +} + +package_libutil-linux() { + pkgdesc="util-linux runtime libraries" + provides=('libblkid.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so') + + mv "$srcdir/_libutil-linux"/* "$pkgdir" } -md5sums=('4fac6443427f575fc5f3531a4ad2ca01' - '1899fe3b853a5835c76cca0501b6b518' - 'a18a1e89ffdfa3bc96ae976646a723ec' - 'a39554bfd65cccfd8254bb46922f4a67' - '4368b3f98abd8a32662e094c54e7f9b1' - 'a31374fef2cba0ca34dfc7078e2969e4' - 'fa85e5cce5d723275b14365ba71a8aad') diff --git a/abs/not_built/core/v4l-dvb/PKGBUILD b/abs/core/v4l-dvb/PKGBUILD index f19c2fa..3292d27 100644 --- a/abs/not_built/core/v4l-dvb/PKGBUILD +++ b/abs/core/v4l-dvb/PKGBUILD @@ -2,14 +2,14 @@ pkgname=v4l-dvb _kernver=`uname -r` -pkgver=20120904 +pkgver=20141028 pkgrel=1 -pkgdesc="V4L-DVB device drivers (newer than those included in kernel26)" +pkgdesc="V4L-DVB device drivers (newer than those included in linux pkg)" arch=('i686' 'x86_64') url="http://linuxtv.org/" license=('GPL2') -depends=('kernel26') -makedepends=('git' 'kernel26-headers' 'perl-proc-processtable' 'patchutils') +depends=('') +makedepends=('git' 'linux-headers' 'perl-proc-processtable' 'patchutils') options=(!makeflags) install=v4l-dvb.install _gitroot="git://linuxtv.org/media_build.git" @@ -32,18 +32,14 @@ build() { make download untar cd .. -# Build with 3.0-ARCH kernel -# sed -i -e "s/KERNELRELEASE\ :=/KERNELRELEASE\ :=\ ${_kernver}/" \ -# -e "s/\$(KERNELRELEASE)/${_kernver}/" \ -# "${srcdir}/${_gitname}"/v4l/Makefile{,.sound} - make } package() { + install -dm755 "${srcdir}/usr/lib/modules/$_kernver/updates" cd "${srcdir}/${_gitname}" - make DESTDIR="${pkgdir}/lib/modules/$_kernver/updates" install + make DESTDIR="${pkgdir}/usr/lib/modules/$_kernver/updates" install # compress new kernel modules - find ${pkgdir}/lib/modules/$_kernver/updates/ -not -name 'media.ko' -name '*.ko' -exec gzip '{}' \; + find ${pkgdir}/usr/lib/modules/$_kernver/updates/ -not -name 'media.ko' -name '*.ko' -exec gzip '{}' \; } md5sums=() diff --git a/abs/not_built/core/v4l-dvb/v4l-dvb.install b/abs/core/v4l-dvb/v4l-dvb.install index f7b7197..f7b7197 100644 --- a/abs/not_built/core/v4l-dvb/v4l-dvb.install +++ b/abs/core/v4l-dvb/v4l-dvb.install diff --git a/abs/core/v4l-utils/PKGBUILD b/abs/core/v4l-utils/PKGBUILD index abed01e..caa9233 100644 --- a/abs/core/v4l-utils/PKGBUILD +++ b/abs/core/v4l-utils/PKGBUILD @@ -1,8 +1,8 @@ # $Id$ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils -pkgver=1.0.1 -pkgrel=1 +pkgver=1.6.0 +pkgrel=2 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64') url="http://linuxtv.org/" @@ -11,12 +11,12 @@ replaces=('libv4l') conflicts=('libv4l') backup=(etc/rc_maps.cfg) license=('LGPL') -makedepends=('qt') -optdepends=('qt') +makedepends=('qt4') +optdepends=('qt4') depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2 http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc) -sha256sums=('fc0132e82a18dfad9619be3abf50c206e2f449b1c14440cde36f25874fdce7df' +sha256sums=('6054d3120c67a1524993e699b3b02036c817bb000b742c332682163966dc7605' 'SKIP') build() { diff --git a/abs/core/v4l-utils/__changelog b/abs/core/v4l-utils/__changelog deleted file mode 100644 index acf8dd2..0000000 --- a/abs/core/v4l-utils/__changelog +++ /dev/null @@ -1 +0,0 @@ -PKGBUILD: change dep qt4 to qt diff --git a/abs/core/vdpauinfo/PKGBUILD b/abs/core/vdpauinfo/PKGBUILD index d5d0807..2df07ba 100644 --- a/abs/core/vdpauinfo/PKGBUILD +++ b/abs/core/vdpauinfo/PKGBUILD @@ -1,28 +1,25 @@ -# Maintainer: Bart Verhoeven <nepherte at gmail dot com> +# Maintainer: Bart Verhoeven <bartverhoeven@live.com> + pkgname=vdpauinfo -pkgver=0.0.6 -pkgrel=6 +pkgver=0.1 +pkgrel=2 pkgdesc="Command line utility for querying the capabilities of a VDPAU device." arch=('i686' 'x86_64') url="http://cgit.freedesktop.org/~aplattner/vdpauinfo" license=('custom') -changelog=$pkgname.changelog -depends=('libvdpau' 'libxfixes') -source=('http://cgit.freedesktop.org/~aplattner/vdpauinfo/snapshot/vdpauinfo-0.0.6.tar.bz2') -sha256sums=('9a81a13780cbf668ac7d6d6449a4f12857891775cc945ffa9ff27f8ffd102b25') +depends=('libvdpau' 'libx11') +source=("http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz") +sha256sums=('b0c856a6933e306f3f783717a29124c7d145d6027a3175e197249696f5d5019f') build() { - cd $srcdir/$pkgname-$pkgver - - autoreconf -i + cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr VDPAU_CFLAGS=-I/usr/include \ - VDPAU_LIBS=-lvdpau LIBS=-lX11 + ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install - install -D -m644 $srcdir/$pkgname-$pkgver/LICENSE $pkgdir/usr/share/licenses/$pkgname/license + install -D -m644 "$srcdir"/$pkgname-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/license } diff --git a/abs/core/wget/PKGBUILD b/abs/core/wget/PKGBUILD index d218e4e..c531535 100644 --- a/abs/core/wget/PKGBUILD +++ b/abs/core/wget/PKGBUILD @@ -2,23 +2,28 @@ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wget -pkgver=1.15 -pkgrel=1 +pkgver=1.16 +pkgrel=2 pkgdesc="A network utility to retrieve files from the Web" arch=('i686' 'x86_64') url="http://www.gnu.org/software/wget/wget.html" license=('GPL3') -depends=('openssl' 'libidn' 'util-linux') -checkdepends=('perl-http-daemon' 'perl-io-socket-ssl') +depends=('openssl' 'libidn' 'libutil-linux') +checkdepends=('perl-http-daemon' 'perl-io-socket-ssl' 'python') optdepends=('ca-certificates: HTTPS downloads') backup=('etc/wgetrc') install=wget.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) -sha1sums=('e9fb1d25fa04f9c69e74e656a3174dca02700ba1' - 'SKIP') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} + wget-1.16-fix-test-proxied-https-auth.patch) +sha1sums=('08d991acc80726abe57043a278f9da469c454503' + 'SKIP' + 'a324d1910a6440552a3745c873da9e3dff7d7ec9') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/wget-1.16-fix-test-proxied-https-auth.patch" + sed -i 's/--no-check-certificate/& --no-http-keep-alive/' \ + tests/Test-proxied-https-auth.px cat >> doc/sample.wgetrc <<EOF # default root certs location diff --git a/abs/core/wget/wget-1.16-fix-test-proxied-https-auth.patch b/abs/core/wget/wget-1.16-fix-test-proxied-https-auth.patch new file mode 100644 index 0000000..4d38744 --- /dev/null +++ b/abs/core/wget/wget-1.16-fix-test-proxied-https-auth.patch @@ -0,0 +1,89 @@ +From 3eff3ad69a46364475e1f4abdf9412cfa87e3d6c Mon Sep 17 00:00:00 2001 +From: Tim Rühsen <tim.ruehsen@gmx.de> +Date: Tue, 28 Oct 2014 10:40:34 +0000 +Subject: synchronize client and server in Test-proxied-https-auth.px + +--- +(limited to 'tests/Test-proxied-https-auth.px') + +diff --git a/tests/Test-proxied-https-auth.px b/tests/Test-proxied-https-auth.px +index cc987ff..272003f 100755 +--- a/tests/Test-proxied-https-auth.px ++++ b/tests/Test-proxied-https-auth.px +@@ -49,12 +49,15 @@ sub get_request { + } + + sub do_server { ++ my ($synch_callback) = @_; + my $alrm = alarm 10; +- + my $s = $SOCKET; + my $conn; + my $rqst; + my $rspn; ++ ++ $synch_callback->(); ++ + for my $expect_inner_auth (0, 1) { + $conn = $s->accept; + $rqst = $conn->get_request; +@@ -90,7 +93,7 @@ sub do_server { + Connection => 'close' + ]); + $rspn->protocol('HTTP/1.0'); +- print $rspn->as_string; ++ print STDERR $rspn->as_string; + print $conn $rspn->as_string; + } else { + die "No proxied auth\n" unless $rqst->header('Authorization'); +@@ -100,9 +103,9 @@ sub do_server { + 'Connection' => 'close', + ], "foobarbaz\n"); + $rspn->protocol('HTTP/1.0'); +- print "=====\n"; +- print $rspn->as_string; +- print "\n=====\n"; ++ print STDERR "=====\n"; ++ print STDERR $rspn->as_string; ++ print STDERR "\n=====\n"; + print $conn $rspn->as_string; + } + $conn->close; +@@ -113,18 +116,29 @@ sub do_server { + } + + sub fork_server { +- my $pid = fork; +- die "Couldn't fork" if ($pid < 0); +- return $pid if $pid; ++ pipe(FROM_CHILD, TO_PARENT) or die "Cannot create pipe!"; ++ select((select(TO_PARENT), $| = 1)[0]); ++ ++ my $pid = fork(); ++ if ($pid < 0) { ++ die "Cannot fork"; ++ } elsif ($pid == 0) { ++ # child ++ close FROM_CHILD; ++ do_server(sub { print TO_PARENT "SYNC\n"; close TO_PARENT }); ++ } else { ++ # parent ++ close TO_PARENT; ++ chomp(my $line = <FROM_CHILD>); ++ close FROM_CHILD; ++ } + +- &do_server; +- exit; ++ return $pid; + } + + system ('rm -f needs-auth.txt'); + my $pid = &fork_server; + +-sleep 1; + my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee" + . " --password=Dodgson -e https_proxy=localhost:{{port}}" + . " --no-check-certificate" +-- +cgit v0.9.0.2 diff --git a/abs/core/windowmaker/PKGBUILD b/abs/core/windowmaker/PKGBUILD index 61c2b65..2c12ff1 100644 --- a/abs/core/windowmaker/PKGBUILD +++ b/abs/core/windowmaker/PKGBUILD @@ -1,22 +1,45 @@ -# $Id: PKGBUILD 159727 2012-05-26 10:06:04Z daniel $ +# $Id$ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> + pkgname=windowmaker -pkgver=0.95.4 -pkgrel=5 +pkgver=0.95.6 +pkgrel=1 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://www.windowmaker.org/" license=('GPL' 'custom') depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') -options=('!libtool') -source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz wmaker.desktop) -#source=(WindowMaker-$pkgver.tar.gz wmaker.desktop) +source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz + wmaker.desktop + giflib_510.diff) install=wmaker.install +md5sums=('5b3cf9e6cd1f4066ffa5f2f22c25aee3' + '2fba97bebfd691836b92b8f0db79ff13' + 'ac51e22a9d6a8d653cfa8cbcc6fea96e') + +prepare() { + cd WindowMaker-$pkgver + #patch -Np0 -i ../wm-giflib.patch + + # patch taken from NetBSD + patch -Np0 -i ../giflib_510.diff + + autoreconf -fi + + # fix some paths FS#3080 - ckeck also Gentoo ebuild + for file in WindowMaker/*menu* util/wmgenmenu.c; do + if [[ -r $file ]] ; then + sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:/usr/lib/GNUstep/Applications/WPrefs.app:g;" "$file" + sed -i -e "s:/usr/local/share/WindowMaker:/usr/share/WindowMaker:g;" "$file" + sed -i -e "s:/opt/share/WindowMaker:/usr/share/WindowMaker:g;" "$file" + fi; + done; +} + build() { - cd $srcdir/WindowMaker-$pkgver + cd WindowMaker-$pkgver [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" -# sh ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ --enable-usermenu --enable-modelock --enable-xrandr @@ -24,12 +47,10 @@ build() { } package() { - cd $srcdir/WindowMaker-$pkgver + cd WindowMaker-$pkgver - make DESTDIR=$pkgdir install - install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL - install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop + make DESTDIR="$pkgdir" install + install -D -m644 COPYING.WTFPL "$pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL" + install -D -m644 ../wmaker.desktop "$pkgdir/usr/share/xsessions/wmaker.desktop" } -md5sums=('81d7138ea89618b2c7093f6ecff7d603' - '2fba97bebfd691836b92b8f0db79ff13') diff --git a/abs/core/windowmaker/giflib_510.diff b/abs/core/windowmaker/giflib_510.diff new file mode 100644 index 0000000..742d6d2 --- /dev/null +++ b/abs/core/windowmaker/giflib_510.diff @@ -0,0 +1,20 @@ +--- wrlib/load_gif.c.orig 2013-09-12 22:43:54.000000000 +0100 ++++ wrlib/load_gif.c 2014-05-16 10:10:04.000000000 +0100 +@@ -81,7 +81,7 @@ RImage *RLoadGIF(const char *file, int i + } + + if (gif->SWidth < 1 || gif->SHeight < 1) { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + RErrorCode = RERR_BADIMAGEFILE; + return NULL; + } +@@ -216,7 +216,7 @@ RImage *RLoadGIF(const char *file, int i + free(buffer); + + if (gif) +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + + return image; + } diff --git a/abs/core/windowmaker/wm-giflib.patch b/abs/core/windowmaker/wm-giflib.patch new file mode 100644 index 0000000..4b6b690 --- /dev/null +++ b/abs/core/windowmaker/wm-giflib.patch @@ -0,0 +1,2422 @@ +Index: WINGs/Examples/colorpick.c +=================================================================== +--- WINGs/Examples/colorpick.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Examples/colorpick.c 2013-01-18 16:57:47.955049409 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <WINGs/WINGs.h> +Index: WINGs/Examples/fontl.c +=================================================================== +--- WINGs/Examples/fontl.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Examples/fontl.c 2013-01-18 16:57:47.955049409 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <stdint.h> +Index: WINGs/Examples/puzzle.c +=================================================================== +--- WINGs/Examples/puzzle.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Examples/puzzle.c 2013-01-18 16:57:47.955049409 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <WINGs/WINGs.h> +Index: WINGs/Extras/test.c +=================================================================== +--- WINGs/Extras/test.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Extras/test.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + #include <stdio.h> + #include <stdint.h> +Index: WINGs/Extras/wtabledelegates.c +=================================================================== +--- WINGs/Extras/wtabledelegates.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Extras/wtabledelegates.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdint.h> + #include <WINGs/WINGsP.h> + +Index: WINGs/Extras/wtableview.c +=================================================================== +--- WINGs/Extras/wtableview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Extras/wtableview.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + #include <X11/cursorfont.h> + #include <stdint.h> +Index: WINGs/Tests/mywidget.c +=================================================================== +--- WINGs/Tests/mywidget.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/mywidget.c 2013-01-18 16:57:47.956049439 +0100 +@@ -13,6 +13,10 @@ + * + * + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + + /* +Index: WINGs/Tests/testmywidget.c +=================================================================== +--- WINGs/Tests/testmywidget.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/testmywidget.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + #include <stdlib.h> + +Index: WINGs/Tests/wmfile.c +=================================================================== +--- WINGs/Tests/wmfile.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/wmfile.c 2013-01-18 16:57:47.957049469 +0100 +@@ -11,6 +11,10 @@ + ----------------------------------------------------------------------- + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + + #include <unistd.h> +Index: WINGs/Tests/wmquery.c +=================================================================== +--- WINGs/Tests/wmquery.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/wmquery.c 2013-01-18 16:57:47.957049469 +0100 +@@ -3,6 +3,10 @@ + * Author: Len Trigg <trigg@cs.waikato.ac.nz> + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + + #include <unistd.h> +Index: WINGs/Tests/wtest.c +=================================================================== +--- WINGs/Tests/wtest.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/wtest.c 2013-01-18 16:57:47.957049469 +0100 +@@ -2,6 +2,10 @@ + * WINGs test application + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + + #include <stdio.h> +Index: WINGs/array.c +=================================================================== +--- WINGs/array.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/array.c 2013-01-18 16:57:47.957049469 +0100 +@@ -8,6 +8,10 @@ + * proper credit is always appreciated :) + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <string.h> + +Index: WINGs/bagtree.c +=================================================================== +--- WINGs/bagtree.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/bagtree.c 2013-01-18 16:57:47.957049469 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <string.h> + +Index: WINGs/configuration.c +=================================================================== +--- WINGs/configuration.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/configuration.c 2013-01-18 16:57:47.958049499 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/data.c +=================================================================== +--- WINGs/data.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/data.c 2013-01-18 16:57:47.958049499 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <string.h> + #include "WUtil.h" + +Index: WINGs/dragcommon.c +=================================================================== +--- WINGs/dragcommon.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/dragcommon.c 2013-01-18 16:57:47.958049499 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion +Index: WINGs/dragdestination.c +=================================================================== +--- WINGs/dragdestination.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/dragdestination.c 2013-01-18 16:57:47.958049499 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include <X11/Xatom.h> + +Index: WINGs/dragsource.c +=================================================================== +--- WINGs/dragsource.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/dragsource.c 2013-01-18 16:57:47.959049529 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +Index: WINGs/error.c +=================================================================== +--- WINGs/error.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/error.c 2013-01-18 16:57:47.959049529 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdarg.h> +Index: WINGs/findfile.c +=================================================================== +--- WINGs/findfile.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/findfile.c 2013-01-18 16:57:47.959049529 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include "WUtil.h" +Index: WINGs/handlers.c +=================================================================== +--- WINGs/handlers.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/handlers.c 2013-01-18 16:57:47.959049529 +0100 +@@ -3,6 +3,10 @@ + * WINGs internal handlers: timer, idle and input handlers + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +Index: WINGs/hashtable.c +=================================================================== +--- WINGs/hashtable.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/hashtable.c 2013-01-18 16:57:47.959049529 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <string.h> + #include <stdlib.h> +Index: WINGs/memory.c +=================================================================== +--- WINGs/memory.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/memory.c 2013-01-18 16:57:47.959049529 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WUtil.h" + +Index: WINGs/misc.c +=================================================================== +--- WINGs/misc.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/misc.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,6 +1,10 @@ + + /* Miscelaneous helper functions */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + WMRange wmkrange(int start, int count) +Index: WINGs/notification.c +=================================================================== +--- WINGs/notification.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/notification.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <assert.h> + #include <stdio.h> +Index: WINGs/proplist.c +=================================================================== +--- WINGs/proplist.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/proplist.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: WINGs/selection.c +=================================================================== +--- WINGs/selection.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/selection.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + + #include <X11/Xatom.h> +Index: WINGs/string.c +=================================================================== +--- WINGs/string.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/string.c 2013-01-18 16:57:47.961049589 +0100 +@@ -6,6 +6,10 @@ + # undef _XOPEN_SOURCE + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <string.h> +Index: WINGs/tree.c +=================================================================== +--- WINGs/tree.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/tree.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <string.h> + + #include "WUtil.h" +Index: WINGs/userdefaults.c +=================================================================== +--- WINGs/userdefaults.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/userdefaults.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <string.h> + #include <strings.h> +Index: WINGs/usleep.c +=================================================================== +--- WINGs/usleep.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/usleep.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <errno.h> + #include <time.h> + +Index: WINGs/wapplication.c +=================================================================== +--- WINGs/wapplication.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wapplication.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <unistd.h> + #include <X11/Xlocale.h> + +Index: WINGs/wappresource.c +=================================================================== +--- WINGs/wappresource.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wappresource.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <unistd.h> + + #include "WINGsP.h" +Index: WINGs/wballoon.c +=================================================================== +--- WINGs/wballoon.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wballoon.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +Index: WINGs/wbox.c +=================================================================== +--- WINGs/wbox.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wbox.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct { +Index: WINGs/wbrowser.c +=================================================================== +--- WINGs/wbrowser.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wbrowser.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include <math.h> /* for : double rint (double) */ + +Index: WINGs/wbutton.c +=================================================================== +--- WINGs/wbutton.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wbutton.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Button { +Index: WINGs/wcolor.c +=================================================================== +--- WINGs/wcolor.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wcolor.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include "wconfig.h" +Index: WINGs/wcolorpanel.c +=================================================================== +--- WINGs/wcolorpanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wcolorpanel.c 2013-01-18 16:57:47.963049651 +0100 +@@ -23,6 +23,10 @@ + * - Resizing + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + #include "rgb.h" +Index: WINGs/wcolorwell.c +=================================================================== +--- WINGs/wcolorwell.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wcolorwell.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #define XDND_COLOR_DATA_TYPE "application/X-color" +Index: WINGs/wevent.c +=================================================================== +--- WINGs/wevent.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wevent.c 2013-01-18 16:57:47.964049682 +0100 +@@ -3,6 +3,10 @@ + * This event handling stuff was inspired on Tk. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + /* table to map event types to event masks */ +Index: WINGs/wfilepanel.c +=================================================================== +--- WINGs/wfilepanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wfilepanel.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: WINGs/wfont.c +=================================================================== +--- WINGs/wfont.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wfont.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + + #include "wconfig.h" +Index: WINGs/wfontpanel.c +=================================================================== +--- WINGs/wfontpanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wfontpanel.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "WUtil.h" + #include "wconfig.h" +Index: WINGs/wframe.c +=================================================================== +--- WINGs/wframe.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wframe.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Frame { +Index: WINGs/widgets.c +=================================================================== +--- WINGs/widgets.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/widgets.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/winputmethod.c +=================================================================== +--- WINGs/winputmethod.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/winputmethod.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + + #include "WINGsP.h" +Index: WINGs/wlabel.c +=================================================================== +--- WINGs/wlabel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wlabel.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Label { +Index: WINGs/wlist.c +=================================================================== +--- WINGs/wlist.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wlist.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + char *WMListDidScrollNotification = "WMListDidScrollNotification"; +Index: WINGs/wmenuitem.c +=================================================================== +--- WINGs/wmenuitem.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wmenuitem.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_MenuItem { +Index: WINGs/wmisc.c +=================================================================== +--- WINGs/wmisc.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wmisc.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <wraster.h> +Index: WINGs/wpanel.c +=================================================================== +--- WINGs/wpanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wpanel.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <X11/keysym.h> +Index: WINGs/wpixmap.c +=================================================================== +--- WINGs/wpixmap.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wpixmap.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <wraster.h> +Index: WINGs/wpopupbutton.c +=================================================================== +--- WINGs/wpopupbutton.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wpopupbutton.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_PopUpButton { +Index: WINGs/wprogressindicator.c +=================================================================== +--- WINGs/wprogressindicator.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wprogressindicator.c 2013-01-18 16:57:47.967049773 +0100 +@@ -5,6 +5,10 @@ + * - centralized drawing into one pain function + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_ProgressIndicator { +Index: WINGs/wruler.c +=================================================================== +--- WINGs/wruler.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wruler.c 2013-01-18 16:57:47.967049773 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/wscroller.c +=================================================================== +--- WINGs/wscroller.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wscroller.c 2013-01-18 16:57:47.967049773 +0100 +@@ -7,6 +7,10 @@ + # undef _XOPEN_SOURCE + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <math.h> +Index: WINGs/wscrollview.c +=================================================================== +--- WINGs/wscrollview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wscrollview.c 2013-01-18 16:57:47.967049773 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_ScrollView { +Index: WINGs/wslider.c +=================================================================== +--- WINGs/wslider.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wslider.c 2013-01-18 16:57:47.968049802 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #undef STRICT_NEXT_BEHAVIOUR +Index: WINGs/wsplitview.c +=================================================================== +--- WINGs/wsplitview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wsplitview.c 2013-01-18 16:57:47.968049802 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + /* +Index: WINGs/wtabview.c +=================================================================== +--- WINGs/wtabview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wtabview.c 2013-01-18 16:57:47.968049802 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_TabView { +Index: WINGs/wtext.c +=================================================================== +--- WINGs/wtext.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wtext.c 2013-01-18 16:57:47.969049831 +0100 +@@ -1,6 +1,10 @@ + + /* WINGs WMText: multi-line/font/color/graphic text widget, by Nwanua. */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include <ctype.h> + #include <X11/keysym.h> +Index: WINGs/wtextfield.c +=================================================================== +--- WINGs/wtextfield.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ WINGs/wtextfield.c 2013-01-18 16:57:47.969049831 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/wutil.c +=================================================================== +--- WINGs/wutil.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wutil.c 2013-01-18 16:57:47.969049831 +0100 +@@ -3,6 +3,10 @@ + * Handle events for non-GUI based applications + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + void WHandleEvents() +Index: WINGs/wview.c +=================================================================== +--- WINGs/wview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wview.c 2013-01-18 16:57:47.970049862 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <X11/Xresource.h> +Index: WINGs/wwindow.c +=================================================================== +--- WINGs/wwindow.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wwindow.c 2013-01-18 16:57:47.970049862 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xmd.h> + + #include "WINGsP.h" +Index: WPrefs.app/Appearance.c +=================================================================== +--- WPrefs.app/Appearance.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Appearance.c 2013-01-18 16:57:47.970049862 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <unistd.h> +Index: WPrefs.app/Configurations.c +=================================================================== +--- WPrefs.app/Configurations.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Configurations.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/Expert.c +=================================================================== +--- WPrefs.app/Expert.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ WPrefs.app/Expert.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + /* This structure containts the list of all the check-buttons to display in the +Index: WPrefs.app/Focus.c +=================================================================== +--- WPrefs.app/Focus.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Focus.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/FontSimple.c +=================================================================== +--- WPrefs.app/FontSimple.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/FontSimple.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <unistd.h> + #include <fontconfig/fontconfig.h> +Index: WPrefs.app/Icons.c +=================================================================== +--- WPrefs.app/Icons.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Icons.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/KeyboardSettings.c +=================================================================== +--- WPrefs.app/KeyboardSettings.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/KeyboardSettings.c 2013-01-18 16:57:47.972049925 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/Menu.c +=================================================================== +--- WPrefs.app/Menu.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Menu.c 2013-01-18 16:57:47.972049925 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <assert.h> + #include <ctype.h> +Index: WPrefs.app/MenuPreferences.c +=================================================================== +--- WPrefs.app/MenuPreferences.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/MenuPreferences.c 2013-01-18 16:57:47.972049925 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/MouseSettings.c +=================================================================== +--- WPrefs.app/MouseSettings.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/MouseSettings.c 2013-01-18 16:57:47.972049925 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <X11/Xutil.h> +Index: WPrefs.app/Paths.c +=================================================================== +--- WPrefs.app/Paths.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Paths.c 2013-01-18 16:57:47.973049956 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <unistd.h> + #include <assert.h> +Index: WPrefs.app/Preferences.c +=================================================================== +--- WPrefs.app/Preferences.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ WPrefs.app/Preferences.c 2013-01-18 16:57:47.973049956 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/TexturePanel.c +=================================================================== +--- WPrefs.app/TexturePanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/TexturePanel.c 2013-01-18 16:57:47.973049956 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +Index: WPrefs.app/Themes.c +=================================================================== +--- WPrefs.app/Themes.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Themes.c 2013-01-18 16:57:47.973049956 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <unistd.h> +Index: WPrefs.app/WPrefs.c +=================================================================== +--- WPrefs.app/WPrefs.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/WPrefs.c 2013-01-18 16:57:47.974049987 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <assert.h> + +Index: WPrefs.app/WindowHandling.c +=================================================================== +--- WPrefs.app/WindowHandling.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/WindowHandling.c 2013-01-18 16:57:47.974049987 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/Workspace.c +=================================================================== +--- WPrefs.app/Workspace.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Workspace.c 2013-01-18 16:57:47.974049987 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/double.c +=================================================================== +--- WPrefs.app/double.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/double.c 2013-01-18 16:57:47.974049987 +0100 +@@ -4,6 +4,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + + #include "double.h" +Index: WPrefs.app/editmenu.c +=================================================================== +--- WPrefs.app/editmenu.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/editmenu.c 2013-01-18 16:57:47.975050017 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + #include <WINGs/WUtil.h> + #include <stdlib.h> +Index: WPrefs.app/main.c +=================================================================== +--- WPrefs.app/main.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/main.c 2013-01-18 16:57:47.975050017 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <assert.h> +Index: WPrefs.app/xmodifier.c +=================================================================== +--- WPrefs.app/xmodifier.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ WPrefs.app/xmodifier.c 2013-01-18 16:57:47.975050017 +0100 +@@ -31,6 +31,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <string.h> + #include <strings.h> + #include <X11/Xlib.h> +Index: src/actions.c +=================================================================== +--- src/actions.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/actions.c 2013-01-18 16:57:47.975050017 +0100 +@@ -20,6 +20,10 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/appicon.c +=================================================================== +--- src/appicon.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/appicon.c 2013-01-18 16:57:47.976050047 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/application.c +=================================================================== +--- src/application.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/application.c 2013-01-18 16:57:47.976050047 +0100 +@@ -18,6 +18,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/appmenu.c +=================================================================== +--- src/appmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/appmenu.c 2013-01-18 16:57:47.976050047 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/balloon.c +=================================================================== +--- src/balloon.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/balloon.c 2013-01-18 16:57:47.976050047 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef BALLOON_TEXT +Index: src/client.c +=================================================================== +--- src/client.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/client.c 2013-01-18 16:57:47.977050077 +0100 +@@ -17,6 +17,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/colormap.c +=================================================================== +--- src/colormap.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/colormap.c 2013-01-18 16:57:47.977050077 +0100 +@@ -23,6 +23,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include "WindowMaker.h" +Index: src/cycling.c +=================================================================== +--- src/cycling.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/cycling.c 2013-01-18 16:57:47.977050077 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdlib.h> +Index: src/defaults.c +=================================================================== +--- src/defaults.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/defaults.c 2013-01-18 16:57:47.978050108 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/dialog.c +=================================================================== +--- src/dialog.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/dialog.c 2013-01-18 16:57:47.978050108 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/dock.c +=================================================================== +--- src/dock.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/dock.c 2013-01-18 16:57:47.979050138 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/dockedapp.c +=================================================================== +--- src/dockedapp.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/dockedapp.c 2013-01-18 16:57:47.979050138 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/event.c +=================================================================== +--- src/event.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/event.c 2013-01-18 16:57:47.980050168 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef HAVE_INOTIFY +Index: src/framewin.c +=================================================================== +--- src/framewin.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/framewin.c 2013-01-18 16:57:47.980050168 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/geomview.c +=================================================================== +--- src/geomview.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/geomview.c 2013-01-18 16:57:47.980050168 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + + typedef struct W_GeometryView { +Index: src/icon.c +=================================================================== +--- src/icon.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/icon.c 2013-01-18 16:57:47.980050168 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/main.c +=================================================================== +--- src/main.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/main.c 2013-01-18 16:57:47.981050198 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef HAVE_INOTIFY +Index: src/menu.c +=================================================================== +--- src/menu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/menu.c 2013-01-18 16:57:47.981050198 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/misc.c +=================================================================== +--- src/misc.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/misc.c 2013-01-18 16:57:47.981050198 +0100 +@@ -17,6 +17,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/monitor.c +=================================================================== +--- src/monitor.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/monitor.c 2013-01-18 16:57:47.982050228 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include <unistd.h> + #include <stdlib.h> +Index: src/motif.c +=================================================================== +--- src/motif.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/motif.c 2013-01-18 16:57:47.982050228 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef MWM_HINTS +Index: src/moveres.c +=================================================================== +--- src/moveres.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/moveres.c 2013-01-18 16:57:47.982050228 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/osdep_bsd.c +=================================================================== +--- src/osdep_bsd.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_bsd.c 2013-01-18 16:57:47.983050258 +0100 +@@ -11,6 +11,10 @@ + #else /* OPENBSD || NETBSD */ + # include <sys/param.h> + #endif ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/sysctl.h> + + #include <assert.h> +Index: src/osdep_darwin.c +=================================================================== +--- src/osdep_darwin.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_darwin.c 2013-01-18 16:57:47.983050258 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/sysctl.h> + +Index: src/osdep_linux.c +=================================================================== +--- src/osdep_linux.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_linux.c 2013-01-18 16:57:47.983050258 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: src/osdep_stub.c +=================================================================== +--- src/osdep_stub.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_stub.c 2013-01-18 16:57:47.983050258 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/utsname.h> + + #include <WINGs/WUtil.h> +Index: src/pixmap.c +=================================================================== +--- src/pixmap.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/pixmap.c 2013-01-18 16:57:47.983050258 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/placement.c +=================================================================== +--- src/placement.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/placement.c 2013-01-18 16:57:47.983050258 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/properties.c +=================================================================== +--- src/properties.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/properties.c 2013-01-18 16:57:47.983050258 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/resources.c +=================================================================== +--- src/resources.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/resources.c 2013-01-18 16:57:47.984050288 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/rootmenu.c +=================================================================== +--- src/rootmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/rootmenu.c 2013-01-18 16:57:47.984050288 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/screen.c +=================================================================== +--- src/screen.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/screen.c 2013-01-18 16:57:47.984050288 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/session.c +=================================================================== +--- src/session.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/session.c 2013-01-18 16:57:47.985050319 +0100 +@@ -57,6 +57,10 @@ + * if the Die message is received, exit. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/shutdown.c +=================================================================== +--- src/shutdown.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/shutdown.c 2013-01-18 16:57:47.985050319 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdlib.h> +Index: src/stacking.c +=================================================================== +--- src/stacking.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/stacking.c 2013-01-18 16:57:47.985050319 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/startup.c +=================================================================== +--- src/startup.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/startup.c 2013-01-18 16:57:47.985050319 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/superfluous.c +=================================================================== +--- src/superfluous.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/superfluous.c 2013-01-18 16:57:47.985050319 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/switchmenu.c +=================================================================== +--- src/switchmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/switchmenu.c 2013-01-18 16:57:47.986050350 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/switchpanel.c +=================================================================== +--- src/switchpanel.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/switchpanel.c 2013-01-18 16:57:47.986050350 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdlib.h> +Index: src/texture.c +=================================================================== +--- src/texture.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/texture.c 2013-01-18 16:57:47.986050350 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/usermenu.c +=================================================================== +--- src/usermenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/usermenu.c 2013-01-18 16:57:47.986050350 +0100 +@@ -56,6 +56,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef USER_MENU +Index: src/wcore.c +=================================================================== +--- src/wcore.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/wcore.c 2013-01-18 16:57:47.986050350 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/wdefaults.c +=================================================================== +--- src/wdefaults.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/wdefaults.c 2013-01-18 16:57:47.987050381 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/window.c +=================================================================== +--- src/window.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/window.c 2013-01-18 16:57:47.987050381 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/winmenu.c +=================================================================== +--- src/winmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/winmenu.c 2013-01-18 16:57:47.988050412 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/winspector.c +=================================================================== +--- src/winspector.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/winspector.c 2013-01-18 16:57:47.988050412 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/wmspec.c +=================================================================== +--- src/wmspec.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/wmspec.c 2013-01-18 16:57:47.989050442 +0100 +@@ -28,6 +28,10 @@ + * return to be Success is not enough. -Dan + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/workspace.c +=================================================================== +--- src/workspace.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/workspace.c 2013-01-18 16:57:47.989050442 +0100 +@@ -18,6 +18,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/xdnd.c +=================================================================== +--- src/xdnd.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xdnd.c 2013-01-18 16:57:47.989050442 +0100 +@@ -1,5 +1,9 @@ + /* Many part of code are ripped of an example from JX's site */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef XDND +Index: src/xinerama.c +=================================================================== +--- src/xinerama.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xinerama.c 2013-01-18 16:57:47.989050442 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include "xinerama.h" +Index: src/xmodifier.c +=================================================================== +--- src/xmodifier.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xmodifier.c 2013-01-18 16:57:47.989050442 +0100 +@@ -27,6 +27,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <string.h> +Index: src/xutil.c +=================================================================== +--- src/xutil.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xutil.c 2013-01-18 16:57:47.990050472 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include <stdlib.h> + #include <X11/Xutil.h> +Index: test/notest.c +=================================================================== +--- test/notest.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ test/notest.c 2013-01-18 16:57:47.990050472 +0100 +@@ -3,6 +3,10 @@ + * TODO: remake + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <X11/Xlib.h> + #include <X11/Xutil.h> +Index: test/wtest.c +=================================================================== +--- test/wtest.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ test/wtest.c 2013-01-18 16:57:47.990050472 +0100 +@@ -8,6 +8,10 @@ + * TODO: remake + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <X11/Xlib.h> +Index: util/convertfonts.c +=================================================================== +--- util/convertfonts.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/convertfonts.c 2013-01-18 16:57:47.990050472 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/stat.h> + + #include <getopt.h> +Index: util/fontconv.c +=================================================================== +--- util/fontconv.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/fontconv.c 2013-01-18 16:57:47.990050472 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +Index: util/geticonset.c +=================================================================== +--- util/geticonset.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/geticonset.c 2013-01-18 16:57:47.990050472 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <stdio.h> + #include <stdlib.h> +Index: util/getstyle.c +=================================================================== +--- util/getstyle.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/getstyle.c 2013-01-18 16:57:47.991050502 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/seticons.c +=================================================================== +--- util/seticons.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/seticons.c 2013-01-18 16:57:47.991050502 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <stdio.h> + #include <stdlib.h> +Index: util/setstyle.c +=================================================================== +--- util/setstyle.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/setstyle.c 2013-01-18 16:57:47.991050502 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/stat.h> + + #include <getopt.h> +Index: util/wdread.c +=================================================================== +--- util/wdread.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wdread.c 2013-01-18 16:57:47.991050502 +0100 +@@ -28,6 +28,10 @@ + * WindowMaker defaults DB reader + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <limits.h> + #include <stdio.h> +Index: util/wdwrite.c +=================================================================== +--- util/wdwrite.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wdwrite.c 2013-01-18 16:57:47.991050502 +0100 +@@ -28,6 +28,10 @@ + */ + + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <limits.h> + #include <stdio.h> +Index: util/wmagnify.c +=================================================================== +--- util/wmagnify.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmagnify.c 2013-01-18 16:57:47.991050502 +0100 +@@ -6,6 +6,10 @@ + * This program is in the Public Domain. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xproto.h> + + #include <WINGs/WINGs.h> +Index: util/wmgenmenu.c +=================================================================== +--- util/wmgenmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmgenmenu.c 2013-01-18 16:57:47.992050532 +0100 +@@ -4,6 +4,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <ctype.h> + #include <getopt.h> + #include <limits.h> +Index: util/wmmenugen.c +=================================================================== +--- util/wmmenugen.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen.c 2013-01-18 16:57:47.992050532 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/wmmenugen_misc.c +=================================================================== +--- util/wmmenugen_misc.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen_misc.c 2013-01-18 16:57:47.992050532 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <libgen.h> + #include <stdlib.h> + #include <string.h> +Index: util/wmmenugen_parse_wmconfig.c +=================================================================== +--- util/wmmenugen_parse_wmconfig.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen_parse_wmconfig.c 2013-01-18 16:57:47.992050532 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/wmmenugen_parse_xdg.c +=================================================================== +--- util/wmmenugen_parse_xdg.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen_parse_xdg.c 2013-01-18 16:57:47.992050532 +0100 +@@ -36,6 +36,10 @@ + * Basic validation of the .desktop file is done. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/wxcopy.c +=================================================================== +--- util/wxcopy.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wxcopy.c 2013-01-18 16:57:47.993050562 +0100 +@@ -17,6 +17,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +Index: wmlib/app.c +=================================================================== +--- wmlib/app.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/app.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include <stdlib.h> + #include <string.h> +Index: wmlib/command.c +=================================================================== +--- wmlib/command.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/command.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include <stdlib.h> + +Index: wmlib/event.c +=================================================================== +--- wmlib/event.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/event.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <X11/Xlib.h> +Index: wmlib/menu.c +=================================================================== +--- wmlib/menu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/menu.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +Index: wrlib/alpha_combine.c +=================================================================== +--- wrlib/alpha_combine.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/alpha_combine.c 2013-01-18 16:57:47.993050562 +0100 +@@ -17,6 +17,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wraster.h" + + void RCombineAlpha(unsigned char *d, unsigned char *s, int s_has_alpha, +Index: wrlib/tests/testdraw.c +=================================================================== +--- wrlib/tests/testdraw.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/testdraw.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdio.h> +Index: wrlib/tests/testgrad.c +=================================================================== +--- wrlib/tests/testgrad.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/testgrad.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdio.h> +Index: wrlib/tests/testrot.c +=================================================================== +--- wrlib/tests/testrot.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/testrot.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdlib.h> +Index: wrlib/tests/view.c +=================================================================== +--- wrlib/tests/view.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/view.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,3 +1,7 @@ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdlib.h> +Index: configure.ac +=================================================================== +--- configure.ac.orig 2013-01-09 22:42:49.000000000 +0100 ++++ configure.ac 2013-01-18 16:57:47.994050592 +0100 +@@ -67,8 +67,9 @@ dnl AC_CANONICAL_HOST -- already done by + + dnl Checks for programs. + dnl =================== +-AC_ISC_POSIX +-AC_PROG_CC ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE + AC_PROG_LN_S + AC_PROG_GCC_TRADITIONAL + AC_PROG_LIBTOOL +Index: wrlib/gif.c +=================================================================== +--- wrlib/gif.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/gif.c 2013-01-18 16:57:47.994050592 +0100 +@@ -50,17 +50,24 @@ RImage *RLoadGIF(char *file, int index) + unsigned char rmap[256]; + unsigned char gmap[256]; + unsigned char bmap[256]; ++ int dgiferr; + + if (index < 0) + index = 0; + + /* default error message */ + RErrorCode = RERR_BADINDEX; +- ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ gif = DGifOpenFileName(file, &dgiferr); ++#else + gif = DGifOpenFileName(file); +- ++#endif + if (!gif) { ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ switch (dgiferr) { ++#else + switch (GifLastError()) { ++#endif + case D_GIF_ERR_OPEN_FAILED: + RErrorCode = RERR_OPEN; + break; +@@ -197,7 +204,11 @@ RImage *RLoadGIF(char *file, int index) + /* yuck! */ + goto did_not_get_any_errors; + giferr: ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ switch (gif->Error) { ++#else + switch (GifLastError()) { ++#endif + case D_GIF_ERR_OPEN_FAILED: + RErrorCode = RERR_OPEN; + break; diff --git a/abs/core/x264/PKGBUILD b/abs/core/x264/PKGBUILD index e44493d..e8cb861 100644 --- a/abs/core/x264/PKGBUILD +++ b/abs/core/x264/PKGBUILD @@ -4,17 +4,16 @@ # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> -pkgname=x264 -pkgver=142.20140311 -pkgrel=1 +pkgname=('x264' 'libx264' 'libx264-10bit') +pkgver=142.20140826 +pkgrel=3 epoch=1 -pkgdesc='Library for encoding H264/AVC video streams' arch=('i686' 'x86_64') url='http://www.videolan.org/developers/x264.html' license=('GPL') depends=('glibc') -makedepends=('yasm' 'git') -source=(git://git.videolan.org/x264.git#commit=aff928d2) +makedepends=('yasm' 'git' 'ffmpeg') +source=(git://git.videolan.org/x264.git#commit=021c0dc6c95c) md5sums=('SKIP') pkgver() { @@ -25,16 +24,51 @@ pkgver() { echo ${_ver}.${_date} } +prepare() { + cp -r $pkgname $pkgname-10bit +} + build() { cd $pkgname - ./configure --prefix=/usr \ - --enable-shared \ - --enable-pic + --enable-shared --enable-pic + make + cd ../$pkgname-10bit + ./configure --prefix=/usr \ + --enable-shared --enable-pic \ + --bit-depth=10 make } -package() { - make -C $pkgname DESTDIR="$pkgdir" install +package_x264() { + pkgdesc='CLI tools for encoding H264/AVC video streams' + depends=('glibc' 'ffmpeg') + provides=('x264-10bit') + conflicts=('x264-10bit') + replaces=('x264-10bit') + + make -C $pkgbase DESTDIR="$pkgdir" install-cli + install -Dm755 $pkgbase-10bit/x264 "$pkgdir"/usr/bin/x264-10bit +} + +package_libx264() { + pkgdesc='Library for encoding H264/AVC video streams' + depends=('glibc') + provides=('x264-dev') + conflicts=('x264-dev') + replaces=('x264-dev') + + install -d "$pkgdir"/usr/lib + make -C $pkgbase DESTDIR="$pkgdir" install-lib-shared +} + +package_libx264-10bit() { + pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.' + depends=('glibc') + provides=('libx264' 'x264-dev') + conflicts=('libx264' 'x264-dev') + + install -d "$pkgdir"/usr/lib + make -C $pkgbase-10bit DESTDIR="$pkgdir" install-lib-shared } diff --git a/abs/core/x265/PKGBUILD b/abs/core/x265/PKGBUILD index 5ee7836..ac8b34b 100644 --- a/abs/core/x265/PKGBUILD +++ b/abs/core/x265/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: kfgz <kfgz at interia pl> pkgname=x265 -pkgver=0.9 +pkgver=1.4 pkgrel=1 pkgdesc='Open Source H265/HEVC video encoder' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('gcc-libs') makedepends=('yasm' 'cmake') url='https://bitbucket.org/multicoreware/x265' source=($url/get/$pkgver.tar.bz2) -md5sums=('0cc0b0189cf9ed7422aad98633c6de8f') +md5sums=('b37bf7bd05b198c9dd9155d60e1f7100') build() { cd multicoreware-x265-*/build/linux diff --git a/abs/core/xcb-proto/PKGBUILD b/abs/core/xcb-proto/PKGBUILD index a6c995e..d305cd4 100644 --- a/abs/core/xcb-proto/PKGBUILD +++ b/abs/core/xcb-proto/PKGBUILD @@ -3,15 +3,15 @@ # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=xcb-proto -pkgver=1.10 -pkgrel=2 +pkgver=1.11 +pkgrel=1 pkgdesc="XML-XCB protocol descriptions" arch=(any) url="http://xcb.freedesktop.org/" license=('custom') makedepends=('python2' 'libxml2') source=($url/dist/$pkgname-$pkgver.tar.bz2) -sha256sums=('7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05') +sha256sums=('b4aceee6502a0ce45fc39b33c541a2df4715d00b72e660ebe8c5bb444771e32e') build() { cd $pkgname-$pkgver diff --git a/abs/core/xfsprogs/PKGBUILD b/abs/core/xfsprogs/PKGBUILD index c974a34..7d8cea6 100644 --- a/abs/core/xfsprogs/PKGBUILD +++ b/abs/core/xfsprogs/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 197846 2013-10-30 11:07:35Z allan $ +# $Id$ # pkgname=xfsprogs -pkgver=3.1.11 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64') license=('LGPL') url="http://oss.sgi.com/projects/xfs/" groups=('base') -depends=('util-linux') +depends=('libutil-linux') options=('!makeflags') # We mirror the sources as upstream tends to move them once a new release is out source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") +md5sums=('5c6905932029c8f9207fe5a0a8aac24b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -30,4 +31,3 @@ package() { mv "${pkgdir}"/lib/libhandle.so* "${pkgdir}/usr/lib/" rm -rf "${pkgdir}/lib" } -md5sums=('de9f1f45026c2f4e0776058d429ff4b6') diff --git a/abs/core/xorg-util-macros/PKGBUILD b/abs/core/xorg-util-macros/PKGBUILD index f550a1f..2ea39bb 100644 --- a/abs/core/xorg-util-macros/PKGBUILD +++ b/abs/core/xorg-util-macros/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 153461 2012-03-14 17:38:45Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id$ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-util-macros -pkgver=1.17 +pkgver=1.19.0 pkgrel=1 pkgdesc="X.Org Autotools macros" arch=(any) license=('custom') url="http://xorg.freedesktop.org/" source=(${url}/releases/individual/util/util-macros-${pkgver}.tar.bz2) -sha1sums=('c424a09fa6f628e24eff74496acebef13e8093b9') +sha256sums=('2835b11829ee634e19fa56517b4cfc52ef39acea0cd82e15f68096e27cbed0ba') build() { - cd "${srcdir}/util-macros-${pkgver}" + cd util-macros-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/util-macros-${pkgver}" + cd util-macros-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/lib" diff --git a/abs/core/xorg-xcursorgen/PKGBUILD b/abs/core/xorg-xcursorgen/PKGBUILD index df9997a..4839b56 100644 --- a/abs/core/xorg-xcursorgen/PKGBUILD +++ b/abs/core/xorg-xcursorgen/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 154152 2012-03-23 19:18:20Z andyrtr $ +# $Id$ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xcursorgen -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="Create an X cursor file from PNG images" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11' 'libxcursor' 'libpng') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xcursorgen-${pkgver}.tar.bz2) -sha1sums=('1d0ca82422d328522b06b218f86b5901a7d5521b') +sha256sums=('31c8910f54eb175a8a74a60e7662697467e21a8bf948220a6048a93924b3f66c') build() { - cd "${srcdir}/xcursorgen-${pkgver}" + cd xcursorgen-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/xcursorgen-${pkgver}" + cd xcursorgen-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/abs/core/xterm/PKGBUILD b/abs/core/xterm/PKGBUILD index 73295c4..38e4875 100644 --- a/abs/core/xterm/PKGBUILD +++ b/abs/core/xterm/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 162381 2012-06-26 16:12:16Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=281 +pkgver=313 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') url="http://invisible-island.net/xterm/" license=('custom') -depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps') -source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz +depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter' 'libxkbfile') +source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz{,.asc} LICENSE) -md5sums=('bca2eb95bdd57653f8e3f2f57952c1c5' +md5sums=('4c2e85f46d8a96c81daf3f9e6c2e1997' + 'SKIP' '10ecc3f8ee91e3189863a172f68282d2') build() { @@ -43,7 +44,7 @@ build() { --enable-narrowproto \ --enable-exec-xterm \ --with-tty-group=tty \ - --with-utmp-setgid=utmp + --with-utempter make } diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index e8b73ac..e8908cc 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') pkgver=4.3.17 -pkgrel=9 +pkgrel=11 pkgdesc="Xymon is a system for monitoring of hosts and networks" license="GPL" arch=('i686' 'x86_64') @@ -169,8 +169,8 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' '270e13da6cbc9d49079d994edaa71e64' '22d4c9065fd959efe82f121dcb511305' '9af2ad60ac4c3cb653754618f603e311' - 'b8eb10070f2ad6a245d3da15091694ba' - 'e8f2ac43a1e3b28f5af438d787c86db2' + 'a9b7f0a22f29f55b2928160bc44f2c14' + '6452d891d88bb46d07bcf7790a523ad0' 'b4e8641e97e6b689dbc634af785e6799' 'e2844513e2c92e8b5084818f3b2a478d' '98e9242ae346f729b14cb195786571f2' diff --git a/abs/core/xymon/gpu-temp.sh b/abs/core/xymon/gpu-temp.sh deleted file mode 100644 index 09f79ca..0000000 --- a/abs/core/xymon/gpu-temp.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash - - - -gpu_temp=0 -gpu_color="clear" - -if ! test -x /usr/bin/nvidia-smi ; then - - $XYMON $XYMSRV "status $MACHINE.gputemp $gpu_color `date` - GPUTEMP:$gpu_temp - Couldn't find nvidia-smi - " - exit 0 -fi - -# Use NVidia SMI to determine the model -gpu_model=`nvidia-smi -L` -if test -z "$gpu_model" ; then - $XYMON $XYMSRV "status $MACHINE.gputemp $gpu_color `date` - GPUTEMP:$gpu_temp - Couldn't find nvidia card - " - exit 0 -fi - -# Determine GPU maximum temperature based on GPU model -if test $(echo $gpu_model | grep -c -i 'GeForce 210') -eq 0 ; then - # GT 210 maximum GPU temperature is 105 C - max_temp=105 -elif test $(echo $gpu_model | grep -c -i 'GeForce 220') -eq 0 ; then - # GT 220 maximum GPU temperature is 105 C - max_temp=105 -elif test $(echo $gpu_model | grep -c -i 'GeForce 240') -eq 0 ; then - # GT 240 maximum GPU temperature is 105 C - max_temp=105 -elif test $(echo $gpu_model | grep -c -i 'GeForce 430') -eq 0 ; then - # GT 430 maximum GPU temperature is 98 C - max_temp=98 -elif test $(echo $gpu_model | grep -c -i 'GeForce GTS 450') -eq 0 ; then - # GTS 450 maximum GPU temperature is 100 C - max_temp=100 -elif test $(echo $gpu_model | grep -c -i 'GeForce GT 520') -eq 0 ; then - # GT 520 maximum GPU temperature is 102 C - max_temp=102 -else - # Assume 100 is the maximum - max_temp=100 -fi -crit_temp=`expr $max_temp - 5` -warn_temp=`expr $crit_temp - 10` - -if test -x /usr/bin/nvidia-smi ; then - temp=`nvidia-smi -q -g 0 -d TEMPERATURE | grep -Ei 'Gpu[[:space:]]+:[[:space:]]+[[:digit:]]+ C'` - gpu_temp=`echo $temp | sed -e 's/[^0-9]*//g'` - #echo "GPUTEMP:$gpu_temp" > /tmp/gputemp.txt - if test -n "$gpu_temp" ; then - # Have some type of number - if test $gpu_temp -lt $warn_temp ; then - gpu_color=green - elif test $gpu_temp -lt $crit_temp ; then - gpu_color=yellow - else - gpu_color=red - fi - #echo gputemp $gpu_temp $gpu_color - #echo $XYMON $XYMSRV "status $MACHINE.gputemp $gpu_color `date` - #`cat /tmp/gputemp.txt` - #" - $XYMON $XYMSRV "status $MACHINE.gputemp $gpu_color `date` - GPUTEMP:$gpu_temp - " - fi -fi - -exit 0
\ No newline at end of file diff --git a/abs/core/xymon/hobbit_myth_data.py b/abs/core/xymon/hobbit_myth_data.py index ac56903..ec16818 100755 --- a/abs/core/xymon/hobbit_myth_data.py +++ b/abs/core/xymon/hobbit_myth_data.py @@ -66,11 +66,9 @@ def check_mtc(mtc_file): print "couldn't open %s file" %mtc_file return False else: - mtc = infile.readlines() + mtc = infile.read() infile.close() - for i in mtc: - line=i - if line.split()[0] == "Finished": + if "Finished Maintenance" in mtc: return True else: return False @@ -99,7 +97,7 @@ now = datetime.datetime.now() #date = "%s-%s-%s" %(now.year, now.month, now.day) date = (now.strftime('%Y-%m-%d')) #2013-12-03 -mtc_file = "/var/log/%s/myth_mtc.log" %date +mtc_file = "/var/log/%s/%s_myth_mtc.log" %(date,os.uname()[1]) mtc=check_mtc(mtc_file) num_days=find_data_left() @@ -109,14 +107,14 @@ current_color=0 if mtc: current_color = set_color_code(current_color,0) - msg="\n Maintenance script was successful \n Log file: %s\n " %mtc_file + msg="\n Maintenance completed successfully. \n Log file: %s\n " %mtc_file else: current_color = set_color_code(current_color,2) msg=''' - ** Maintenance script did not run. ** - BACKUP FILE WAS NOT CREATED + ** Maintenance did NOT complete sucessfully. ** - The system may have been busy + The system may have been busy. + See the log for more information. Log file: %s \n''' %mtc_file if num_days == 1 : diff --git a/abs/core/xymon/xymon-gputemp.sh b/abs/core/xymon/xymon-gputemp.sh index cebea41..f8af649 100644 --- a/abs/core/xymon/xymon-gputemp.sh +++ b/abs/core/xymon/xymon-gputemp.sh @@ -55,7 +55,7 @@ crit_temp=`expr $max_temp - 5` warn_temp=`expr $crit_temp - 10` if test -x /usr/bin/nvidia-smi ; then - temp=`nvidia-smi -q -g 0 -d TEMPERATURE | grep -Ei 'Gpu[[:space:]]+:[[:space:]]+[[:digit:]]+ C'` + temp=`nvidia-smi -q -g 0 -d TEMPERATURE | grep -Ei 'GPU Current Temp[[:space:]]+:[[:space:]]+[[:digit:]]+ C'` gpu_temp=`echo $temp | sed -e 's/[^0-9]*//g'` #echo "GPUTEMP:$gpu_temp" > /tmp/gputemp.txt if test -n "$gpu_temp" ; then @@ -80,4 +80,4 @@ if test -x /usr/bin/nvidia-smi ; then fi fi -exit 0
\ No newline at end of file +exit 0 diff --git a/abs/core/xz/PKGBUILD b/abs/core/xz/PKGBUILD index ef2581b..945cc42 100644 --- a/abs/core/xz/PKGBUILD +++ b/abs/core/xz/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 162329 2012-06-25 09:10:55Z pierre $ +# $Id$ # Maintainer: Pierre Schmitz <pierre@archlinux.de> # Contributor: François Charette <firmicus@gmx.net> pkgname=xz -pkgver=5.0.4 +pkgver=5.0.7 pkgrel=1 pkgdesc='Library and command line tools for XZ and LZMA compressed files' arch=('i686' 'x86_64') url='http://tukaani.org/xz/' license=('GPL' 'LGPL' 'custom') depends=('sh') -options=('!libtool') source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig") -md5sums=('df3df690aef18384e1e031be7ec3a964' - '6e203465ee9b8f646d85cf84755e2b32') +md5sums=('60449e1c9c0eabefc9c3166e325636e5' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/abs/core/yasm/PKGBUILD b/abs/core/yasm/PKGBUILD index d1096c2..5314589 100644 --- a/abs/core/yasm/PKGBUILD +++ b/abs/core/yasm/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 157779 2012-04-29 10:55:02Z allan $ -# Maintainer: Роман Кирилич (Roman Kyrylych) <roman@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: Vinay S Shastry <vinayshastry@gmail.com> +# $Id$ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=yasm -pkgver=1.2.0 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)" arch=('i686' 'x86_64') -license=('custom') url="http://www.tortall.net/projects/yasm/" +license=('BSD' 'GPL2' 'LGPL2.1' 'PerlArtistic') depends=('glibc') +options=('staticlibs') source=(http://www.tortall.net/projects/yasm/releases/${pkgname}-${pkgver}.tar.gz) -options=('!libtool') -md5sums=('4cfc0686cf5350dd1305c4d905eb55a6') +sha1sums=('b7574e9f0826bedef975d64d3825f75fbaeef55e') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 BSD.txt "${pkgdir}/usr/share/licenses/${pkgname}/BSD.txt" } diff --git a/abs/core/zlib/PKGBUILD b/abs/core/zlib/PKGBUILD index e9a9866..7951423 100644 --- a/abs/core/zlib/PKGBUILD +++ b/abs/core/zlib/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 158552 2012-05-04 22:14:53Z pierre $ +# $Id$ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zlib -pkgver=1.2.7 -pkgrel=1 +pkgver=1.2.8 +pkgrel=3 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' arch=('i686' 'x86_64') license=('custom') url="http://www.zlib.net/" depends=('glibc') +options=('staticlibs') # needed by binutils testsuite source=("http://zlib.net/current/zlib-${pkgver}.tar.gz") -md5sums=('60df6a37c56e7c1366cca812414f7b85') +md5sums=('44d667c142d7cda120332623eab69f40') + +prepare() { + cd ${srcdir}/zlib-$pkgver + grep -A 24 '^ Copyright' zlib.h > LICENSE +} build() { cd ${srcdir}/zlib-$pkgver ./configure --prefix=/usr make - - grep -A 24 '^ Copyright' zlib.h > LICENSE } check() { diff --git a/abs/core/zoneminder/PKGBUILD b/abs/core/zoneminder/PKGBUILD index 33118bd..686ffb0 100644 --- a/abs/core/zoneminder/PKGBUILD +++ b/abs/core/zoneminder/PKGBUILD @@ -1,218 +1,136 @@ -# Maintainer: Vojtech Aschenbrenner <v@asch.cz> +# Contributor: Troy Will <troydwill@gmail.com> +# Contributor: /dev/rs0 </dev/rs0@secretco.de.com> +# Contributor: Jacek Burghardt <jacek@hebe.us> +# Contributor: Vojtech Aschenbrenner <v@asch.cz> # Contributor: Jason Gardner <buhrietoe@gmail.com> # Contributor: Ross melin <rdmelin@gmail.com> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> # Contributor (Parabola): André Silva <emulatorman@lavabit.com> - -# based of debian squeeze package - +# Orginally based on a Debian Squeeze package + +pkgbase=zoneminder pkgname=zoneminder -pkgver=1.25.0 -pkgrel=23 +pkgver=1.28.0 +pkgrel=4 pkgdesc='Capture, analyse, record and monitor video security cameras' -arch=( - i686 - x86_64 - mips64el -) -backup=( - etc/zm.conf -) -url="http://www.$pkgname.com" -license=( - GPL -) +arch=( i686 x86_64 mips64el arm ) + +backup=( etc/zm.conf ) +url="https://github.com/ZoneMinder/ZoneMinder/releases" +license=( GPL ) + depends=( - #apache - lighttpd - cambozola - #ffmpeg-static - ffmpeg - gnutls - mysql - perl-archive-zip - perl-date-manip - perl-dbd-mysql - perl-dbi - perl-expect - perl-libwww - perl-mime-lite - perl-mime-tools - perl-php-serialization - perl-net-sftp-foreign - perl-sys-mmap - perl-time-modules - perl-x10 - php - #php-apache - php-gd - php-mcrypt + lighttpd + cambozola + gnutls + mysql + perl-archive-zip + perl-date-manip + perl-dbd-mysql + perl-dbi + perl-expect + perl-libwww + perl-mime-lite + perl-mime-tools + perl-php-serialization + perl-net-sftp-foreign + perl-sys-mmap + perl-time-modules + perl-x10 + php + #php-apache + php-gd + php-mcrypt ) + makedepends=( - netpbm + netpbm + cmake ) + optdepends=( - netpbm + netpbm ) -install=$pkgname.install + +install=$pkgbase.install + source=( - http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz - httpd-$pkgname.conf - $pkgname - $pkgname.service - patch-ffmpeg-0.11.patch - zm.include - zm.sysctrl.conf - zm_gen_light.conf + https://github.com/ZoneMinder/ZoneMinder/archive/v$pkgver.tar.gz + httpd-zoneminder.conf + zoneminder.service + zm.include + zm.sysctrl.conf + zm_gen_light.conf ) - + build() { - cd $srcdir/ZoneMinder-$pkgver - - # ZM_RUNDIR need change to run dir - export CPPFLAGS=-D__STDC_CONSTANT_MACROS\ - ZM_LOGDIR=/var/log/$pkgname\ - ZM_RUNDIR=/tmp/$pkgname\ - ZM_SSL_LIB=gnutls\ - ZM_TMPDIR=/tmp/$pkgname - - # Patch for GCC 4.7.x - sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\ - src/zm_logger.cpp || read - sed -i -e 's/^#include <pthread.h>/#include <pthread.h>\n#include <unistd.h>/'\ - src/zm_thread.h || read - - # Patch for automake 1.12 - sed -i -e '/am__api_version=/ s/1.11/1.12/'\ - configure || read - - # Patch for disable ZM_CHECK_FOR_UPDATES - sed -i -e '/ZM_CHECK_FOR_UPDATES/,+1 s/yes/no/'\ - scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - - # Patch for support html5 video and flv - sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/; - /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h254/'\ - scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - - # Patch for change path run dir - sed -i -e '/ZM_PATH_SOCKS/,+1 s/TMP/RUN/'\ - scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - - # Patch for change ZM name to ZoneMinder - sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\ - scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - - # Patch for v4l1 compat support - sed -i -e "s/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = \'\/usr\/lib\/libv4l\/v4l1compat.so\' ;/"\ - scripts/zmdc.pl.in || read - - # Patch for add more socket tries - sed -i -e '/$max_socket_tries/ s/3/15/'\ - web/ajax/stream.php || read - - # Patch for wrong "suppported" - sed -i -e 's/suppported/supported/'\ - src/zm_local_camera.cpp || read - - # Patch for type cast in linux-libre kernel 3.5 - sed -i -e 's/enum v4l2_buf_type type = v4l2_data.fmt.type;/enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;/'\ - src/zm_local_camera.cpp || read - - # Patch for drop custom perl install paths - sed -i -e '/# Slight hack for non-standard perl install paths/,+10 d; - s/^AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")/AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")\n\nEXTRA_PERL_LIB="# Include from system perl paths only"\nPERL_MM_PARMS="INSTALLDIRS=vendor"/'\ - configure.ac - - # Patch for support new ffmpeg - patch -p1 < $srcdir/patch-ffmpeg-0.11.patch -# sed -i -e 's/if ( av_open_input_file( \&mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )/if ( avformat_open_input( \&mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )/; -# s/if ( avcodec_open( mCodecContext, mCodec ) < 0 )/if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )/'\ -# src/zm_ffmpeg_camera.cpp -# sed -i -e 's/if ( av_set_parameters(ofc, NULL) < 0 )/\/\*\n \* Removed in last ffmpeg\n \* if ( av_set_parameters(ofc, NULL) < 0 )/; -# /Panic( "Invalid output format parameters" );/,+1 s/}/}\*/; -# /if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )/ s/URL_WRONLY/AVIO_FLAG_WRITE/; -# s/av_write_header(ofc);/avformat_write_header(ofc, NULL);/'\ -# src/zm_mpeg.cpp - sed -i -e 's/avcodec_init/avcodec_open/'\ - configure{,.ac} - - # Patch for support ffmpeg with <libavutil/mathematics.h> and C library - sed -i -e 's/^extern "C" {/extern "C" {\n#ifdef _STDINT_H\n#undef _STDINT_H\n#endif\n#include <stdint.h>/ - s/^#include <libavutil\/avutil.h>/#include <libavutil\/avutil.h>\n#include <libavutil\/mathematics.h>/'\ - src/zm_ffmpeg.h - sed -i -e 's/^AM_CONFIG_HEADER(config.h)/AM_CONFIG_HEADER(config.h)\n\nAC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])/; - s/^AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)/AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)\nAC_LANG_PUSH([C])/; - s/^AC_CHECK_HEADERS(libswscale\/swscale.h,,,)/AC_CHECK_HEADERS(libswscale\/swscale.h,,,)\nAC_LANG_POP([C])/'\ - configure.ac - - # Patch for wrong install run, tmp and log dir - sed -i -e '/ install-data-hook/d;/install-data-hook:/d;/# Yes, you are correct. This is a HACK!/d; - / ( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )/d; - / ( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "\/var\/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )/d; - / ( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "\/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )/d; - / ( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "\/var\/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )/,+1 d'\ - Makefile.{am,in} - - ./configure --prefix=/usr\ - --enable-crashtrace=no\ - --enable-debug=no\ - --enable-mmap=yes\ - --sysconfdir=/etc\ - --with-cgidir=/data/srv/httpd/cgi-bin\ - --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\ - --with-ffmpeg=/usr\ - --with-libarch=lib\ - --with-mysql=/usr\ - --with-webdir=/data/srv/httpd/$pkgname\ - --with-webgroup=http\ - --with-webhost=localhost\ - --with-webuser=http - - make V=0 + cd $srcdir/ZoneMinder-$pkgver + + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DZM_CGIDIR=/data/srv/http/cgi-bin \ + -DZM_WEBDIR=/data/srv/http/zoneminder \ + -DZM_WEB_USER=http \ + -DZM_CONTENTDIR=/var/cache/zoneminder \ + -DZM_LOGDIR=/var/log/zoneminder \ + -DZM_RUNDIR=/var/run/zm \ + -DZM_TMPDIR=/var/tmp \ + -DZM_SOCKDIR=/data/srv/zoneminder/socks/ . + + make V=0 } - + package() { - cd $srcdir/ZoneMinder-$pkgver - - make DESTDIR=$pkgdir install - - mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},data/srv/httpd/{cgi-bin,$pkgname},usr/{lib/systemd/system,share/{license/$pkgname,$pkgname/db}},var/{cache/$pkgname,log/$pkgname}} - - chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgname,log/$pkgname}} - chmod 0700 $pkgdir/etc/zm.conf - - for i in events images temp; do - mv $pkgdir/data/srv/httpd/$pkgname/$i $pkgdir/var/cache/$pkgname/$i - ln -s /var/cache/$pkgname/$i $pkgdir/data/srv/httpd/$pkgname/$i - chown -h http.http $pkgdir/data/srv/httpd/$pkgname/$i - done - - ln -s /data/srv/httpd/cgi-bin $pkgdir/data/srv/httpd/$pkgname - chown -h http.http $pkgdir/data/srv/httpd/{cgi-bin,$pkgname,$pkgname/cgi-bin} - - ln -s /usr/share/cambozola/cambozola.jar $pkgdir/data/srv/httpd/$pkgname - mkdir -p $pkgdir/etc/lighttpd - - install -D -m 644 $srcdir/zm.include $pkgdir/etc/lighttpd/ - #sysctrl conf - install -o root -g root -D -m 0755 $srcdir/zm.sysctrl.conf $startdir/pkg/etc/sysctl.d/zm.conf - #gen_light_conf - install -D -m0744 ${srcdir}/zm_gen_light.conf ${pkgdir}/etc/gen_light_conf.d/zoneminder.conf - - install -D -m 644 $srcdir/httpd-$pkgname.conf $pkgdir/etc/httpd/conf/extra - install -D -m 644 $srcdir/$pkgname $pkgdir/etc/rc.d - install -D -m 644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system - install -D -m 644 COPYING $pkgdir/usr/share/license/$pkgname - install -D -m 644 db/zm*.sql $pkgdir/usr/share/$pkgname/db + cd $srcdir/ZoneMinder-$pkgver + + DESTDIR=$pkgdir make install + + # BEGIN CREATE_ZONEMINDER_DIRECTORIES + mkdir -p $pkgdir/var/run/zm + chown -v http.http $pkgdir/var/run/zm + mkdir -p $pkgdir/var/{cache/$pkgbase,log/$pkgbase} + mkdir -p $pkgdir/data/srv/zoneminder/socks + chown -Rv http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgbase,log/$pkgbase}} + chown -Rv http.http $pkgdir/data/srv/zoneminder/socks + chmod 0700 $pkgdir/etc/zm.conf + # END CREATE_ZONEMINDER_DIRECTORIES + + # Make content directories in /var/cache/zoneminder and link them + for i in events images temp; do + mkdir $pkgdir/var/cache/$pkgbase/$i + # chown -v http.http $pkgdir/var/cache/$pkgbase/$i + ln -s /var/cache/$pkgbase/$i $pkgdir/data/srv/http/$pkgbase/$i + chown -v --no-dereference http.http $pkgdir/data/srv/http/$pkgbase/$i + done + + # Create a link to the Zoneminder cgi binaries + ln -sv /data/srv/http/cgi-bin $pkgdir/data/srv/http/$pkgbase + + chown -h http.http $pkgdir/data/srv/http/{cgi-bin,$pkgbase,$pkgbase/cgi-bin} + + # Link Cambozola + ln -s /usr/share/cambozola/cambozola.jar $pkgdir/data/srv/http/$pkgbase + + # Install configuration files + mkdir -p $pkgdir/etc/httpd/conf/extra + install -D -m 644 $srcdir/httpd-$pkgbase.conf $pkgdir/etc/httpd/conf/extra + mkdir -p $pkgdir/usr/lib/systemd/system + install -D -m 644 $srcdir/$pkgbase.service $pkgdir/usr/lib/systemd/system + install -D -m 644 COPYING $pkgdir/usr/share/license/$pkgbase + install -D -m 644 db/zm*.sql $pkgdir/usr/share/$pkgbase/db + + #LinHES stuff + #lighttpd zm include + install -D -m644 $srcdir/zm.include $pkgdir/etc/lighttpd/zm.include + #sysctrl conf - to set the shared mem + install -o root -g root -D -m0755 $srcdir/zm.sysctrl.conf $pkgdir/etc/sysctl.d/zm.conf + #gen_light_conf + install -D -m0744 ${srcdir}/zm_gen_light.conf $pkgdir/etc/gen_light_conf.d/zoneminder.conf } -md5sums=('eaefa14befd482154970541252aa1a39' - '72380d8793a784ec24cb6809aea4a739' - '034b61cda8849fc3001849e76ef26041' - 'ca3fe00739707b9f92eaaa9034d4da2b' - '81c8be870260142e2633eedf73c72040' +md5sums=('b0317c6fe003de9a0c7c76078b0adc2b' + 'dcaa22b9030bc7b5b76568dbe8ea9eca' + 'bb801be691cbe1ed98f395b2ebe5c882' '9d93f9b7b0a1384df533efde19ed3021' 'c528e75443ae421cb7f63e12350c692a' '81cb12b36616a299ec808ac70a809ec2') diff --git a/abs/core/zoneminder/__changelog b/abs/core/zoneminder/__changelog index 5ebce4d..8b30691 100644 --- a/abs/core/zoneminder/__changelog +++ b/abs/core/zoneminder/__changelog @@ -1,17 +1,17 @@ -Change cgidir and webdir: - /data/srv/ +PKGBUILD: remove apache +PKGBUILD: add lighttpd +PKGBUILD: remove php-apache +PKGBUILD: change mariadb to mysql +PKGBUILD: change all /srv/ to /data/srv/ - cgidir webdir socks +PKGBUILD: add zm.include for lighttpd +PKGBUILD: add zm.sysctrl.conf to set the shared mem +PKGBUILD: add zm_gen_light.conf -- -added zm.include for lighttpd -added zm.sysctrl.conf to set the shared mem -added zm_gen_light.conf --- -run file - --- - Install file Removed modifications of php.ini +Remove php and mysql notes Added remove/add of zm.include in post install/remove added install_db add http to video group -gen_light_conf.py +gen_light_include.py +-- diff --git a/abs/core/zoneminder/gen_light_zm.conf b/abs/core/zoneminder/gen_light_zm.conf deleted file mode 100644 index 3716bb0..0000000 --- a/abs/core/zoneminder/gen_light_zm.conf +++ /dev/null @@ -1 +0,0 @@ -include "/etc/lighttpd/zm.include" diff --git a/abs/core/zoneminder/httpd-zoneminder.conf b/abs/core/zoneminder/httpd-zoneminder.conf index aeb089b..cdb7722 100644 --- a/abs/core/zoneminder/httpd-zoneminder.conf +++ b/abs/core/zoneminder/httpd-zoneminder.conf @@ -3,7 +3,7 @@ Alias /zm "/srv/http/zoneminder" <Directory "/srv/http/zoneminder"> - Options -Indexes MultiViews FollowSymLinks + Options -Indexes +MultiViews +FollowSymLinks AllowOverride None Order allow,deny Allow from all @@ -14,7 +14,7 @@ Alias /zm "/srv/http/zoneminder" ScriptAlias /cgi-bin "/srv/http/cgi-bin" <Directory "/srv/http/cgi-bin"> AllowOverride None - Options ExecCGI FollowSymLinks + Options +ExecCGI +FollowSymLinks Order allow,deny Allow from all </Directory> diff --git a/abs/core/zoneminder/patch-ffmpeg-0.11.patch b/abs/core/zoneminder/patch-ffmpeg-0.11.patch deleted file mode 100644 index ac56e4c..0000000 --- a/abs/core/zoneminder/patch-ffmpeg-0.11.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
-index 42927f6..61df606 100644
---- a/src/zm_ffmpeg_camera.cpp
-+++ b/src/zm_ffmpeg_camera.cpp
-@@ -91,7 +91,7 @@ int FfmpegCamera::PrimeCapture()
- Info( "Priming capture from %s", mPath.c_str() );
-
- // Open the input, not necessarily a file
-- if ( av_open_input_file( &mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )
-+ if ( avformat_open_input( &mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )
- Fatal( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) );
-
- // Locate stream info from input
-@@ -122,7 +122,7 @@ int FfmpegCamera::PrimeCapture()
- Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
-
- // Open the codec
-- if ( avcodec_open( mCodecContext, mCodec ) < 0 )
-+ if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )
- Fatal( "Unable to open codec for video stream from %s", mPath.c_str() );
-
- // Allocate space for the native video frame
-
-diff --git a/src/zm_mpeg.cpp b/src/zm_mpeg.cpp
-index f5de2a4..d614346 100644
---- a/src/zm_mpeg.cpp
-+++ b/src/zm_mpeg.cpp
-@@ -130,10 +130,12 @@ void VideoStream::SetParameters()
- {
- /* set the output parameters (must be done even if no
- parameters). */
-- if ( av_set_parameters(ofc, NULL) < 0 )
-+ /*
-+ * Removed in last ffmpeg
-+ * if ( av_set_parameters(ofc, NULL) < 0 )
- {
- Panic( "Invalid output format parameters" );
-- }
-+ }*/
- //dump_format(ofc, 0, filename, 1);
- }
-
-@@ -222,7 +224,7 @@ void VideoStream::OpenStream()
- if ( !(of->flags & AVFMT_NOFILE) )
- {
- #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
-- if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )
-+ if ( avio_open(&ofc->pb, filename, AVIO_FLAG_WRITE) < 0 )
- #else
- if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 )
- #endif
-@@ -241,7 +243,7 @@ void VideoStream::OpenStream()
- }
-
- /* write the stream header, if any */
-- av_write_header(ofc);
-+ avformat_write_header(ofc, NULL);
- }
-
- VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height )
diff --git a/abs/core/zoneminder/zoneminder b/abs/core/zoneminder/zoneminder deleted file mode 100644 index c4cbf4d..0000000 --- a/abs/core/zoneminder/zoneminder +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -daemon_name=zm - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting Zoneminder" - /usr/bin/zmfix -a - if /usr/bin/zmpkg.pl start >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Zoneminder" - if /usr/bin/zmpkg.pl stop >/dev/null ; then - rm_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - reload) - stat_busy "Reloading Zoneminder" - if /usr/bin/zmpkg.pl graceful >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - restart) - stat_busy "Restarting Zoneminder" - if /usr/bin/zmpkg.pl restart >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - status) - stat_busy "Checking Zoneminder status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|reload|restart|status}" -esac - -exit 0 diff --git a/abs/core/zoneminder/zoneminder.install b/abs/core/zoneminder/zoneminder.install index bf5cd99..e074c32 100644 --- a/abs/core/zoneminder/zoneminder.install +++ b/abs/core/zoneminder/zoneminder.install @@ -1,4 +1,3 @@ - install_db() { . /etc/systemconfig if [ $SystemType = Master_backend -o $SystemType = Standalone ] @@ -17,70 +16,68 @@ install_db() { } pre_install() { - set -e - abort=false - if [ -L /srv/http/zoneminder/events ]; then - l=$(readlink /srv/http/zoneminder/events) - if [ $l != /var/cache/zoneminder/events ]; then - abort=true + set -e + abort=false + if [ -L /data/srv/http/zoneminder/events ]; then + l=$(readlink /data/srv/http/zoneminder/events) + if [ $l != /var/cache/zoneminder/events ]; then + abort=true + fi fi - fi - if [ -L /srv/http/zoneminder/images ]; then - l=$(readlink /srv/http/zoneminder/images) - if [ $l != /var/cache/zoneminder/images ]; then - abort=true + if [ -L /data/srv/http/zoneminder/images ]; then + l=$(readlink /data/srv/http/zoneminder/images) + if [ $l != /var/cache/zoneminder/images ]; then + abort=true + fi fi - fi - if [ $abort = true ]; then - cat >&2 << EOF + if [ $abort = true ]; then + cat >&2 << EOF Aborting installation of zoneminder due to non-default symlinks in -/srv/http/zoneminder for the images and/or events directory, which could +/data/srv/http/zoneminder for the images and/or events directory, which could result in loss of data. Please move your data in each of these directories to /var/cache/zoneminder before installing zoneminder from the package. EOF - exit 1 - fi - exit 0 + exit 1 + fi + exit 0 } post_install() { - if [[ -d /var/log/zoneminder ]]; then - chmod 0755 /var/log/zoneminder - chown http.http /var/log/zoneminder - else - mkdir -m 0755 /var/log/zoneminder - chown http.http /var/log/zoneminder - fi - if [[ -d /tmp/zoneminder ]]; then - chmod 0700 /tmp/zoneminder - chown http.http /tmp/zoneminder - else - mkdir -m 0700 /tmp/zoneminder - chown http.http /tmp/zoneminder - fi -#--- - usermod -G video http - install_db - gen_light_include.py - /sbin/sv hup /service/lighttpd -#--- + if [[ -d /var/log/zoneminder ]]; then + chmod 0755 /var/log/zoneminder + chown http.http /var/log/zoneminder + else + mkdir -m 0755 /var/log/zoneminder + chown http.http /var/log/zoneminder + fi + if [[ -d /tmp/zm ]]; then + chmod 0700 /tmp/zm + chown http.http /tmp/zm + else + mkdir -m 0700 /tmp/zm + chown http.http /tmp/zm + fi + + #---LinHES Stuff + usermod -G video http + install_db + gen_light_include.py + /sbin/sv hup /service/lighttpd + #--- } post_upgrade() { - post_install - /usr/bin/zmupdate.pl -f >/dev/null - gen_light_include.py - /sbin/sv hup /service/lighttpd + post_install + /usr/bin/zmupdate.pl -f >/dev/null } post_remove() { - if [[ -d /tmp/zoneminder ]]; then - rm -vr /tmp/zoneminder - fi - -#-- - gen_light_include.py - /sbin/sv hup /service/lighttpd -#-- + if [[ -d /tmp/zoneminder ]]; then + rm -vr /tmp/zoneminder + fi + #---LinHES Stuff + gen_light_include.py + /sbin/sv hup /service/lighttpd + #-- } diff --git a/abs/core/zoneminder/zoneminder.service b/abs/core/zoneminder/zoneminder.service index 05cae6f..1314521 100644 --- a/abs/core/zoneminder/zoneminder.service +++ b/abs/core/zoneminder/zoneminder.service @@ -1,13 +1,18 @@ +# ZoneMinder systemd unit file +# This file is intended to work with all Linux distributions + [Unit] -Description=Capture, analyse, record and monitor video security cameras -After=network.target remote-fs.target -Required=mysqld.service +Description=ZoneMinder CCTV recording and security system +After=network.target mysqld.service httpd.service +Requires=mysqld.service httpd.service [Service] +User=http Type=forking ExecStart=/usr/bin/zmpkg.pl start -ExecRestart=/usr/bin/zmpkg.pl restart -ExecStop=/usr/bin/zmpkg.pl stop +ExecReload=/usr/bin/zmpkg.pl restart +ExecStop=/bin/bash -c '[[ "$(/usr/bin/pgrep zmdc.pl)" > 0 ]] && /usr/bin/zmpkg.pl stop' +PIDFile="/var/run/zm/zm.pid" [Install] WantedBy=multi-user.target diff --git a/abs/extra/adwaita-icon-theme/PKGBUILD b/abs/extra/adwaita-icon-theme/PKGBUILD new file mode 100644 index 0000000..c9c782f --- /dev/null +++ b/abs/extra/adwaita-icon-theme/PKGBUILD @@ -0,0 +1,28 @@ +# $Id$ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=adwaita-icon-theme +pkgver=3.14.1 +pkgrel=1 +pkgdesc="Adwaita icon theme" +arch=(any) +depends=('hicolor-icon-theme' 'gtk-update-icon-cache') +makedepends=('intltool' 'icon-naming-utils') +url="http://www.gnome.org" +license=('GPL') +groups=('gnome') +install=adwaita-icon-theme.install +options=('!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('b776a7ad58c97f4c1ede316e44d8d054105429cb4e3a8ec46616a14b11df48ee') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/abs/extra/adwaita-icon-theme/adwaita-icon-theme.install b/abs/extra/adwaita-icon-theme/adwaita-icon-theme.install new file mode 100644 index 0000000..a32d2ca --- /dev/null +++ b/abs/extra/adwaita-icon-theme/adwaita-icon-theme.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/Adwaita +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/abs/extra/apcupsd/PKGBUILD b/abs/extra/apcupsd/PKGBUILD index 31a3cfa..936ae52 100644 --- a/abs/extra/apcupsd/PKGBUILD +++ b/abs/extra/apcupsd/PKGBUILD @@ -1,11 +1,12 @@ # $Id$ +# Maintainer: Florian Pritz <bluewind@xinu.at> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Todd Musall <tmusall@comcast.net> -# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Todd Musall <tmusall@comcast.net> +# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=apcupsd -pkgver=3.14.10 -pkgrel=7 +pkgver=3.14.12 +pkgrel=3 pkgdesc="Power mangement and controlling most of APC's UPS models" arch=(i686 x86_64) url="http://www.apcupsd.org" @@ -16,14 +17,24 @@ optdepends=('gd: for CGI' 'gconf: for frontend' 'gtk2: for frontend') makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2') -backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf - etc/apcupsd/multimon.conf) -source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz +backup=(etc/apcupsd/apcupsd.conf + etc/apcupsd/hosts.conf + etc/apcupsd/multimon.conf + etc/apcupsd/apcupsd.css + etc/apcupsd/changeme + etc/apcupsd/commfailure + etc/apcupsd/commok + etc/apcupsd/offbattery + etc/apcupsd/onbattery + etc/apcupsd/apccontrol) +source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz{,.sig} apcupsd.service apcupsd-tmpfiles.conf) -sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032' +sha256sums=('1b4f703cb19cfdf44daf173dc8394cafd30fee0b30a0c75a7d19db622454a440' + 'SKIP' '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7' - 'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55') + 'a4474cfcd607c5e9b64e27eec7cbc2b0bcf08c8ea37fd1f0f28e98ac2883fd4f') +validpgpkeys=(635B9D943945DCA05BE9AB0A24E84804A57B2D90) build() { cd "$srcdir/$pkgname-$pkgver" @@ -38,10 +49,18 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + sed -i 's#^LOCKFILE .*$#LOCKFILE /run/apcupsd#' "$pkgdir/etc/apcupsd/apcupsd.conf" + install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service" install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf" + chmod 755 "$pkgdir"/usr/bin/* + install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin" mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin" + + rm -rf "$pkgdir/usr/share/hal" } diff --git a/abs/extra/apcupsd/apcupsd-tmpfiles.conf b/abs/extra/apcupsd/apcupsd-tmpfiles.conf index 0ceb410..60f8316 100644 --- a/abs/extra/apcupsd/apcupsd-tmpfiles.conf +++ b/abs/extra/apcupsd/apcupsd-tmpfiles.conf @@ -1,2 +1,3 @@ r /etc/apcupsd/powerfail -r /etc/nologin
\ No newline at end of file +r /etc/nologin +d /run/apcupsd 0755 root root diff --git a/abs/extra/arch-install-scripts/PKGBUILD b/abs/extra/arch-install-scripts/PKGBUILD new file mode 100644 index 0000000..472d058 --- /dev/null +++ b/abs/extra/arch-install-scripts/PKGBUILD @@ -0,0 +1,28 @@ +# $Id$ +# Maintainer: Dave Reisner <dreisner@archlinux.org> + +pkgname=arch-install-scripts +pkgver=13 +pkgrel=1 +pkgdesc="Scripts to aid in installing Arch Linux" +arch=('any') +url="https://projects.archlinux.org/arch-install-scripts.git" +license=('GPL') +depends=('bash' 'coreutils' 'pacman' 'util-linux') +source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('5294b927fea89f5a88c051c970946c24' + 'SKIP') + +build() { + make -C "$pkgname-$pkgver" +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package() { + make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/at-spi2-atk/PKGBUILD b/abs/extra/at-spi2-atk/PKGBUILD new file mode 100644 index 0000000..790f3c6 --- /dev/null +++ b/abs/extra/at-spi2-atk/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=at-spi2-atk +pkgver=2.14.1 +pkgrel=1 +pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" +arch=('i686' 'x86_64') +url="http://www.gnome.org" +license=('GPL2') +depends=('at-spi2-core' 'libx11' 'atk') +makedepends=('intltool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('058f34ea60edf0a5f831c9f2bdd280fe95c1bcafb76e466e44aa0fb356d17bcb') + +build() { + cd $pkgname-$pkgver + + sed -i -e '/AC_PATH_XTRA/d' configure.ac + autoreconf --force --install + + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/at-spi2-core/PKGBUILD b/abs/extra/at-spi2-core/PKGBUILD new file mode 100644 index 0000000..0fd23ab --- /dev/null +++ b/abs/extra/at-spi2-core/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=at-spi2-core +pkgver=2.14.1 +pkgrel=1 +pkgdesc="Protocol definitions and daemon for D-Bus at-spi" +arch=('i686' 'x86_64') +url="http://www.gnome.org" +license=('GPL2') +depends=('dbus' 'glib2' 'libxtst') +makedepends=('intltool' 'gobject-introspection' 'python2') +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657') + +build() { + cd $pkgname-$pkgver + + sed -i -e '/AC_PATH_XTRA/d' configure.ac + autoreconf --force --install + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/at-spi2-core --disable-xevie + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/bluez/PKGBUILD b/abs/extra/bluez/PKGBUILD index 25a7e32..3ea45a0 100644 --- a/abs/extra/bluez/PKGBUILD +++ b/abs/extra/bluez/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=bluez pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') -pkgver=5.18 +pkgver=5.27 pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -15,9 +15,10 @@ source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.xz 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch bluetooth.modprobe) # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256sums=('8c8bb13db83d0de6c85def2da8dfa0a758aff595405fb57a00719ed94d558340' +sha256sums=('fbf33cebc76f8c81f28f0d67c71a8a1ec4b04b087460ec7353f7e0c207a1f981' '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b' '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4') +validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel@holtmann.org> prepare() { cd $pkgname-$pkgver @@ -36,15 +37,14 @@ build() { --localstatedir=/var \ --libexecdir=/usr/lib \ --enable-sixaxis \ + --enable-experimental \ --enable-library # this is deprecated -# --enable-experimental \ - - make all V=1 + make } check() { cd $pkgname-$pkgver - make check + #make check } @@ -56,9 +56,6 @@ package_bluez() { conflicts=('obexd-client' 'obexd-server') cd ${pkgbase}-${pkgver} - #make DESTDIR=${pkgdir} install - #return 1 - make DESTDIR=${pkgdir} \ install-libexecPROGRAMS \ install-dbussessionbusDATA \ @@ -92,6 +89,14 @@ package_bluez-utils() { install-binPROGRAMS \ install-man1 + # add missing tools FS#41132, FS#41687, FS#42716 + for files in `find tools/ -type f -perm -755`; do + filename=$(basename $files) + install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/tools/$filename ${pkgdir}/usr/bin/$filename + done + # add gatttool usefulbdaddr with Bluetooth 4.0LE + install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/attrib/gatttool ${pkgdir}/usr/bin/gatttool + # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES #rmdir ${pkgdir}/usr/lib diff --git a/abs/extra/bluez/__changelog b/abs/extra/bluez/__changelog deleted file mode 100644 index 47f870d..0000000 --- a/abs/extra/bluez/__changelog +++ /dev/null @@ -1,27 +0,0 @@ -# by mihanson -I really have no idea how this bluetooth stuff works. If anyone wants to -take a stab at getting this working properly with runit, feel free. I -only need this package to get mythpywii working. - -2010-04-01: -Make this package work with runit. All daemons were seperated into their -own run scripts. Of particular interest is rfcomm and hid2hci utilities. -They are not daemons and I added "/sbin/sv <executable> down ." in their -respective run files. All based on this thread: -http://article.gmane.org/gmane.comp.sysutils.supervision.general/1585/ - -2012-04-07 -- remove rc.bluetooth as we use runit -- disable-cups -- comment out removal of udev line - -2012-04-13 -re-add audio-streaming.patch for ootb audio streaming - -2012-06-19 -- change 'systemd-tools' dependency back to 'udev' -- change 'libusbx' dependency back to 'libusb' -- remove refrences to rc.bluetooth - -2014-03-07 -- update bluez 5.15 arch pkgbuild no changes diff --git a/abs/extra/boost/0001-Add-missing-include-to-signals2-trackable.hpp.patch b/abs/extra/boost/0001-Add-missing-include-to-signals2-trackable.hpp.patch new file mode 100644 index 0000000..d833ee8 --- /dev/null +++ b/abs/extra/boost/0001-Add-missing-include-to-signals2-trackable.hpp.patch @@ -0,0 +1,29 @@ +From 06ccdfee76fe487a141b95848d1c866890f15d88 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evangelos@foutrelis.com> +Date: Thu, 6 Nov 2014 09:19:26 +0200 +Subject: [PATCH] Add missing include to signals2/trackable.hpp + +boost::weak_ptr started being used in commit a0bf2d1 (Disconnect slots +associated with signals2::trackable immediately) but the matching header +wasn't included. + +https://svn.boost.org/trac/boost/ticket/10100#comment:7 +--- + include/boost/signals2/trackable.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/boost/signals2/trackable.hpp b/include/boost/signals2/trackable.hpp +index dba001d..64e8489 100644 +--- a/include/boost/signals2/trackable.hpp ++++ b/include/boost/signals2/trackable.hpp +@@ -18,6 +18,7 @@ + + #include <boost/assert.hpp> + #include <boost/shared_ptr.hpp> ++#include <boost/weak_ptr.hpp> + + namespace boost { + namespace signals2 { +-- +2.1.3 + diff --git a/abs/extra/boost/PKGBUILD b/abs/extra/boost/PKGBUILD index 7629843..17d4995 100644 --- a/abs/extra/boost/PKGBUILD +++ b/abs/extra/boost/PKGBUILD @@ -1,113 +1,106 @@ -# $Id: PKGBUILD 163703 2012-07-18 01:05:09Z ibiru $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id$ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> # Contributor: Luca Roccia <little_rock@users.sourceforge.net> pkgbase=boost pkgname=('boost-libs' 'boost') -pkgver=1.50.0 +pkgver=1.57.0 _boostver=${pkgver//./_} -pkgrel=1 +pkgrel=3 +url='http://www.boost.org/' arch=('i686' 'x86_64') -url="http://www.boost.org/" -makedepends=('icu' 'python2' 'bzip2' 'zlib' 'openmpi') -source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) license=('custom') -md5sums=('dbc07ab0254df3dda6300fd737b3f264') +makedepends=('icu>=53.1' 'python2' 'bzip2' 'zlib' 'openmpi') +source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2 + 0001-Add-missing-include-to-signals2-trackable.hpp.patch) +sha1sums=('e151557ae47afd1b43dc3fac46f8b04a8fe51c12' + '35bc8ad7493a641ec708a691036fe5319aec70cd') -_stagedir="${srcdir}/stagedir" +prepare() { + cd ${pkgbase}_${_boostver} + + # https://github.com/boostorg/signals2/pull/8 + patch -Np2 -i ../0001-Add-missing-include-to-signals2-trackable.hpp.patch +} build() { - # set python path for bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools" - echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam - #echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam - echo "using mpi ;" >> build/v2/user-config.jam - - cd "${srcdir}"/${pkgbase}_${_boostver} - - # build bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" - ./build.sh cc - - _bindir="bin.linuxx86" - [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" - - install -d "${_stagedir}"/usr/bin - install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam - - # build tools - cd "${srcdir}/${pkgbase}_${_boostver}/tools/" - "${_stagedir}"/usr/bin/bjam --toolset=gcc - - # copy the tools - cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin" - for i in *;do - install -m755 "${i}" "${_stagedir}/usr/bin/${i}" - done - - #boostbook needed by quickbook - cd "${srcdir}/${pkgbase}_${_boostver}/dist/" - cp -r share "${_stagedir}" - - # build libs - cd "${srcdir}/${pkgbase}_${_boostver}" - - # default "minimal" install: "release link=shared,static - # runtime-link=shared threading=single,multi" - # --layout=tagged will add the "-mt" suffix for multithreaded libraries - # and installs includes in /usr/include/boost. - # --layout=system no longer adds the -mt suffix for multi-threaded libs. - # install to ${_stagedir} in preparation for split packaging - - "${_stagedir}"/usr/bin/bjam \ - release debug-symbols=off threading=multi \ - runtime-link=shared link=shared,static \ - cflags=-fno-strict-aliasing \ + export _stagedir="${srcdir}/stagedir" + local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" + + cd ${pkgbase}_${_boostver} + + ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2 + + _bindir="bin.linuxx86" + [[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64" + install -Dm755 tools/build/src/engine/$_bindir/b2 "${_stagedir}"/bin/b2 + + # Add an extra python version. This does not replace anything and python 2.x + # need to be the default. + #echo "using python : 3.4 : /usr/bin/python3 : /usr/include/python3.4m : /usr/lib ;" \ + # >> project-config.jam + + # Support for OpenMPI + echo "using mpi ;" >> project-config.jam + + # boostbook is needed by quickbook + install -dm755 "${_stagedir}"/share/boostbook + cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/ + + # default "minimal" install: "release link=shared,static + # runtime-link=shared threading=single,multi" + # --layout=tagged will add the "-mt" suffix for multithreaded libraries + # and installs includes in /usr/include/boost. + # --layout=system no longer adds the -mt suffix for multi-threaded libs. + # install to ${_stagedir} in preparation for split packaging + "${_stagedir}"/bin/b2 \ + variant=release \ + debug-symbols=off \ + threading=multi \ + runtime-link=shared \ + link=shared,static \ toolset=gcc \ - --prefix="${_stagedir}" \ - -sTOOLS=gcc \ + python=2.7 \ + cflags="${CPPFLAGS} ${CFLAGS} -O3" linkflags="${LDFLAGS}" \ --layout=system \ - ${MAKEFLAGS} \ + --prefix="${_stagedir}" \ + ${JOBS} \ install } package_boost() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Development" - depends=("boost-libs=${pkgver}") - optdepends=(#'python: for python bindings' - 'python2: for python2 bindings' - 'boost-build: to use boost jam for building your project.') - - install -d "${pkgdir}"/usr/{include,lib,share} - # headers/source files - cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/ + pkgdesc='Free peer-reviewed portable C++ source libraries - development headers' + depends=("boost-libs=${pkgver}") + optdepends=('python: for python bindings' + 'python2: for python2 bindings' + 'boost-build: to use boost jam for building your project.') + options=('staticlibs') - # static libs - cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ + install -dm755 "${pkgdir}"/usr + cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr - # utilities (bjam, bcp, pyste) - cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/ + install -d "${pkgdir}"/usr/lib + cp -a "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ - #boostbook - cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt + ln -s /usr/bin/b2 "$pkgdir"/usr/bin/bjam } package_boost-libs() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime" - depends=('gcc-libs' 'bzip2' 'zlib' 'icu') - optdepends=('openmpi: for mpi support') + pkgdesc='Free peer-reviewed portable C++ source libraries - runtime libraries' + depends=('bzip2' 'zlib' 'icu') + optdepends=('openmpi: for mpi support') - install -d "${pkgdir}/usr/lib" - #shared libs - cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/" + install -dm755 "${pkgdir}"/usr + cp -a "${_stagedir}"/lib "${pkgdir}"/usr + rm "${pkgdir}"/usr/lib/*.a - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt } diff --git a/abs/extra/boost/__changelog b/abs/extra/boost/__changelog new file mode 100644 index 0000000..36e53c0 --- /dev/null +++ b/abs/extra/boost/__changelog @@ -0,0 +1 @@ +PKGBUILD: remove python dep and comment out python 3.4 line diff --git a/abs/extra/cmocka/PKGBUILD b/abs/extra/cmocka/PKGBUILD new file mode 100644 index 0000000..fc28878 --- /dev/null +++ b/abs/extra/cmocka/PKGBUILD @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com> + +pkgname=cmocka +url='http://cmocka.org/' +pkgver=0.4.1 +pkgrel=1 +pkgdesc='an elegant unit testing framework for C with support for mock objects' +arch=(i686 x86_64) +license=(GPL) +depends=(glibc) +makedepends=(cmake) +source=(http://git.cryptomilk.org/projects/cmocka.git/snapshot/cmocka-$pkgver.tar.bz2) +sha1sums=('215378198f489033d982122e34168d9d225e2f5b') + +build() { + rm -rf build; mkdir build + cd build + cmake ../$pkgname-$pkgver -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUNIT_TESTING=ON + make +} + +check() { + cd build + make test +} + +package() { + cd build + make install DESTDIR="$pkgdir" +} diff --git a/abs/extra/community/gstreamer0.10-base/PKGBUILD b/abs/extra/community/gstreamer0.10-base/PKGBUILD index 5bfea48..bc63724 100644 --- a/abs/extra/community/gstreamer0.10-base/PKGBUILD +++ b/abs/extra/community/gstreamer0.10-base/PKGBUILD @@ -1,41 +1,62 @@ -# $Id: PKGBUILD 153257 2012-03-12 15:48:41Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=('gstreamer0.10-base') pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins') pkgver=0.10.36 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10>=0.10.35' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') -options=(!libtool !emptydirs) +makedepends=('pkgconfig' 'gstreamer0.10>=0.10.36' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection' 'git') +options=(!emptydirs) url="http://gstreamer.freedesktop.org/" -source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.xz) -sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a') +source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-base#commit=48d5966f12d4e6b71c96db0600cf76ef0ef14b3a" + fix-crash-0-byte-ogg.patch + colorbalance-fix-abi.patch + revert-decodebin-playbin-removal.patch + videoscale-fix-negotiation.patch + ayuv64-lanczos.patch + gstaudio-symbols.patch) +sha256sums=('SKIP' + 'a6a01035ea9627737f9c17f72919857ed43ccc7c2cb08b645b43ed89f78d0f4f' + '7442c5c68068428b8c7ac1d3825ce29f1bb152b75b77047b9e806c7d322b780c' + 'ba20659fafea73db016ddaecd128f12087e0957ce35cf2c3ce29f72c51551ef3' + 'ae27f7be58997217f67898b37b138a485c203389e56b65e6b31c23f769ef39ca' + '3792dfe80c69f51c0db98533e8fb16707b5dd2ee6933ea6098583af873ceb44a' + '56e7a988df39d2ec4befa265536ad8c30d3c8d18d136cebef64e8d6baac1abae') + +prepare() { + cd gst-plugins-base + sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + patch -Np1 -i ../fix-crash-0-byte-ogg.patch + patch -Np1 -i ../colorbalance-fix-abi.patch + patch -Np1 -i ../ayuv64-lanczos.patch + patch -Np1 -i ../videoscale-fix-negotiation.patch + patch -Np1 -i ../gstaudio-symbols.patch + patch -Np1 -R -i ../revert-decodebin-playbin-removal.patch +} build() { - cd "${srcdir}/gst-plugins-base-${pkgver}" - sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf + cd gst-plugins-base + NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental --disable-gnome_vfs \ + --disable-static --enable-experimental --disable-gnome_vfs --disable-gtk-doc \ --with-package-name="GStreamer Base Plugins (Archlinux)" \ --with-package-origin="http://www.archlinux.org/" - make sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile } check() { - cd "${srcdir}/gst-plugins-base-${pkgver}" + cd gst-plugins-base make check } package_gstreamer0.10-base() { pkgdesc="GStreamer Multimedia Framework Base plugin libraries" - depends=('gstreamer0.10>=0.10.35' 'orc' 'libxv') + depends=('gstreamer0.10>=0.10.36' 'orc' 'libxv') - cd "${srcdir}/gst-plugins-base-${pkgver}" + cd gst-plugins-base make DESTDIR="${pkgdir}" install } @@ -46,7 +67,7 @@ package_gstreamer0.10-base-plugins() { conflicts=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg') groups=('gstreamer0.10-plugins') - cd "${srcdir}/gst-plugins-base-${pkgver}" + cd gst-plugins-base make -C gst-libs DESTDIR="${pkgdir}" install make -C ext DESTDIR="${pkgdir}" install make -C gst-libs DESTDIR="${pkgdir}" uninstall diff --git a/abs/extra/community/gstreamer0.10-base/__changelog b/abs/extra/community/gstreamer0.10-base/__changelog deleted file mode 100644 index 05c3a3b..0000000 --- a/abs/extra/community/gstreamer0.10-base/__changelog +++ /dev/null @@ -1 +0,0 @@ -removed jack and libpulse diff --git a/abs/extra/community/gstreamer0.10-base/ayuv64-lanczos.patch b/abs/extra/community/gstreamer0.10-base/ayuv64-lanczos.patch new file mode 100644 index 0000000..64106e4 --- /dev/null +++ b/abs/extra/community/gstreamer0.10-base/ayuv64-lanczos.patch @@ -0,0 +1,236 @@ +From e4f01106d08f3c2a65897bfe919bd65ce55545a8 Mon Sep 17 00:00:00 2001 +From: David Schleef <ds@schleef.org> +Date: Wed, 25 Jan 2012 23:49:00 +0000 +Subject: videoscale: Add AYUV64 path to Lanczos + +--- +diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c +index 7b44647..6df4ba6 100644 +--- a/gst/videoscale/gstvideoscale.c ++++ b/gst/videoscale/gstvideoscale.c +@@ -1199,6 +1199,11 @@ gst_video_scale_transform (GstBaseTransform * trans, GstBuffer * in, + case GST_VIDEO_SCALE_4TAP: + vs_image_scale_4tap_AYUV64 (&dest, &src, videoscale->tmp_buf); + break; ++ case GST_VIDEO_SCALE_LANCZOS: ++ vs_image_scale_lanczos_AYUV64 (&dest, &src, videoscale->tmp_buf, ++ videoscale->sharpness, videoscale->dither, videoscale->submethod, ++ videoscale->envelope, videoscale->sharpen); ++ break; + default: + goto unknown_mode; + } +diff --git a/gst/videoscale/vs_image.h b/gst/videoscale/vs_image.h +index 2312acc..7b34991 100644 +--- a/gst/videoscale/vs_image.h ++++ b/gst/videoscale/vs_image.h +@@ -52,6 +52,9 @@ void vs_image_scale_linear_RGBA (const VSImage *dest, const VSImage *src, + void vs_image_scale_lanczos_AYUV (const VSImage * dest, const VSImage * src, + uint8_t * tmpbuf, double sharpness, gboolean dither, int submethod, + double a, double sharpen); ++void vs_image_scale_lanczos_AYUV64 (const VSImage * dest, const VSImage * src, ++ uint8_t * tmpbuf, double sharpness, gboolean dither, int submethod, ++ double a, double sharpen); + + void vs_image_scale_nearest_RGB (const VSImage *dest, const VSImage *src, + uint8_t *tmpbuf); +diff --git a/gst/videoscale/vs_lanczos.c b/gst/videoscale/vs_lanczos.c +index 1c87ba3..d141a01 100644 +--- a/gst/videoscale/vs_lanczos.c ++++ b/gst/videoscale/vs_lanczos.c +@@ -204,6 +204,9 @@ static void vs_image_scale_lanczos_AYUV_float (const VSImage * dest, + static void vs_image_scale_lanczos_AYUV_double (const VSImage * dest, + const VSImage * src, uint8_t * tmpbuf, double sharpness, gboolean dither, + double a, double sharpen); ++static void vs_image_scale_lanczos_AYUV64_double (const VSImage * dest, ++ const VSImage * src, uint8_t * tmpbuf, double sharpness, gboolean dither, ++ double a, double sharpen); + + static double + sinc (double x) +@@ -590,6 +593,15 @@ vs_image_scale_lanczos_AYUV (const VSImage * dest, const VSImage * src, + } + } + ++void ++vs_image_scale_lanczos_AYUV64 (const VSImage * dest, const VSImage * src, ++ uint8_t * tmpbuf, double sharpness, gboolean dither, int submethod, ++ double a, double sharpen) ++{ ++ vs_image_scale_lanczos_AYUV64_double (dest, src, tmpbuf, sharpness, dither, ++ a, sharpen); ++} ++ + + + #define RESAMPLE_HORIZ_FLOAT(function, dest_type, tap_type, src_type, _n_taps) \ +@@ -813,9 +825,9 @@ RESAMPLE_VERT_DITHER (resample_vert_dither_int16_generic, gint16, gint16, + n_taps, shift) + /* *INDENT-ON* */ + +-#define RESAMPLE_VERT_FLOAT(function, tap_type, src_type, _n_taps, _shift) \ ++#define RESAMPLE_VERT_FLOAT(function, dest_type, clamp, tap_type, src_type, _n_taps, _shift) \ + static void \ +-function (guint8 *dest, \ ++function (dest_type *dest, \ + const tap_type *taps, const src_type *src, int stride, int n_taps, \ + int shift, int n) \ + { \ +@@ -828,13 +840,13 @@ function (guint8 *dest, \ + const src_type *line = PTR_OFFSET(src, stride * l); \ + sum_y += line[i] * taps[l]; \ + } \ +- dest[i] = CLAMP (floor(0.5 + sum_y), 0, 255); \ ++ dest[i] = CLAMP (floor(0.5 + sum_y), 0, clamp); \ + } \ + } + +-#define RESAMPLE_VERT_FLOAT_DITHER(function, tap_type, src_type, _n_taps, _shift) \ ++#define RESAMPLE_VERT_FLOAT_DITHER(function, dest_type, clamp, tap_type, src_type, _n_taps, _shift) \ + static void \ +-function (guint8 *dest, \ ++function (dest_type *dest, \ + const tap_type *taps, const src_type *src, int stride, int n_taps, \ + int shift, int n) \ + { \ +@@ -849,19 +861,24 @@ function (guint8 *dest, \ + sum_y += line[i] * taps[l]; \ + } \ + err_y += sum_y; \ +- dest[i] = CLAMP (floor (err_y), 0, 255); \ ++ dest[i] = CLAMP (floor (err_y), 0, clamp); \ + err_y -= floor (err_y); \ + } \ + } + + /* *INDENT-OFF* */ +-RESAMPLE_VERT_FLOAT (resample_vert_double_generic, double, double, n_taps, ++RESAMPLE_VERT_FLOAT (resample_vert_double_generic, guint8, 255, double, double, n_taps, + shift) +-RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_double_generic, double, double, ++RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_double_generic, guint8, 255, double, double, + n_taps, shift) + +-RESAMPLE_VERT_FLOAT (resample_vert_float_generic, float, float, n_taps, shift) +-RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_float_generic, float, float, ++RESAMPLE_VERT_FLOAT (resample_vert_double_generic_u16, guint16, 65535, double, double, n_taps, ++ shift) ++RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_double_generic_u16, guint16, 65535, double, double, ++ n_taps, shift) ++ ++RESAMPLE_VERT_FLOAT (resample_vert_float_generic, guint8, 255, float, float, n_taps, shift) ++RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_float_generic, guint8, 255, float, float, + n_taps, shift) + /* *INDENT-ON* */ + +@@ -1556,3 +1573,77 @@ vs_image_scale_lanczos_AYUV_float (const VSImage * dest, const VSImage * src, + scale1d_cleanup (&scale->y_scale1d); + g_free (scale->tmpdata); + } ++ ++static void ++vs_scale_lanczos_AYUV64_double (Scale * scale) ++{ ++ int j; ++ int yi; ++ int tmp_yi; ++ ++ tmp_yi = 0; ++ ++ for (j = 0; j < scale->dest->height; j++) { ++ guint16 *destline; ++ double *taps; ++ ++ destline = (guint16 *) (scale->dest->pixels + scale->dest->stride * j); ++ ++ yi = scale->y_scale1d.offsets[j]; ++ ++ while (tmp_yi < yi + scale->y_scale1d.n_taps) { ++ scale->horiz_resample_func (TMP_LINE_DOUBLE_AYUV (tmp_yi), ++ scale->x_scale1d.offsets, scale->x_scale1d.taps, SRC_LINE (tmp_yi), ++ scale->x_scale1d.n_taps, 0, scale->dest->width); ++ tmp_yi++; ++ } ++ ++ taps = (double *) scale->y_scale1d.taps + j * scale->y_scale1d.n_taps; ++ if (scale->dither) { ++ resample_vert_dither_double_generic_u16 (destline, ++ taps, TMP_LINE_DOUBLE_AYUV (scale->y_scale1d.offsets[j]), ++ sizeof (double) * 4 * scale->dest->width, ++ scale->y_scale1d.n_taps, 0, scale->dest->width * 4); ++ } else { ++ resample_vert_double_generic_u16 (destline, ++ taps, TMP_LINE_DOUBLE_AYUV (scale->y_scale1d.offsets[j]), ++ sizeof (double) * 4 * scale->dest->width, ++ scale->y_scale1d.n_taps, 0, scale->dest->width * 4); ++ } ++ } ++} ++ ++void ++vs_image_scale_lanczos_AYUV64_double (const VSImage * dest, const VSImage * src, ++ uint8_t * tmpbuf, double sharpness, gboolean dither, double a, ++ double sharpen) ++{ ++ Scale s = { 0 }; ++ Scale *scale = &s; ++ int n_taps; ++ ++ scale->dest = dest; ++ scale->src = src; ++ ++ n_taps = scale1d_get_n_taps (src->width, dest->width, a, sharpness); ++ scale1d_calculate_taps (&scale->x_scale1d, ++ src->width, dest->width, n_taps, a, sharpness, sharpen); ++ ++ n_taps = scale1d_get_n_taps (src->height, dest->height, a, sharpness); ++ scale1d_calculate_taps (&scale->y_scale1d, ++ src->height, dest->height, n_taps, a, sharpness, sharpen); ++ ++ scale->dither = dither; ++ ++ scale->horiz_resample_func = ++ (HorizResampleFunc) resample_horiz_double_ayuv_generic; ++ ++ scale->tmpdata = ++ g_malloc (sizeof (double) * scale->dest->width * scale->src->height * 4); ++ ++ vs_scale_lanczos_AYUV64_double (scale); ++ ++ scale1d_cleanup (&scale->x_scale1d); ++ scale1d_cleanup (&scale->y_scale1d); ++ g_free (scale->tmpdata); ++} +-- +cgit v0.9.0.2-2-gbebe +From f8dc679ca7e9542e6f410062df5e332fc8e0ba9d Mon Sep 17 00:00:00 2001 +From: David Schleef <ds@schleef.org> +Date: Sun, 19 Feb 2012 08:03:03 +0000 +Subject: videoscale: fix AYUV64 scaling + +--- +diff --git a/gst/videoscale/vs_lanczos.c b/gst/videoscale/vs_lanczos.c +index d141a01..67cd401 100644 +--- a/gst/videoscale/vs_lanczos.c ++++ b/gst/videoscale/vs_lanczos.c +@@ -728,6 +728,9 @@ RESAMPLE_HORIZ_AYUV_FLOAT (resample_horiz_double_ayuv_generic, double, double, + RESAMPLE_HORIZ_AYUV_FLOAT (resample_horiz_float_ayuv_generic, float, float, + guint8, n_taps) + ++RESAMPLE_HORIZ_AYUV_FLOAT (resample_horiz_double_ayuv_generic_s16, double, double, ++ guint16, n_taps) ++ + RESAMPLE_HORIZ (resample_horiz_int32_int32_u8_generic, gint32, gint32, + guint8, n_taps, shift) + RESAMPLE_HORIZ (resample_horiz_int16_int16_u8_generic, gint16, gint16, +@@ -1636,7 +1639,7 @@ vs_image_scale_lanczos_AYUV64_double (const VSImage * dest, const VSImage * src, + scale->dither = dither; + + scale->horiz_resample_func = +- (HorizResampleFunc) resample_horiz_double_ayuv_generic; ++ (HorizResampleFunc) resample_horiz_double_ayuv_generic_s16; + + scale->tmpdata = + g_malloc (sizeof (double) * scale->dest->width * scale->src->height * 4); +-- +cgit v0.9.0.2-2-gbebe diff --git a/abs/extra/community/gstreamer0.10-base/colorbalance-fix-abi.patch b/abs/extra/community/gstreamer0.10-base/colorbalance-fix-abi.patch new file mode 100644 index 0000000..1e7b8f2 --- /dev/null +++ b/abs/extra/community/gstreamer0.10-base/colorbalance-fix-abi.patch @@ -0,0 +1,23 @@ +From 0cb4ccb1f09d39820682e052fc106f5fd7fa1309 Mon Sep 17 00:00:00 2001 +From: Stefan Sauer <ensonic@users.sf.net> +Date: Fri, 24 Feb 2012 20:37:00 +0000 +Subject: interfaces: fix ABI class padding after the recent changes + +--- +(limited to 'gst-libs/gst/interfaces/colorbalance.h') + +diff --git a/gst-libs/gst/interfaces/colorbalance.h b/gst-libs/gst/interfaces/colorbalance.h +index fd8ceaa..9f0a1cd 100644 +--- a/gst-libs/gst/interfaces/colorbalance.h ++++ b/gst-libs/gst/interfaces/colorbalance.h +@@ -102,7 +102,7 @@ struct _GstColorBalanceClass { + GstColorBalanceType (*get_balance_type) (GstColorBalance *balance); + + /*< private >*/ +- gpointer _gst_reserved[GST_PADDING]; ++ gpointer _gst_reserved[GST_PADDING-1]; + }; + + GType gst_color_balance_get_type (void); +-- +cgit v0.9.0.2-2-gbebe diff --git a/abs/extra/community/gstreamer0.10-base/fix-crash-0-byte-ogg.patch b/abs/extra/community/gstreamer0.10-base/fix-crash-0-byte-ogg.patch new file mode 100644 index 0000000..2c03e82 --- /dev/null +++ b/abs/extra/community/gstreamer0.10-base/fix-crash-0-byte-ogg.patch @@ -0,0 +1,22 @@ +From 7f22e3ea7f713867e1fbf2ef71b6a6e36e1f0531 Mon Sep 17 00:00:00 2001 +From: Jonathan Liu <net147@gmail.com> +Date: Sun, 28 Oct 2012 10:07:16 +0000 +Subject: oggstream: fix crash with 0 byte ogg packets + +https://bugzilla.gnome.org/show_bug.cgi?id=687030 +--- +diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c +index c79f088..fe28f2e 100644 +--- a/ext/ogg/gstoggstream.c ++++ b/ext/ogg/gstoggstream.c +@@ -790,7 +790,7 @@ setup_vorbis_mapper (GstOggStream * pad, ogg_packet * packet) + static gboolean + is_header_vorbis (GstOggStream * pad, ogg_packet * packet) + { +- if (packet->bytes > 0 && (packet->packet[0] & 0x01) == 0) ++ if (packet->bytes == 0 || (packet->packet[0] & 0x01) == 0) + return FALSE; + + if (packet->packet[0] == 5) { +-- +cgit v0.9.0.2-2-gbebe diff --git a/abs/extra/community/gstreamer0.10-base/gstaudio-symbols.patch b/abs/extra/community/gstreamer0.10-base/gstaudio-symbols.patch new file mode 100644 index 0000000..7e2ad0f --- /dev/null +++ b/abs/extra/community/gstreamer0.10-base/gstaudio-symbols.patch @@ -0,0 +1,10 @@ +--- gst-plugins-base/win32/common/libgstaudio.def.orig 2013-12-10 12:09:41.280012610 +0000 ++++ gst-plugins-base/win32/common/libgstaudio.def 2013-12-10 12:10:12.253127720 +0000 +@@ -24,6 +24,7 @@ + gst_audio_decoder_get_plc_aware + gst_audio_decoder_get_tolerance + gst_audio_decoder_get_type ++ gst_audio_decoder_merge_tags + gst_audio_decoder_set_byte_time + gst_audio_decoder_set_drainable + gst_audio_decoder_set_latency diff --git a/abs/extra/community/gstreamer0.10-base/revert-decodebin-playbin-removal.patch b/abs/extra/community/gstreamer0.10-base/revert-decodebin-playbin-removal.patch new file mode 100644 index 0000000..2e59139 --- /dev/null +++ b/abs/extra/community/gstreamer0.10-base/revert-decodebin-playbin-removal.patch @@ -0,0 +1,122 @@ +From fece626254e3b250e4514d1c92ac8289421d9511 Mon Sep 17 00:00:00 2001 +From: Sebastian Dröge <sebastian.droege@collabora.co.uk> +Date: Thu, 15 Mar 2012 11:34:22 +0000 +Subject: Disable old playbin and decodebin + +--- +diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am +index a0f1abc..700f581 100644 +--- a/gst/playback/Makefile.am ++++ b/gst/playback/Makefile.am +@@ -6,19 +6,15 @@ glib_gen_basename = gstplay + built_sources = gstplay-marshal.c + built_headers = gstplay-marshal.h + +-plugin_LTLIBRARIES = libgstplaybin.la libgstdecodebin.la libgstdecodebin2.la ++plugin_LTLIBRARIES = libgstplaybin.la libgstdecodebin2.la + + csp_cflags = -DCOLORSPACE=\"ffmpegcolorspace\" + + libgstplaybin_la_SOURCES = \ + gstplayback.c \ +- gstplaybin.c \ + gstplaybin2.c \ + gstplaysink.c \ +- gstplaybasebin.c \ + gstplay-enum.c \ +- gststreaminfo.c \ +- gststreamselector.c \ + gstsubtitleoverlay.c \ + gstplaysinkvideoconvert.c \ + gstplaysinkaudioconvert.c \ +@@ -37,17 +33,6 @@ if !GST_PLUGIN_BUILD_STATIC + libgstplaybin_la_LIBTOOLFLAGS = --tag=disable-static + endif + +-libgstdecodebin_la_SOURCES = gstdecodebin.c +-nodist_libgstdecodebin_la_SOURCES = $(built_sources) +-libgstdecodebin_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(csp_cflags) +-libgstdecodebin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +-libgstdecodebin_la_LIBADD = \ +- $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ +- $(GST_LIBS) +-if !GST_PLUGIN_BUILD_STATIC +-libgstdecodebin_la_LIBTOOLFLAGS = --tag=disable-static +-endif +- + libgstdecodebin2_la_SOURCES = gstdecodebin2.c gsturidecodebin.c gstplay-enum.c + nodist_libgstdecodebin2_la_SOURCES = $(built_sources) + libgstdecodebin2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(csp_cflags) +@@ -61,11 +46,8 @@ endif + + noinst_HEADERS = \ + gstplayback.h \ +- gstplaybasebin.h \ + gstplaysink.h \ +- gststreaminfo.h \ + gstplay-enum.h \ +- gststreamselector.h \ + gstrawcaps.h \ + gstsubtitleoverlay.h \ + gstplaysinkvideoconvert.h \ +@@ -83,18 +65,6 @@ include $(top_srcdir)/common/gst-glib-gen.mak + + Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ +- -:PROJECT libgstdecodebin -:SHARED libgstdecodebin \ +- -:TAGS eng debug \ +- -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ +- -:SOURCES $(libgstdecodebin_la_SOURCES) \ +- $(nodist_libgstdecodebin_la_SOURCES) \ +- -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstdecodebin_la_CFLAGS) $(csp_cflags) \ +- -:LDFLAGS $(libgstdecodebin_la_LDFLAGS) \ +- $(libgstdecodebin_la_LIBADD) \ +- -ldl \ +- -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ +- LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ +- \ + -:PROJECT libgstdecodebin2 -:SHARED libgstdecodebin2 \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ +diff --git a/gst/playback/gstplayback.c b/gst/playback/gstplayback.c +index 5b74786..f99df6e 100644 +--- a/gst/playback/gstplayback.c ++++ b/gst/playback/gstplayback.c +@@ -29,8 +29,6 @@ + + #include "gstplayback.h" + #include "gstplaysink.h" +-#include "gststreamselector.h" +-#include "gststreaminfo.h" + #include "gstsubtitleoverlay.h" + + static gboolean +@@ -47,13 +45,7 @@ plugin_init (GstPlugin * plugin) + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + #endif /* ENABLE_NLS */ + +- /* ref class from a thread-safe context to work around missing bit of +- * thread-safety in GObject */ +- g_type_class_ref (GST_TYPE_STREAM_INFO); +- g_type_class_ref (GST_TYPE_STREAM_SELECTOR); +- +- res = gst_play_bin_plugin_init (plugin); +- res &= gst_play_bin2_plugin_init (plugin); ++ res = gst_play_bin2_plugin_init (plugin); + res &= gst_play_sink_plugin_init (plugin); + res &= gst_subtitle_overlay_plugin_init (plugin); + +diff --git a/gst/playback/gstplayback.h b/gst/playback/gstplayback.h +index 4be121c..5981cdd 100644 +--- a/gst/playback/gstplayback.h ++++ b/gst/playback/gstplayback.h +@@ -24,7 +24,6 @@ + #include <gst/gst.h> + + gboolean gst_decode_bin_plugin_init (GstPlugin * plugin); +-gboolean gst_play_bin_plugin_init (GstPlugin * plugin); + gboolean gst_play_bin2_plugin_init (GstPlugin * plugin); + + +-- +cgit v0.9.0.2-2-gbebe diff --git a/abs/extra/community/gstreamer0.10-base/videoscale-fix-negotiation.patch b/abs/extra/community/gstreamer0.10-base/videoscale-fix-negotiation.patch new file mode 100644 index 0000000..6e34d41 --- /dev/null +++ b/abs/extra/community/gstreamer0.10-base/videoscale-fix-negotiation.patch @@ -0,0 +1,171 @@ +From 63d1316c0fd4ce22cf4a53f4aa7cb1ca16a07aa8 Mon Sep 17 00:00:00 2001 +From: Tim-Philipp Müller <tim.muller@collabora.co.uk> +Date: Sun, 26 Feb 2012 18:19:57 +0000 +Subject: videoscale: fix negotiation after addition of new formats and methods + +Now that we no longer support all methods for all formats, we +need to cater for that in the transform function: we can't +transform formats not supported by the currently-selected +mehod. + +make check, folks. It's da bomb. +--- +diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c +index 9f072a3..60dd5ff 100644 +--- a/gst/videoscale/gstvideoscale.c ++++ b/gst/videoscale/gstvideoscale.c +@@ -424,10 +424,118 @@ gst_video_scale_get_property (GObject * object, guint prop_id, GValue * value, + } + } + ++#define NEAREST (1 << GST_VIDEO_SCALE_NEAREST) ++#define BILINEAR (1 << GST_VIDEO_SCALE_BILINEAR) ++#define FOURTAP (1 << GST_VIDEO_SCALE_4TAP) ++#define LANCZOS (1 << GST_VIDEO_SCALE_LANCZOS) ++ ++/* or we could just do lookups via table[format] if we could be bothered.. */ ++static const struct ++{ ++ GstVideoFormat format; ++ guint8 methods; ++} formats_methods_table[] = { ++ { ++ GST_VIDEO_FORMAT_RGBx, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_xRGB, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_BGRx, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_xBGR, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_RGBA, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_ARGB, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_BGRA, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_ABGR, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_AYUV, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_ARGB64, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_AYUV64, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_RGB, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_BGR, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_v308, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_YUY2, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_YVYU, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_UYVY, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_Y800, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_GRAY8, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_GRAY16_LE, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_GRAY16_BE, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_Y16, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_I420, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_YV12, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_Y444, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_Y42B, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_Y41B, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_NV12, NEAREST | BILINEAR}, { ++ GST_VIDEO_FORMAT_RGB16, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_RGB15, NEAREST | BILINEAR | FOURTAP} ++}; ++ ++static gboolean ++gst_video_scale_format_supported_for_method (GstVideoFormat format, ++ GstVideoScaleMethod method) ++{ ++ int i; ++ ++ for (i = 0; i < G_N_ELEMENTS (formats_methods_table); ++i) { ++ if (formats_methods_table[i].format == format) ++ return ((formats_methods_table[i].methods & (1 << method)) != 0); ++ } ++ return FALSE; ++} ++ ++static gboolean ++gst_video_scale_transform_supported (GstVideoScale * videoscale, ++ GstVideoScaleMethod method, GstStructure * structure) ++{ ++ const GValue *val; ++ GstVideoFormat fmt; ++ gboolean supported = TRUE; ++ GstStructure *s; ++ GstCaps *c; ++ ++ /* we support these methods for all formats */ ++ if (method == GST_VIDEO_SCALE_NEAREST || method == GST_VIDEO_SCALE_BILINEAR) ++ return TRUE; ++ ++ /* we need fixed caps if we want to use gst_video_parse_caps() */ ++ s = gst_structure_new (gst_structure_get_name (structure), ++ "width", G_TYPE_INT, 1, "height", G_TYPE_INT, 1, NULL); ++ ++ if ((val = gst_structure_get_value (structure, "format"))) { ++ gst_structure_set_value (s, "format", val); ++ } else { ++ if ((val = gst_structure_get_value (structure, "endianness"))) ++ gst_structure_set_value (s, "endianness", val); ++ if ((val = gst_structure_get_value (structure, "red_mask"))) ++ gst_structure_set_value (s, "red_mask", val); ++ if ((val = gst_structure_get_value (structure, "blue_mask"))) ++ gst_structure_set_value (s, "blue_mask", val); ++ if ((val = gst_structure_get_value (structure, "green_mask"))) ++ gst_structure_set_value (s, "green_mask", val); ++ if ((val = gst_structure_get_value (structure, "alpha_mask"))) ++ gst_structure_set_value (s, "alpha_mask", val); ++ if ((val = gst_structure_get_value (structure, "depth"))) ++ gst_structure_set_value (s, "depth", val); ++ if ((val = gst_structure_get_value (structure, "bpp"))) ++ gst_structure_set_value (s, "bpp", val); ++ } ++ c = gst_caps_new_full (s, NULL); ++ if (!gst_video_format_parse_caps (c, &fmt, NULL, NULL)) { ++ GST_ERROR_OBJECT (videoscale, "couldn't parse %" GST_PTR_FORMAT, c); ++ } else if (!gst_video_scale_format_supported_for_method (fmt, method)) { ++ supported = FALSE; ++ } ++ GST_LOG_OBJECT (videoscale, "method %d %ssupported for format %d", ++ method, (supported) ? "" : "not ", fmt); ++ gst_caps_unref (c); ++ ++ return supported; ++} ++ + static GstCaps * + gst_video_scale_transform_caps (GstBaseTransform * trans, + GstPadDirection direction, GstCaps * caps) + { ++ GstVideoScale *videoscale = GST_VIDEO_SCALE (trans); ++ GstVideoScaleMethod method; + GstCaps *ret; + GstStructure *structure; + +@@ -441,6 +549,13 @@ gst_video_scale_transform_caps (GstBaseTransform * trans, + ret = gst_caps_copy (caps); + structure = gst_structure_copy (gst_caps_get_structure (ret, 0)); + ++ GST_OBJECT_LOCK (videoscale); ++ method = videoscale->method; ++ GST_OBJECT_UNLOCK (videoscale); ++ ++ if (!gst_video_scale_transform_supported (videoscale, method, structure)) ++ goto format_not_supported; ++ + gst_structure_set (structure, + "width", GST_TYPE_INT_RANGE, 1, G_MAXINT, + "height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL); +@@ -452,9 +567,19 @@ gst_video_scale_transform_caps (GstBaseTransform * trans, + } + gst_caps_append_structure (ret, structure); + ++done: ++ + GST_DEBUG_OBJECT (trans, "returning caps: %" GST_PTR_FORMAT, ret); + + return ret; ++ ++format_not_supported: ++ { ++ gst_structure_free (structure); ++ gst_caps_unref (ret); ++ ret = gst_caps_new_empty (); ++ goto done; ++ } + } + + static gboolean +-- +cgit v0.9.0.2-2-gbebe diff --git a/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD b/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD index e6a0dc3..4330aa4 100644 --- a/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD +++ b/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 147131 2012-01-22 11:26:07Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10-ffmpeg pkgver=0.10.13 -pkgrel=1 +pkgrel=2 pkgdesc="Gstreamer FFMpeg Plugin" arch=('i686' 'x86_64') license=('GPL') depends=('gstreamer0.10-base' 'bzip2') -makedepends=('pkgconfig' 'yasm' 'sdl') +makedepends=('pkgconfig' 'yasm' 'sdl' 'git' 'gtk-doc') url="http://www.gstreamer.net" groups=('gstreamer0.10-plugins') -options=('!libtool') -source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2 cmp_error.patch) +source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-ffmpeg#commit=94e587b9182c6d2fde9a61c9def790c8047453c0") +sha256sums=('SKIP') build() { - cd "${srcdir}/gst-ffmpeg-${pkgver}" - patch -Np1 < $srcdir/cmp_error.patch - unset CFLAGS - unset CXXFLAGS - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-ffmpeg-extra-configure="--enable-runtime-cpudetect" + cd gst-ffmpeg + NOCONFIGURE=1 ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --enable-gtk-doc --with-ffmpeg-extra-configure="--enable-runtime-cpudetect" make } -package() { - cd "${srcdir}/gst-ffmpeg-${pkgver}" +check() { + cd gst-ffmpeg + make check +} +package() { + cd gst-ffmpeg make DESTDIR="${pkgdir}" install } -md5sums=('7f5beacaf1312db2db30a026b36888c4' - 'eebcd022f3057c65fb3d0320831af6fe') diff --git a/abs/extra/community/gstreamer0.10-ffmpeg/cmp_error.patch b/abs/extra/community/gstreamer0.10-ffmpeg/cmp_error.patch deleted file mode 100644 index 602a57f..0000000 --- a/abs/extra/community/gstreamer0.10-ffmpeg/cmp_error.patch +++ /dev/null @@ -1,39 +0,0 @@ -=================================================================== ---- gst-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700 -+++ gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:54:08.152564075 -0700 -@@ -398,7 +398,7 @@ - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : "memory"\ - );\ - src += 4-(h+5)*srcStride;\ -@@ -446,7 +446,7 @@ - QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ - "2: \n\t"\ - : "+a"(src)\ -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ - : "memory"\ - );\ - tmp += 4;\ -@@ -823,7 +823,7 @@ - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ - "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ - "memory"\ -@@ -878,7 +878,7 @@ - QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) - "2: \n\t" - : "+a"(src) -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", - "%xmm4", "%xmm5", "%xmm6", "%xmm7",) - "memory" diff --git a/abs/extra/community/gstreamer0.10-good/PKGBUILD b/abs/extra/community/gstreamer0.10-good/PKGBUILD index 1f3b841..c2b316a 100644 --- a/abs/extra/community/gstreamer0.10-good/PKGBUILD +++ b/abs/extra/community/gstreamer0.10-good/PKGBUILD @@ -1,29 +1,40 @@ -# $Id: PKGBUILD 153259 2012-03-12 16:05:31Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') pkgver=0.10.31 -pkgrel=1 +pkgrel=6 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'udev') +makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'git' 'cairo') url="http://gstreamer.freedesktop.org/" -options=(!libtool !emptydirs) -source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz) -sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64') +options=(!emptydirs) +source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-good#commit=e28fd8886f05bb51c147f871f3a1db2fc2b735a9" + test-rtp-payloading.patch) +sha256sums=('SKIP' + 'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29') + +prepare() { + cd gst-plugins-good -build() { - cd "${srcdir}/gst-plugins-good-${pkgver}" sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + + patch -p1 -i ../test-rtp-payloading.patch +} + +build() { + cd gst-plugins-good + NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --disable-schemas-install \ --disable-hal \ --disable-esd \ - --disable-pusle \ + --disable-pulse \ --disable-jack \ + --disable-gtk-doc \ --with-package-name="GStreamer Good Plugins (Archlinux)" \ --with-package-origin="http://www.archlinux.org/" @@ -31,8 +42,8 @@ build() { sed -e 's/gst sys ext/gst/' -i Makefile } -_check() { - cd "${srcdir}/gst-plugins-good-${pkgver}" +check() { + cd gst-plugins-good make check } @@ -40,20 +51,20 @@ package_gstreamer0.10-good() { depends=('gstreamer0.10-base>=0.10.34' 'bzip2') pkgdesc="GStreamer Multimedia Framework Good plugin libraries" - cd "${srcdir}/gst-plugins-good-${pkgver}" + cd gst-plugins-good make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install rm -rf "${pkgdir}/etc/gconf" } package_gstreamer0.10-good-plugins() { - depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'udev') + depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'cairo' 'gdk-pixbuf2') pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" groups=('gstreamer0.10-plugins') replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') install=gstreamer0.10-good-plugins.install - cd "${srcdir}/gst-plugins-good-${pkgver}" + cd gst-plugins-good make -C sys DESTDIR="${pkgdir}" install make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" diff --git a/abs/extra/community/gstreamer0.10-good/__changelog b/abs/extra/community/gstreamer0.10-good/__changelog new file mode 100644 index 0000000..387bdff --- /dev/null +++ b/abs/extra/community/gstreamer0.10-good/__changelog @@ -0,0 +1 @@ +PKGBUILD: remove jack and libpulse dep and disable in configure diff --git a/abs/extra/community/gstreamer0.10-good/test-rtp-payloading.patch b/abs/extra/community/gstreamer0.10-good/test-rtp-payloading.patch new file mode 100644 index 0000000..e8a9431 --- /dev/null +++ b/abs/extra/community/gstreamer0.10-good/test-rtp-payloading.patch @@ -0,0 +1,422 @@ +From dca42d4767adff3578e5d5990604766735ec1f9b Mon Sep 17 00:00:00 2001 +From: Tim-Philipp Müller <tim.muller@collabora.co.uk> +Date: Fri, 10 Feb 2012 13:44:43 +0000 +Subject: tests: clean up rtp-payloading test a little + +Feed data into the pipeline using appsrc instead of fdsrc and +a pipe. Store unsigned byte values in guint8 instead of char. +Getting rid of the capsfilter also helps to avoid 'format is +not fully specified' warnings when pushing "video/x-h264" data +into rtph264pay with fully specified h264 caps in the sink template. +--- +diff --git a/tests/check/elements/rtp-payloading.c b/tests/check/elements/rtp-payloading.c +index b2160f4..7b4985b 100644 +--- a/tests/check/elements/rtp-payloading.c ++++ b/tests/check/elements/rtp-payloading.c +@@ -31,13 +31,11 @@ + typedef struct + { + GstElement *pipeline; +- GstElement *fdsrc; +- GstElement *capsfilter; ++ GstElement *appsrc; + GstElement *rtppay; + GstElement *rtpdepay; + GstElement *fakesink; +- int fd[2]; +- const char *frame_data; ++ const guint8 *frame_data; + int frame_data_size; + int frame_count; + } rtp_pipeline; +@@ -140,13 +138,11 @@ rtp_bus_callback (GstBus * bus, GstMessage * message, gpointer data) + * The user must free the RTP pipeline when it's not used anymore. + */ + static rtp_pipeline * +-rtp_pipeline_create (const char *frame_data, int frame_data_size, ++rtp_pipeline_create (const guint8 * frame_data, int frame_data_size, + int frame_count, const char *filtercaps, const char *pay, const char *depay) + { + gchar *pipeline_name; +- + rtp_pipeline *p; +- + GstCaps *caps; + + /* Check parameters. */ +@@ -165,60 +161,39 @@ rtp_pipeline_create (const char *frame_data, int frame_data_size, + pipeline_name = g_strdup_printf ("%s-%s-pipeline", pay, depay); + p->pipeline = gst_pipeline_new (pipeline_name); + g_free (pipeline_name); +- p->fdsrc = gst_element_factory_make ("fdsrc", NULL); +- p->capsfilter = gst_element_factory_make ("capsfilter", NULL); ++ p->appsrc = gst_element_factory_make ("appsrc", NULL); + p->rtppay = gst_element_factory_make (pay, NULL); + p->rtpdepay = gst_element_factory_make (depay, NULL); + p->fakesink = gst_element_factory_make ("fakesink", NULL); + + /* One or more elements are not created successfully or failed to create p? */ +- if (!p->pipeline || !p->fdsrc || !p->capsfilter || !p->rtppay || !p->rtpdepay +- || !p->fakesink || pipe (p->fd) == -1) { ++ if (!p->pipeline || !p->appsrc || !p->rtppay || !p->rtpdepay || !p->fakesink) { + /* Release created elements. */ + RELEASE_ELEMENT (p->pipeline); +- RELEASE_ELEMENT (p->fdsrc); +- RELEASE_ELEMENT (p->capsfilter); ++ RELEASE_ELEMENT (p->appsrc); + RELEASE_ELEMENT (p->rtppay); + RELEASE_ELEMENT (p->rtpdepay); + RELEASE_ELEMENT (p->fakesink); + +- /* Close pipe. */ +- if (p->fd[0]) { +- close (p->fd[0]); +- } +- +- if (p->fd[1]) { +- close (p->fd[1]); +- } +- + /* Release allocated memory. */ + free (p); + + return NULL; + } + +- /* Set fdsrc properties. */ +- g_object_set (p->fdsrc, "fd", p->fd[0], NULL); +- g_object_set (p->fdsrc, "do-timestamp", TRUE, NULL); +- g_object_set (p->fdsrc, "blocksize", p->frame_data_size, NULL); +- g_object_set (p->fdsrc, "num-buffers", p->frame_count * LOOP_COUNT, NULL); +- +- /* Set caps filters. */ ++ /* Set src properties. */ + caps = gst_caps_from_string (filtercaps); +- +- g_object_set (p->capsfilter, "caps", caps, NULL); ++ g_object_set (p->appsrc, "do-timestamp", TRUE, "caps", caps, NULL); + gst_caps_unref (caps); + + /* Add elements to the pipeline. */ +- gst_bin_add (GST_BIN (p->pipeline), p->fdsrc); +- gst_bin_add (GST_BIN (p->pipeline), p->capsfilter); ++ gst_bin_add (GST_BIN (p->pipeline), p->appsrc); + gst_bin_add (GST_BIN (p->pipeline), p->rtppay); + gst_bin_add (GST_BIN (p->pipeline), p->rtpdepay); + gst_bin_add (GST_BIN (p->pipeline), p->fakesink); + + /* Link elements. */ +- gst_element_link (p->fdsrc, p->capsfilter); +- gst_element_link (p->capsfilter, p->rtppay); ++ gst_element_link (p->appsrc, p->rtppay); + gst_element_link (p->rtppay, p->rtpdepay); + gst_element_link (p->rtpdepay, p->fakesink); + +@@ -240,15 +215,6 @@ rtp_pipeline_destroy (rtp_pipeline * p) + /* Release pipeline. */ + RELEASE_ELEMENT (p->pipeline); + +- /* Close pipe. */ +- if (p->fd[0]) { +- close (p->fd[0]); +- } +- +- if (p->fd[1]) { +- close (p->fd[1]); +- } +- + /* Release allocated memory. */ + free (p); + } +@@ -260,11 +226,10 @@ rtp_pipeline_destroy (rtp_pipeline * p) + static void + rtp_pipeline_run (rtp_pipeline * p) + { ++ GstFlowReturn flow_ret; + GMainLoop *mainloop = NULL; +- + GstBus *bus; +- +- gint i; ++ gint i, j; + + /* Check parameters. */ + if (p == NULL) { +@@ -286,22 +251,28 @@ rtp_pipeline_run (rtp_pipeline * p) + /* Set pipeline to PLAYING. */ + gst_element_set_state (p->pipeline, GST_STATE_PLAYING); + +- /* TODO: Writing may need some changes... */ +- ++ /* Push data into the pipeline */ + for (i = 0; i < LOOP_COUNT; i++) { +- const char *frame_data_pointer = p->frame_data; +- int res; +- int frame_count = p->frame_count; +- +- /* Write in to the pipe. */ +- while (frame_count > 0) { +- res = write (p->fd[1], frame_data_pointer, p->frame_data_size); +- fail_unless_equals_int (res, p->frame_data_size); +- frame_data_pointer += p->frame_data_size; +- frame_count--; ++ const guint8 *data = p->frame_data; ++ ++ for (j = 0; j < p->frame_count; j++) { ++ GstBuffer *buf; ++ ++ buf = gst_buffer_new (); ++ GST_BUFFER_DATA (buf) = (guint8 *) data; ++ GST_BUFFER_SIZE (buf) = p->frame_data_size; ++ GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_READONLY); ++ ++ g_signal_emit_by_name (p->appsrc, "push-buffer", buf, &flow_ret); ++ fail_unless_equals_int (flow_ret, GST_FLOW_OK); ++ data += p->frame_data_size; ++ ++ gst_buffer_unref (buf); + } + } + ++ g_signal_emit_by_name (p->appsrc, "end-of-stream", &flow_ret); ++ + /* Run mainloop. */ + g_main_loop_run (mainloop); + +@@ -350,8 +321,8 @@ rtp_pipeline_enable_lists (rtp_pipeline * p, guint mtu_size) + * @use_lists enable buffer lists + */ + static void +-rtp_pipeline_test (const char *frame_data, int frame_data_size, int frame_count, +- const char *filtercaps, const char *pay, const char *depay, ++rtp_pipeline_test (const guint8 * frame_data, int frame_data_size, ++ int frame_count, const char *filtercaps, const char *pay, const char *depay, + guint bytes_sent, guint mtu_size, gboolean use_lists) + { + /* Create RTP pipeline. */ +@@ -380,7 +351,7 @@ rtp_pipeline_test (const char *frame_data, int frame_data_size, int frame_count, + } + } + +-static char rtp_ilbc_frame_data[] = ++static const guint8 rtp_ilbc_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -397,7 +368,7 @@ GST_START_TEST (rtp_ilbc) + } + + GST_END_TEST; +-static char rtp_gsm_frame_data[] = ++static const guint8 rtp_gsm_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -414,7 +385,7 @@ GST_START_TEST (rtp_gsm) + } + + GST_END_TEST; +-static char rtp_amr_frame_data[] = ++static const guint8 rtp_amr_frame_data[] = + { 0x3c, 0x24, 0x03, 0xb3, 0x48, 0x10, 0x68, 0x46, 0x6c, 0xec, 0x03, + 0x7a, 0x37, 0x16, 0x41, 0x41, 0xc0, 0x00, 0x0d, 0xcd, 0x12, 0xed, + 0xad, 0x80, 0x00, 0x00, 0x11, 0x31, 0x00, 0x00, 0x0d, 0xa0 +@@ -432,7 +403,7 @@ GST_START_TEST (rtp_amr) + } + + GST_END_TEST; +-static char rtp_pcma_frame_data[] = ++static const guint8 rtp_pcma_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -449,7 +420,7 @@ GST_START_TEST (rtp_pcma) + } + + GST_END_TEST; +-static char rtp_pcmu_frame_data[] = ++static const guint8 rtp_pcmu_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -466,7 +437,7 @@ GST_START_TEST (rtp_pcmu) + } + + GST_END_TEST; +-static char rtp_mpa_frame_data[] = ++static const guint8 rtp_mpa_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -483,7 +454,7 @@ GST_START_TEST (rtp_mpa) + } + + GST_END_TEST; +-static char rtp_h263_frame_data[] = ++static const guint8 rtp_h263_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -495,12 +466,12 @@ static int rtp_h263_frame_count = 1; + GST_START_TEST (rtp_h263) + { + rtp_pipeline_test (rtp_h263_frame_data, rtp_h263_frame_data_size, +- rtp_h263_frame_count, "video/x-h263,variant=itu,h263version=h263", ++ rtp_h263_frame_count, "video/x-h263,variant=(string)itu,h263version=h263", + "rtph263pay", "rtph263depay", 0, 0, FALSE); + } + + GST_END_TEST; +-static char rtp_h263p_frame_data[] = ++static const guint8 rtp_h263p_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -512,12 +483,12 @@ static int rtp_h263p_frame_count = 1; + GST_START_TEST (rtp_h263p) + { + rtp_pipeline_test (rtp_h263p_frame_data, rtp_h263p_frame_data_size, +- rtp_h263p_frame_count, "video/x-h263,variant=itu", "rtph263ppay", ++ rtp_h263p_frame_count, "video/x-h263,variant=(string)itu", "rtph263ppay", + "rtph263pdepay", 0, 0, FALSE); + } + + GST_END_TEST; +-static char rtp_h264_frame_data[] = ++static const guint8 rtp_h264_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -528,13 +499,14 @@ static int rtp_h264_frame_count = 1; + + GST_START_TEST (rtp_h264) + { ++ /* FIXME 0.11: fully specify h264 caps (and make payloader check) */ + rtp_pipeline_test (rtp_h264_frame_data, rtp_h264_frame_data_size, + rtp_h264_frame_count, "video/x-h264", "rtph264pay", "rtph264depay", + 0, 0, FALSE); + } + + GST_END_TEST; +-static char rtp_h264_list_lt_mtu_frame_data[] = ++static const guint8 rtp_h264_list_lt_mtu_frame_data[] = + /* not packetized, next NAL starts with 0001 */ + { 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, +@@ -552,6 +524,7 @@ static int rtp_h264_list_lt_mtu_mtu_size = 1024; + + GST_START_TEST (rtp_h264_list_lt_mtu) + { ++ /* FIXME 0.11: fully specify h264 caps (and make payloader check) */ + rtp_pipeline_test (rtp_h264_list_lt_mtu_frame_data, + rtp_h264_list_lt_mtu_frame_data_size, rtp_h264_list_lt_mtu_frame_count, + "video/x-h264", "rtph264pay", "rtph264depay", +@@ -559,7 +532,7 @@ GST_START_TEST (rtp_h264_list_lt_mtu) + } + + GST_END_TEST; +-static char rtp_h264_list_gt_mtu_frame_data[] = ++static const guint8 rtp_h264_list_gt_mtu_frame_data[] = + /* not packetized, next NAL starts with 0001 */ + { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +@@ -580,6 +553,7 @@ static int rtp_h264_list_gt_mtu_mty_size = 28; + + GST_START_TEST (rtp_h264_list_gt_mtu) + { ++ /* FIXME 0.11: fully specify h264 caps (and make payloader check) */ + rtp_pipeline_test (rtp_h264_list_gt_mtu_frame_data, + rtp_h264_list_gt_mtu_frame_data_size, rtp_h264_list_gt_mtu_frame_count, + "video/x-h264", "rtph264pay", "rtph264depay", +@@ -587,7 +561,7 @@ GST_START_TEST (rtp_h264_list_gt_mtu) + } + + GST_END_TEST; +-static char rtp_L16_frame_data[] = ++static const guint8 rtp_L16_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -605,7 +579,7 @@ GST_START_TEST (rtp_L16) + } + + GST_END_TEST; +-static char rtp_mp2t_frame_data[] = ++static const guint8 rtp_mp2t_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -622,7 +596,7 @@ GST_START_TEST (rtp_mp2t) + } + + GST_END_TEST; +-static char rtp_mp4v_frame_data[] = ++static const guint8 rtp_mp4v_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -639,7 +613,7 @@ GST_START_TEST (rtp_mp4v) + } + + GST_END_TEST; +-static char rtp_mp4v_list_frame_data[] = ++static const guint8 rtp_mp4v_list_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -659,7 +633,7 @@ GST_START_TEST (rtp_mp4v_list) + } + + GST_END_TEST; +-static char rtp_mp4g_frame_data[] = ++static const guint8 rtp_mp4g_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -677,7 +651,7 @@ GST_START_TEST (rtp_mp4g) + } + + GST_END_TEST; +-static char rtp_theora_frame_data[] = ++static const guint8 rtp_theora_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -694,7 +668,7 @@ GST_START_TEST (rtp_theora) + } + + GST_END_TEST; +-static char rtp_vorbis_frame_data[] = ++static const guint8 rtp_vorbis_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -711,7 +685,7 @@ GST_START_TEST (rtp_vorbis) + } + + GST_END_TEST; +-static char rtp_jpeg_frame_data[] = ++static const guint8 rtp_jpeg_frame_data[] = + { /* SOF */ 0xFF, 0xC0, 0x00, 0x11, 0x08, 0x00, 0x08, 0x00, 0x08, + 0x03, 0x00, 0x21, 0x08, 0x01, 0x11, 0x08, 0x02, 0x11, 0x08, + /* DQT */ 0xFF, 0xDB, 0x00, 0x43, 0x08, +@@ -738,7 +712,7 @@ GST_START_TEST (rtp_jpeg) + } + + GST_END_TEST; +-static char rtp_jpeg_list_frame_data[] = ++static const guint8 rtp_jpeg_list_frame_data[] = + { /* SOF */ 0xFF, 0xC0, 0x00, 0x11, 0x08, 0x00, 0x08, 0x00, 0x08, + 0x03, 0x00, 0x21, 0x08, 0x01, 0x11, 0x08, 0x02, 0x11, 0x08, + /* DQT */ 0xFF, 0xDB, 0x00, 0x43, 0x08, +@@ -767,7 +741,7 @@ GST_START_TEST (rtp_jpeg_list) + } + + GST_END_TEST; +-static char rtp_g729_frame_data[] = ++static const guint8 rtp_g729_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +-- +cgit v0.9.0.2-2-gbebe diff --git a/abs/extra/community/gstreamer0.10-python/PKGBUILD b/abs/extra/community/gstreamer0.10-python/PKGBUILD index 2af9448..f16d91f 100644 --- a/abs/extra/community/gstreamer0.10-python/PKGBUILD +++ b/abs/extra/community/gstreamer0.10-python/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 147133 2012-01-22 11:30:42Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10-python pkgver=0.10.22 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for GStreamer 0.10" arch=('i686' 'x86_64') license=('LGPL') url="http://gstreamer.freedesktop.org/" depends=('pygobject>=2.20.0' 'gstreamer0.10-base>=0.10.32') makedepends=('pkgconfig') -options=('!libtool') source=(http://gstreamer.freedesktop.org/src/gst-python/gst-python-${pkgver}.tar.bz2) md5sums=('937152fe896241f827689f4b53e79b22') diff --git a/abs/extra/community/gstreamer0.10/PKGBUILD b/abs/extra/community/gstreamer0.10/PKGBUILD index 07299a4..d856335 100644 --- a/abs/extra/community/gstreamer0.10/PKGBUILD +++ b/abs/extra/community/gstreamer0.10/PKGBUILD @@ -1,36 +1,45 @@ -# $Id: PKGBUILD 153252 2012-03-12 14:53:39Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10 pkgver=0.10.36 -pkgrel=1 +pkgrel=4 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64') license=('LGPL') -url="http://gstreamer.freedesktop.org/" +url="http://gstreamer.com" depends=('libxml2' 'glib2') -optdepends=('sh: feedback script') -makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') -options=('!libtool') -source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -md5sums=('15389c73e091b1dda915279c388b9cb2') +makedepends=('intltool' 'pkgconfig' 'gobject-introspection' 'git') +source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=3ddc31eaa18c3be1613e43430eca78a3e445639e" + tests-remove-silly-test_fail_abstract_new-check.patch + bison3.patch) +sha256sums=('SKIP' + 'd3d3f4f04453831fdb4244bfe174a38c4e6f9f4da5c8c9050dcfa1a6097aad52' + 'ed154e280abf59b24d98a8ab0fe868b449b26aa61f7ae3813fab8ac615fcaefa') +prepare() { + cd gstreamer + patch -Np1 -i ../tests-remove-silly-test_fail_abstract_new-check.patch + patch -Np1 -i ../bison3.patch + sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac +} build() { - cd "${srcdir}/gstreamer-${pkgver}" + cd gstreamer + NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ --with-package-name="GStreamer (Archlinux)" \ --with-package-origin="http://www.archlinux.org/" \ - --enable-gtk-doc --disable-static + --disable-gtk-doc --disable-static make } check() { - cd "${srcdir}/gstreamer-${pkgver}" + cd gstreamer make check } package() { - cd "${srcdir}/gstreamer-${pkgver}" + cd gstreamer make DESTDIR="${pkgdir}" install #Remove unversioned gst-* binaries to get rid of conflicts diff --git a/abs/extra/community/gstreamer0.10/bison3.patch b/abs/extra/community/gstreamer0.10/bison3.patch new file mode 100644 index 0000000..4f4f521 --- /dev/null +++ b/abs/extra/community/gstreamer0.10/bison3.patch @@ -0,0 +1,31 @@ +From bd2a01cfe222367493a71f3269f12250c8972db0 Mon Sep 17 00:00:00 2001 +From: Kerrick Staley <kerrick@kerrickstaley.com> +Date: Wed, 21 Aug 2013 06:59:29 +0000 +Subject: parse: make grammar.y work with Bison 3 + +YYLEX_PARAM is no longer supported in Bison 3. + +https://bugzilla.gnome.org/show_bug.cgi?id=706462 +--- +diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y +index 8a9019c..f533389 100644 +--- a/gst/parse/grammar.y ++++ b/gst/parse/grammar.y +@@ -26,7 +26,6 @@ + */ + + #define YYERROR_VERBOSE 1 +-#define YYLEX_PARAM scanner + + #define YYENABLE_NLS 0 + +@@ -659,6 +658,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s); + %right '.' + %left '!' '=' + ++%lex-param { void *scanner } + %parse-param { void *scanner } + %parse-param { graph_t *graph } + %pure-parser +-- +cgit v0.9.0.2-2-gbebe diff --git a/abs/extra/community/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch b/abs/extra/community/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch new file mode 100644 index 0000000..7524e8f --- /dev/null +++ b/abs/extra/community/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch @@ -0,0 +1,60 @@ +From 5bff3ba949d2ac0a9946c1240e6d4a5bb53fda99 Mon Sep 17 00:00:00 2001 +From: Tim-Philipp Müller <tim.muller@collabora.co.uk> +Date: Wed, 08 Aug 2012 13:49:23 +0000 +Subject: tests: remove silly test_fail_abstract_new check + +Our check would make sure that GLib segfaults when +someone tries to instantiate an abstract type, which +is an extremely useful thing to check for. + +In newer GLibs this is fixed and we get an abort with +a g_error() now it seems, so let's just remove this +check entirely. +--- +(limited to 'tests/check/gst/gstobject.c') + +diff --git a/tests/check/gst/gstobject.c b/tests/check/gst/gstobject.c +index 6f7ccb8..ce2ed3e 100644 +--- a/tests/check/gst/gstobject.c ++++ b/tests/check/gst/gstobject.c +@@ -72,19 +72,6 @@ gst_fake_object_get_type (void) + return fake_object_type; + } + +-#ifndef HAVE_OSX +-/* g_object_new on abstract GstObject should fail */ +-GST_START_TEST (test_fail_abstract_new) +-{ +- GstObject *object; +- +- ASSERT_CRITICAL (object = g_object_new (gst_object_get_type (), NULL)); +- fail_unless (object == NULL, "Created an instance of abstract GstObject"); +-} +- +-GST_END_TEST; +-#endif +- + /* g_object_new on GstFakeObject should succeed */ + GST_START_TEST (test_fake_object_new) + { +@@ -529,18 +516,6 @@ gst_object_suite (void) + tcase_add_test (tc_chain, test_fake_object_has_ancestor); + //tcase_add_checked_fixture (tc_chain, setup, teardown); + +- /* FIXME: GLib shouldn't crash here, but issue a warning and return a NULL +- * object, or at least g_error() and then abort properly ... (tpm) */ +-#ifndef HAVE_OSX +- /* Disabled for OS/X because a) it's a pretty silly test anyway and +- * b) different OS/X versions raise different signals and it isn't worth +- * the effort to try and detect which one should be producing which +- */ +- /* SEGV tests go last so we can debug the others */ +- if (g_getenv ("CK_FORK") == NULL || strcmp (g_getenv ("CK_FORK"), "no") != 0) +- tcase_add_test_raise_signal (tc_chain, test_fail_abstract_new, SIGSEGV); +-#endif +- + return s; + } + +-- +cgit v0.9.0.2-2-gbebe diff --git a/abs/extra/cpio/PKGBUILD b/abs/extra/cpio/PKGBUILD new file mode 100644 index 0000000..c9e2054 --- /dev/null +++ b/abs/extra/cpio/PKGBUILD @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: judd <jvinet@zeroflux.org> +pkgname=cpio +pkgver=2.11 +pkgrel=5 +pkgdesc="A tool to copy files into or out of a cpio or tar archive" +arch=(i686 x86_64) +license=('GPL') +url="http://www.gnu.org/software/cpio" +depends=('glibc') +source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz + cpio-2.11-stdio.in.patch + cpio-2.11-CVE-2014-9112.patch + cpio-2.11-testsuite-CVE-2014-9112.patch) +install=cpio.install +md5sums=('1112bb6c45863468b5496ba128792f6c' + 'd7e58f2a1ec286febd09ea75042cf96e' + '2541e37b85cb7baffc3a3f687453737c' + '348870bebae57146eafeb189adbd43a4') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/cpio-2.11-stdio.in.patch + # from fedora git + patch -Np1 -i ${srcdir}/cpio-2.11-CVE-2014-9112.patch + patch -Np1 -i ${srcdir}/cpio-2.11-testsuite-CVE-2014-9112.patch +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + rm -f ${pkgdir}/usr/bin/mt ${pkgdir}/pkg/usr/share/man/man1/mt.1 + rm -rf ${pkgdir}/usr/libexec + # remove mt manpage it conflicts with mt-st from extra + rm $pkgdir/usr/share/man/man1/mt.1 || return 1 + # remove infodir + rm $pkgdir/usr/share/info/dir +} diff --git a/abs/extra/cpio/cpio-2.11-CVE-2014-9112.patch b/abs/extra/cpio/cpio-2.11-CVE-2014-9112.patch new file mode 100644 index 0000000..64fec9f --- /dev/null +++ b/abs/extra/cpio/cpio-2.11-CVE-2014-9112.patch @@ -0,0 +1,212 @@ +diff --git a/src/copyin.c b/src/copyin.c +index d505407..db8ee66 100644 +--- a/src/copyin.c ++++ b/src/copyin.c +@@ -124,10 +124,30 @@ tape_skip_padding (int in_file_des, off_t offset) + if (pad != 0) + tape_toss_input (in_file_des, pad); + } +- ++ ++static char * ++get_link_name (struct cpio_file_stat *file_hdr, int in_file_des) ++{ ++ char *link_name; ++ ++ if (file_hdr->c_filesize < 0 || file_hdr->c_filesize > SIZE_MAX-1) ++ { ++ error (0, 0, _("%s: stored filename length is out of range"), ++ file_hdr->c_name); ++ link_name = NULL; ++ } ++ else ++ { ++ link_name = xmalloc (file_hdr->c_filesize + 1); ++ tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize); ++ link_name[file_hdr->c_filesize] = '\0'; ++ tape_skip_padding (in_file_des, file_hdr->c_filesize); ++ } ++ return link_name; ++} + + static void +-list_file(struct cpio_file_stat* file_hdr, int in_file_des) ++list_file (struct cpio_file_stat* file_hdr, int in_file_des) + { + if (verbose_flag) + { +@@ -136,21 +156,16 @@ list_file(struct cpio_file_stat* file_hdr, int in_file_des) + { + if (archive_format != arf_tar && archive_format != arf_ustar) + { +- char *link_name = NULL; /* Name of hard and symbolic links. */ +- +- link_name = (char *) xmalloc ((unsigned int) file_hdr->c_filesize + 1); +- link_name[file_hdr->c_filesize] = '\0'; +- tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize); +- long_format (file_hdr, link_name); +- free (link_name); +- tape_skip_padding (in_file_des, file_hdr->c_filesize); +- return; ++ char *link_name = get_link_name (file_hdr, in_file_des); ++ if (link_name) ++ { ++ long_format (file_hdr, link_name); ++ free (link_name); ++ } + } + else +- { +- long_format (file_hdr, file_hdr->c_tar_linkname); +- return; +- } ++ long_format (file_hdr, file_hdr->c_tar_linkname); ++ return; + } + else + #endif +@@ -650,10 +665,7 @@ copyin_link(struct cpio_file_stat *file_hdr, int in_file_des) + + if (archive_format != arf_tar && archive_format != arf_ustar) + { +- link_name = (char *) xmalloc ((unsigned int) file_hdr->c_filesize + 1); +- link_name[file_hdr->c_filesize] = '\0'; +- tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize); +- tape_skip_padding (in_file_des, file_hdr->c_filesize); ++ link_name = get_link_name (file_hdr, in_file_des); + } + else + { +diff --git a/tests/Makefile.am b/tests/Makefile.am +index b3e8e60..cf186da 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -52,6 +52,8 @@ TESTSUITE_AT = \ + setstat04.at\ + setstat05.at\ + symlink.at\ ++ symlink-bad-length.at\ ++ symlink-long.at\ + version.at + + TESTSUITE = $(srcdir)/testsuite +diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at +new file mode 100644 +index 0000000..cbf4aa7 +--- /dev/null ++++ b/tests/symlink-bad-length.at +@@ -0,0 +1,49 @@ ++# Process this file with autom4te to create testsuite. -*- Autotest -*- ++# Copyright (C) 2014 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301 USA. ++ ++# Cpio v2.11 did segfault with badly set symlink length. ++# References: ++# http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg00007.html ++ ++AT_SETUP([symlink-bad-length]) ++AT_KEYWORDS([symlink-long copyout]) ++ ++AT_DATA([ARCHIVE.base64], ++[x3EjAIBAtIEtJy8nAQAAAHRUYW0FAAAADQBGSUxFAABzb21lIGNvbnRlbnQKAMdxIwBgQ/+hLScv ++JwEAAAB0VEhuBQD/////TElOSwAARklMRcdxAAAAAAAAAAAAAAEAAAAAAAAACwAAAAAAVFJBSUxF ++UiEhIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= ++]) ++ ++AT_CHECK([ ++base64 -d ARCHIVE.base64 > ARCHIVE || AT_SKIP_TEST ++cpio -ntv < ARCHIVE ++test $? -eq 2 ++], ++[0], ++[-rw-rw-r-- 1 10029 10031 13 Nov 25 13:52 FILE ++],[cpio: LINK: stored filename length is out of range ++cpio: premature end of file ++]) ++ ++AT_CLEANUP +diff --git a/tests/symlink-long.at b/tests/symlink-long.at +new file mode 100644 +index 0000000..d3def2d +--- /dev/null ++++ b/tests/symlink-long.at +@@ -0,0 +1,46 @@ ++# Process this file with autom4te to create testsuite. -*- Autotest -*- ++# Copyright (C) 2014 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301 USA. ++ ++# Cpio v2.11.90 changed the way symlink name is read from archive. ++# References: ++# http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg00007.html ++ ++AT_SETUP([symlink-long]) ++AT_KEYWORDS([symlink-long copyout]) ++ ++AT_CHECK([ ++ ++# len(dirname) > READBUFSIZE ++dirname= ++for i in {1..52}; do ++ dirname="xxxxxxxxx/$dirname" ++ mkdir "$dirname" ++done ++ln -s "$dirname" x || AT_SKIP_TEST ++ ++echo x | cpio -o > ar ++list=`cpio -tv < ar | sed 's|.*-> ||'` ++test "$list" = "$dirname" && echo success || echo fail ++], ++[0], ++[success ++],[2 blocks ++2 blocks ++]) ++ ++AT_CLEANUP +diff --git a/tests/testsuite.at b/tests/testsuite.at +index 8f3330b..590bdcb 100644 +--- a/tests/testsuite.at ++++ b/tests/testsuite.at +@@ -31,6 +31,8 @@ m4_include([version.at]) + + m4_include([inout.at]) + m4_include([symlink.at]) ++m4_include([symlink-bad-length.at]) ++m4_include([symlink-long.at]) + m4_include([interdir.at]) + + m4_include([setstat01.at]) diff --git a/abs/extra/cpio/cpio-2.11-stdio.in.patch b/abs/extra/cpio/cpio-2.11-stdio.in.patch new file mode 100644 index 0000000..f7016ba --- /dev/null +++ b/abs/extra/cpio/cpio-2.11-stdio.in.patch @@ -0,0 +1,13 @@ +diff -urNp cpio-2.11-orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h +--- cpio-2.11-orig/gnu/stdio.in.h 2010-03-10 10:27:03.000000000 +0100 ++++ cpio-2.11/gnu/stdio.in.h 2012-06-04 10:23:23.804471185 +0200 +@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets ++#if HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++#endif + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/abs/extra/cpio/cpio-2.11-testsuite-CVE-2014-9112.patch b/abs/extra/cpio/cpio-2.11-testsuite-CVE-2014-9112.patch new file mode 100644 index 0000000..b1b268a --- /dev/null +++ b/abs/extra/cpio/cpio-2.11-testsuite-CVE-2014-9112.patch @@ -0,0 +1,30 @@ +diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at +index cbf4aa7..d8d250b 100644 +--- a/tests/symlink-bad-length.at ++++ b/tests/symlink-bad-length.at +@@ -37,13 +37,20 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + + AT_CHECK([ + base64 -d ARCHIVE.base64 > ARCHIVE || AT_SKIP_TEST +-cpio -ntv < ARCHIVE +-test $? -eq 2 ++TZ=UTC cpio -ntv < ARCHIVE 2>stderr ++rc=$? ++cat stderr | grep -v \ ++ -e 'stored filename length is out of range' \ ++ -e 'premature end of file' \ ++ -e 'archive header has reverse byte-order' \ ++ -e 'memory exhausted' \ ++ >&2 ++echo >&2 STDERR ++test "$rc" -ne 0 + ], + [0], +-[-rw-rw-r-- 1 10029 10031 13 Nov 25 13:52 FILE +-],[cpio: LINK: stored filename length is out of range +-cpio: premature end of file ++[-rw-rw-r-- 1 10029 10031 13 Nov 25 11:52 FILE ++],[STDERR + ]) + + AT_CLEANUP diff --git a/abs/extra/cpio/cpio.install b/abs/extra/cpio/cpio.install new file mode 100644 index 0000000..e5502ca --- /dev/null +++ b/abs/extra/cpio/cpio.install @@ -0,0 +1,21 @@ +infodir=/usr/share/info +filelist=(cpio.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + diff --git a/abs/extra/cscope/PKGBUILD b/abs/extra/cscope/PKGBUILD new file mode 100644 index 0000000..f79705a --- /dev/null +++ b/abs/extra/cscope/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Dan McGee <dan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=cscope +pkgver=15.8.a +_realver=15.8a +pkgrel=2 +pkgdesc="A developers tool for browsing program code" +arch=('i686' 'x86_64') +url="http://cscope.sourceforge.net/" +license=('BSD') +depends=('ncurses' 'sh') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_realver}.tar.gz) +md5sums=('b5c898ccedcfe2d4aa69537dad73b610') + +build() { + cd "${srcdir}/${pkgname}-${_realver}" + sed -i 's|/usr/local/lib/cs|/usr/lib/cs|' contrib/ocs + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${_realver}" + make DESTDIR="${pkgdir}" install + + install -d ${pkgdir}/usr/lib/cs + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + + cd contrib/xcscope + install -Dm644 xcscope.el "${pkgdir}"/usr/share/emacs/site-lisp/xcscope.el + install -m755 cscope-indexer "${pkgdir}"/usr/bin +} diff --git a/abs/extra/dolphin-emu/Dolphin_Logo.png b/abs/extra/dolphin-emu/Dolphin_Logo.png Binary files differdeleted file mode 100644 index 63450da..0000000 --- a/abs/extra/dolphin-emu/Dolphin_Logo.png +++ /dev/null diff --git a/abs/extra/dolphin-emu/PKGBUILD b/abs/extra/dolphin-emu/PKGBUILD index 04547f2..040eb48 100644 --- a/abs/extra/dolphin-emu/PKGBUILD +++ b/abs/extra/dolphin-emu/PKGBUILD @@ -1,91 +1,62 @@ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Jeremy Newton (Mystro256) -# Special thanks to the contributors of dolphin-emu-svn: for the icon, desktop file and some lines from the PKGBUILD -# Thanks to all that contributed! :) pkgname=dolphin-emu -pkgver=3.0 -pkgrel=12 +pkgver=4.0.2 +pkgrel=6 epoch=1 -pkgdesc="A GameCube and Wii emulator (stable git branch)" +pkgdesc='A Gamecube / Wii / Triforce emulator' arch=('i686' 'x86_64') -url="http://www.dolphin-emulator.com/" +url='http://dolphin-emu.org' license=('GPL2') -makedepends=('git' 'cmake' 'glproto' 'opencl-headers') -depends=('sdl' 'libxxf86vm' 'libao' 'wxgtk' 'wiiuse' 'nvidia-cg-toolkit' \ - 'glew' 'mesa' 'libgl' 'openal' 'lzo2') - #'glew' 'mesa' 'libgl' 'openal' 'portaudio' 'lzo2') +makedepends=('cmake' 'git' 'opencl-headers') +depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'libusbx' 'miniupnpc' 'openal' 'sdl2' 'soundtouch' 'wxgtk') +#optdepends=('pulseaudio: PulseAudio backend') -# Cannot be BUILT with sfml later than 1.6 -# IF YOU NEED SFML>=1.7 FOR SOMETHING ELSE, TRY REMOVING THE CONFLICT -# BELOW AND ONLY TEMPORARY UNINSTALLING SFML TO BUILD/INSTALL DOLPHIN -conflicts=('dolphin-emu-git' 'sfml>=1.7' 'sfml-git') +options=('!emptydirs') install="${pkgname}.install" -source=('dolphin-emu.desktop' - 'unistd.diff' - 'Dolphin_Logo.png' - 'dolphin-emu.xml' - 'dolphin-emu_games.xml' - 'dolphin-emu_scan.sh' - 'gen_lib_dolphin-emu.conf') +source=("${pkgname%-*}::git+https://code.google.com/p/dolphin-emu/#tag=${pkgver}" + 'dolphin-emu-gcc49.patch' + 'dolphin-emu.xml' + 'dolphin-emu_games.xml' + 'dolphin-emu_scan.sh' + 'gen_lib_dolphin-emu.conf') -_gitroot=https://code.google.com/p/dolphin-emu/ -_gitname=dolphin-emu-3.0 +prepare() { + cd "${srcdir}/${pkgname%-*}" + + patch -Np1 -i ../dolphin-emu-gcc49.patch +} build() { - cd "$srcdir" - msg "Connecting to GIT server...." + cd "${srcdir}/${pkgname%-*}" - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin 3.0 - msg "The local files are updated." + mkdir build && cd build + if [[ $CARCH == x86_64 ]]; then + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_CXX_FLAGS='-fno-inline-functions' else - git clone "$_gitroot" "$_gitname" + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - -# msg "Checking out at stable 3.0 branch" -# git checkout 3.0 - - msg "GIT checkout done or server timeout" - - patch -Np2 < ${srcdir}/unistd.diff - - mkdir build && cd build - export CXXFLAGS="$CXXFLAGS -fpermissive" - cmake .. -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}/dolphin-emu-3.0-build/build" - - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname%-*}/build" + #LinHES Stuff mkdir -p "${pkgdir}"/usr/share/mythtv/themes/defaultmenu mkdir -p "${pkgdir}"/usr/LH/bin - - install -Dm644 "${srcdir}/dolphin-emu.desktop" "${pkgdir}/usr/share/applications/dolphin-emu.desktop" - install -Dm644 "${srcdir}/Dolphin_Logo.png" "${pkgdir}/usr/share/pixmaps/dolphin-emu.png" cp "${srcdir}/dolphin-emu.xml" "${pkgdir}/usr/share/mythtv/themes/defaultmenu" cp "${srcdir}/dolphin-emu_games.xml" "${pkgdir}/usr/share/mythtv/themes/defaultmenu" install -m755 "${srcdir}/dolphin-emu_scan.sh" "${pkgdir}/usr/LH/bin" #add in file for gen_game.xml install -D -m0744 ${srcdir}/gen_lib_dolphin-emu.conf ${pkgdir}/etc/gen_game_xml.d/dolphin-emu.conf -} - -# vim:set ts=2 sw=2 et: -md5sums=('feed4580c2e6bfbc7f6c67dad861daae' - 'a463b96d02462b5f6b0894f6ced821ab' - 'd15c51f547b4bd47e510faac40bcc9d6' + make DESTDIR="${pkgdir}" install +} +md5sums=('SKIP' + '5fead49fc3a0ff9a9d1435368b5df1f9' 'ab7a9b9cfe03db65c881134c0f02bda0' '1d03499e0abab56285bc97176d311bf1' 'af44dd20626ce26d0a07dadc37c20233' diff --git a/abs/extra/dolphin-emu/__changelog b/abs/extra/dolphin-emu/__changelog index 113934d..3d186d7 100644 --- a/abs/extra/dolphin-emu/__changelog +++ b/abs/extra/dolphin-emu/__changelog @@ -1,5 +1,5 @@ -6/9/12 -chw- -Added install file, and mythtv menu files. -removed portaudio because it drug in jack - +PKGBUILD: remove portaudio dep +PKGBUILD: remove pulseaudio opt dep +PKGBUILD: add .install file +PKGBUILD: Add LinHES Stuff --converted .install file to use gen_game_xml.py diff --git a/abs/extra/dolphin-emu/dolphin-emu-gcc49.patch b/abs/extra/dolphin-emu/dolphin-emu-gcc49.patch new file mode 100755 index 0000000..7431ce6 --- /dev/null +++ b/abs/extra/dolphin-emu/dolphin-emu-gcc49.patch @@ -0,0 +1,17 @@ +diff -rupN dolphin.orig/Source/Core/Common/Src/CommonFuncs.h dolphin/Source/Core/Common/Src/CommonFuncs.h +--- dolphin.orig/Source/Core/Common/Src/CommonFuncs.h 2014-08-19 02:36:05.555642000 +0200 ++++ dolphin/Source/Core/Common/Src/CommonFuncs.h 2014-08-19 02:38:44.301036700 +0200 +@@ -30,7 +30,12 @@ struct ArraySizeImpl : public std::exten + #define b32(x) (b16(x) | (b16(x) >>16) ) + #define ROUND_UP_POW2(x) (b32(x - 1) + 1) + +-#if defined __GNUC__ && !defined __SSSE3__ && !defined _M_GENERIC ++#ifndef __GNUC_PREREQ ++ #define __GNUC_PREREQ(a, b) 0 ++#endif ++ ++#if (defined __GNUC__ && !__GNUC_PREREQ(4,9)) && \ ++ !defined __SSSE3__ && defined _M_X86 + #include <emmintrin.h> + static __inline __m128i __attribute__((__always_inline__)) + _mm_shuffle_epi8(__m128i a, __m128i mask) diff --git a/abs/extra/dolphin-emu/dolphin-emu.desktop b/abs/extra/dolphin-emu/dolphin-emu.desktop deleted file mode 100644 index 96317d1..0000000 --- a/abs/extra/dolphin-emu/dolphin-emu.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Dolphin -Categories=Game;Emulator;GTK; -GenericName=GameCube and Wii Emulator -Comment=An emulator for the GameCube and Wii consoles -Exec=dolphin-emu -Icon=dolphin-emu -StartupNotify=false -Name[en_US]=Dolphin diff --git a/abs/extra/dolphin-emu/dolphin_emu.confcd b/abs/extra/dolphin-emu/dolphin_emu.confcd deleted file mode 100644 index e69de29..0000000 --- a/abs/extra/dolphin-emu/dolphin_emu.confcd +++ /dev/null diff --git a/abs/extra/dolphin-emu/unistd.diff b/abs/extra/dolphin-emu/unistd.diff deleted file mode 100644 index 2b39063..0000000 --- a/abs/extra/dolphin-emu/unistd.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dolphin-emu-3.0/Source/Core/Common/Src/CommonFuncs.h 2012-04-07 10:47:47.595151504 +0200 -+++ src/dolphin-emu-3.0-build/Source/Core/Common/Src/CommonFuncs.h 2012-04-07 10:53:25.371113081 +0200 -@@ -18,6 +18,8 @@ - #ifndef _COMMONFUNCS_H_ - #define _COMMONFUNCS_H_ - -+#include <unistd.h> -+ - #ifdef _WIN32 - #define SLEEP(x) Sleep(x) - #else diff --git a/abs/extra/eclipse-ecj/01-ecj-include-props.patch b/abs/extra/eclipse-ecj/01-ecj-include-props.patch new file mode 100644 index 0000000..3276626 --- /dev/null +++ b/abs/extra/eclipse-ecj/01-ecj-include-props.patch @@ -0,0 +1,15 @@ +--- build.xml 2012-09-14 18:22:48.000000000 +0000 ++++ build.xml.patched 2013-01-09 10:19:28.414079935 +0000 +@@ -46,9 +46,10 @@ + <include name="**/*.rsc"/> + <include name="META-INF/**"/> + <include name="**/*.properties"/> ++ <include name="**/*.props"/> + <exclude name="META-INF/eclipse.inf"/> + </fileset> + </zip> + <delete dir="${output}" /> + </target> +-</project> +\ No newline at end of file ++</project> diff --git a/abs/extra/eclipse-ecj/02-buildxml-fix-manifest.patch b/abs/extra/eclipse-ecj/02-buildxml-fix-manifest.patch new file mode 100644 index 0000000..ba9cd0a --- /dev/null +++ b/abs/extra/eclipse-ecj/02-buildxml-fix-manifest.patch @@ -0,0 +1,11 @@ +--- build.xml.orig 2013-10-03 13:55:28.579003290 +0000 ++++ build.xml 2013-10-03 13:57:52.971400439 +0000 +@@ -39,8 +39,6 @@ + <compilerarg line="-Xlint:none"/> + </javac> + +- <delete file="${basedir}/META-INF/MANIFEST.MF" failonerror="false"/> +- <copy tofile="${basedir}/META-INF/MANIFEST.MF" file="${basedir}/scripts/binary/META-INF/MANIFEST.MF"/> + <zip destfile="${basedir}/${jar_file}"> + <fileset dir="${output}" /> + <fileset dir="${basedir}"> diff --git a/abs/extra/eclipse-ecj/PKGBUILD b/abs/extra/eclipse-ecj/PKGBUILD new file mode 100644 index 0000000..1d8f473 --- /dev/null +++ b/abs/extra/eclipse-ecj/PKGBUILD @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> + +pkgname=eclipse-ecj +pkgver=4.4 +pkgrel=1 +_date=201406061215 +pkgdesc='Eclipse java bytecode compiler' +arch=('any') +license=('EPL') +url='http://www.eclipse.org/' +depends=('java-runtime') +makedepends=('apache-ant' 'java-environment') +source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/ecjsrc-${pkgver}.jar + 01-ecj-include-props.patch + 02-buildxml-fix-manifest.patch + ecj) +sha256sums=('429a65013ae9740e4f05451f8e2968b389ec04ef2c7178ccfa5ef6714488fd12' + '8f6259c76dfe493549bbaec3c8a7ba29e82c70e127c918adca28737dcb570f6b' + '5ca6bd94c2b1cb4c6f116d38c160edf1c4ca520647ac74b26486f958254767af' + '63aff3d126243d303ddc4305cfa77827df72e87ccf85bd8a22a2f832357e396c') + +build() { + cd "${srcdir}" + for p in 01-ecj-include-props 02-buildxml-fix-manifest; do + patch -p0 < ${p}.patch + done + export LANG=en_US.UTF-8 + ant build +} + +package() { + install -Dm644 "${srcdir}/ecj.jar" "${pkgdir}/usr/share/java/eclipse-ecj-${pkgver}.jar" + ln -s eclipse-ecj-${pkgver}.jar "${pkgdir}/usr/share/java/ecj.jar" + ln -s eclipse-ecj-${pkgver}.jar "${pkgdir}/usr/share/java/eclipse-ecj.jar" + install -Dm755 ecj "${pkgdir}/usr/bin/ecj" + install -D -m 644 ecj.1 "${pkgdir}/usr/share/man/man1/ecj.1" +} diff --git a/abs/extra/eclipse-ecj/ecj b/abs/extra/eclipse-ecj/ecj new file mode 100644 index 0000000..6d3557a --- /dev/null +++ b/abs/extra/eclipse-ecj/ecj @@ -0,0 +1,4 @@ +#!/bin/sh + +CLASSPATH=/usr/share/java/ecj.jar${CLASSPATH:+:}$CLASSPATH \ +java org.eclipse.jdt.internal.compiler.batch.Main "$@" diff --git a/abs/extra/enchant/PKGBUILD b/abs/extra/enchant/PKGBUILD index a8dc20d..837363a 100644 --- a/abs/extra/enchant/PKGBUILD +++ b/abs/extra/enchant/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 139539 2011-10-03 12:17:06Z jgc $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id$ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=enchant pkgver=1.6.0 -pkgrel=4 +pkgrel=5 pkgdesc="A wrapper library for generic spell checking" arch=('i686' 'x86_64') url="http://www.abisource.com/enchant/" license=('LGPL') depends=('aspell' 'dbus-glib' 'hunspell' 'hspell') -options=('!libtool') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") md5sums=('de11011aff801dc61042828041fb59c7') diff --git a/abs/extra/fastjar/PKGBUILD b/abs/extra/fastjar/PKGBUILD new file mode 100644 index 0000000..bd66886 --- /dev/null +++ b/abs/extra/fastjar/PKGBUILD @@ -0,0 +1,25 @@ +# $Id$ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=fastjar +pkgver=0.98 +pkgrel=3 +pkgdesc="Sun java jar compatible archiver" +arch=('i686' 'x86_64') +url="http://savannah.nongnu.org/projects/fastjar" +license=('GPL') +depends=('zlib' 'texinfo') +install=fastjar.install +source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('d2d264d343d4d0e1575832cc1023c3bf') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/abs/extra/fastjar/fastjar.install b/abs/extra/fastjar/fastjar.install new file mode 100644 index 0000000..b1b973c --- /dev/null +++ b/abs/extra/fastjar/fastjar.install @@ -0,0 +1,16 @@ +infodir=usr/share/info +file=fastjar.info.gz + +post_install() { + install-info $infodir/$file $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + install-info --delete $infodir/$file $infodir/dir 2> /dev/null +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/fceux/PKGBUILD b/abs/extra/fceux/PKGBUILD index cae2c61..7bcfa95 100644 --- a/abs/extra/fceux/PKGBUILD +++ b/abs/extra/fceux/PKGBUILD @@ -5,12 +5,12 @@ pkgname=fceux pkgver=2.2.2 -pkgrel=2 +pkgrel=3 url='http://www.fceux.com/' pkgdesc='Fast and ultra-compatible NES/Famicom emulator' arch=('x86_64' 'i686') license=('GPL') -depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils' 'lua' 'libgl' 'shared-mime-info') +depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils' 'lua51' 'libgl' 'shared-mime-info') makedepends=('scons' 'mesa-libgl' 'glu') install='fceux.install' source=("https://downloads.sourceforge.net/project/fceultra/Source%20Code/$pkgver%20src/$pkgname-$pkgver.src.tar.gz") diff --git a/abs/extra/fceux/__changelog b/abs/extra/fceux/__changelog deleted file mode 100644 index 6bb6428..0000000 --- a/abs/extra/fceux/__changelog +++ /dev/null @@ -1 +0,0 @@ -- PKGBUILD: change dep lua51 to lua diff --git a/abs/extra/ffmpeg-compat/PKGBUILD b/abs/extra/ffmpeg-compat/PKGBUILD new file mode 100644 index 0000000..2627385 --- /dev/null +++ b/abs/extra/ffmpeg-compat/PKGBUILD @@ -0,0 +1,73 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgname=ffmpeg-compat +pkgver=0.10.15 +pkgrel=1 +epoch=1 +pkgdesc='Complete and free Internet live audio and video broadcasting solution' +arch=('i686' 'x86_64') +url='http://ffmpeg.org/' +license=('GPL') +depends=( + 'alsa-lib' 'bzip2' 'gsm' 'lame' 'libass' + 'libmodplug' 'libtheora' 'libva' 'libvorbis' 'libvpx' + 'opencore-amr' 'openjpeg' 'rtmpdump' 'schroedinger' 'sdl' 'speex' + 'v4l-utils' 'libx264' 'xvidcore' 'zlib' +) +makedepends=('libvdpau' 'yasm' 'x264') +source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2) +sha256sums=('8b6dbf73c192d2217e6ded8e0dd560c678f362e373d87c28ed9fc8eb52293d5d') + +build() { + cd ffmpeg-$pkgver + + CFLAGS+=" -I/usr/include/openjpeg-1.5" \ + ./configure \ + --prefix=/usr \ + --incdir=/usr/include/ffmpeg-compat \ + --libdir=/usr/lib/ffmpeg-compat \ + --shlibdir=/usr/lib/ffmpeg-compat \ + --disable-debug \ + --disable-static \ + --enable-gpl \ + --enable-libass \ + --enable-libfreetype \ + --enable-libgsm \ + --enable-libmodplug \ + --enable-libmp3lame \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libopenjpeg \ + --disable-libpulse \ + --enable-librtmp \ + --enable-libschroedinger \ + --enable-libspeex \ + --enable-libtheora \ + --enable-libv4l2 \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libx264 \ + --enable-libxvid \ + --enable-postproc \ + --enable-runtime-cpudetect \ + --enable-shared \ + --enable-vdpau \ + --enable-version3 \ + --enable-x11grab + + make +} + +package() { + cd ffmpeg-$pkgver + make DESTDIR="$pkgdir" install + rm -rf "$pkgdir"/usr/{bin,share} + + install -dm755 "$pkgdir"/etc/ld.so.conf.d/ + echo -e '/usr/lib/\n/usr/lib/ffmpeg-compat/' > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf +} diff --git a/abs/extra/ffmpeg-compat/__changelog b/abs/extra/ffmpeg-compat/__changelog new file mode 100644 index 0000000..105d5aa --- /dev/null +++ b/abs/extra/ffmpeg-compat/__changelog @@ -0,0 +1 @@ +PKGBUILD - remove libpulse as dep and disable pulse in compile diff --git a/abs/extra/flashplugin/PKGBUILD b/abs/extra/flashplugin/PKGBUILD index a4ef79c..c78fd36 100644 --- a/abs/extra/flashplugin/PKGBUILD +++ b/abs/extra/flashplugin/PKGBUILD @@ -4,7 +4,7 @@ pkgname=flashplugin _licensefile='PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf' -pkgver=11.2.202.356 +pkgver=11.2.202.425 pkgrel=1 pkgdesc='Adobe Flash Player' url='http://get.adobe.com/flashplayer' @@ -21,14 +21,14 @@ if [ "$CARCH" = "i686" ]; then source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.i386.tar.gz" "http://www.adobe.com/products/eulas/pdfs/${_licensefile}" mms.cfg) - md5sums=('8c197a50457c8266ca0e18fa28bd6acf' + md5sums=('3de010fba558cf5d8c66892456b0ed33' '94ca2aecb409abfe36494d1a7ec7591d' 'f34aae6279b40e0bd2abfb0d9963d7b8') elif [ "$CARCH" = "x86_64" ]; then source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.x86_64.tar.gz" "http://www.adobe.com/products/eulas/pdfs/${_licensefile}" mms.cfg) - md5sums=('719258340ba34eda72495187b8148f75' + md5sums=('a060430d0900dd98252b9102ec1a32d6' '94ca2aecb409abfe36494d1a7ec7591d' 'f34aae6279b40e0bd2abfb0d9963d7b8') fi diff --git a/abs/extra/gd/PKGBUILD b/abs/extra/gd/PKGBUILD index 2d89e7b..b050624 100644 --- a/abs/extra/gd/PKGBUILD +++ b/abs/extra/gd/PKGBUILD @@ -1,31 +1,42 @@ -# $Id: PKGBUILD 148724 2012-02-05 11:48:15Z ibiru $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id$ pkgname=gd -pkgver=2.0.36RC1 -pkgrel=5 +pkgver=2.1.0 +pkgrel=3 pkgdesc="Library for the dynamic creation of images by programmers" arch=('i686' 'x86_64') url="http://www.libgd.org/" license=('custom') -depends=('libpng' 'fontconfig' 'libjpeg') +depends=('fontconfig' 'libvpx' 'libxpm' 'libtiff') optdepends=('perl: bdftogd script') -options=('!libtool') -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'libpng14.patch') -md5sums=('e876979ca3130623a4e7866d9579171a' - '7921556f4960e8d66cf4fb67ea7101b5') +source=("https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${pkgver}.tar.xz" + 'color_c_null_pointer.patch') +md5sums=('03588159bf4faab9079849c8d709acc6' + '51f5ff073eabbd7809e0ce438d5bb1c2') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd libgd-${pkgver} + # CVE-2014-2497 + patch -p1 -i ${srcdir}/color_c_null_pointer.patch +} - patch -Np1 -i ${srcdir}/libpng14.patch - ./configure --prefix=/usr --without-xpm +build() { + cd libgd-${pkgver} + ./configure \ + --prefix=/usr \ + --disable-rpath \ + --with-vpx=/usr \ + --with-tiff=/usr make } +check() { + cd libgd-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd libgd-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/extra/gd/color_c_null_pointer.patch b/abs/extra/gd/color_c_null_pointer.patch new file mode 100644 index 0000000..95b3eeb --- /dev/null +++ b/abs/extra/gd/color_c_null_pointer.patch @@ -0,0 +1,18 @@ +diff -up ./src/gdxpm.c.color_c_null_pointer ./src/gdxpm.c +--- ./src/gdxpm.c.color_c_null_pointer 2013-06-25 11:58:23.000000000 +0200 ++++ ./src/gdxpm.c 2014-07-16 16:43:44.000000000 +0200 +@@ -62,6 +62,13 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFro + + for(i = 0; i < number; i++) { + char *c_color = image.colorTable[i].c_color; ++ if (!c_color) ++ { ++ /* unsupported color key or color key not defined */ ++ gdImageDestroy(im); ++ im = 0; ++ goto done; ++ } + if(strcmp(c_color, "None") == 0) { + colors[i] = gdImageGetTransparent(im); + if(colors[i] == -1) colors[i] = gdImageColorAllocate(im, 0, 0, 0); +diff -up ./x.color_c_null_pointer ./x diff --git a/abs/extra/gd/libpng14.patch b/abs/extra/gd/libpng14.patch deleted file mode 100644 index 19a3fda..0000000 --- a/abs/extra/gd/libpng14.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur gd-2.0.36RC1.orig/gd_png.c gd-2.0.36RC1/gd_png.c ---- gd-2.0.36RC1.orig/gd_png.c 2007-11-27 10:30:34.000000000 +0200 -+++ gd-2.0.36RC1/gd_png.c 2010-01-17 17:14:11.000000000 +0200 -@@ -151,7 +151,7 @@ - return NULL; - } - -- if (!png_check_sig (sig, 8)) { /* bad signature */ -+ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */ - return NULL; /* bad signature */ - } - diff --git a/abs/extra/geoclue/PKGBUILD b/abs/extra/geoclue/PKGBUILD index 78936e4..84a354d 100644 --- a/abs/extra/geoclue/PKGBUILD +++ b/abs/extra/geoclue/PKGBUILD @@ -1,35 +1,25 @@ -# $Id: PKGBUILD 156782 2012-04-23 09:05:31Z ibiru $ +# $Id$ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=geoclue -pkgver=0.12.0 -pkgrel=5 +pkgver=0.12.99 +pkgrel=2 pkgdesc="Modular geoinformation service built on the D-Bus messaging system." -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://geoclue.freedesktop.org/" -license=('LGPL') -depends=('dbus-glib' 'libxml2') -optdepends=('networkmanager: geolocation' - 'gconf: geolocation' - 'libsoup-gnome: Skyhook location provider') -makedepends=('gconf' 'libsoup-gnome' 'gtk-doc') -options=('!libtool') -source=(https://launchpad.net/geoclue/trunk/${pkgver%.*}/+download/$pkgname-$pkgver.tar.gz - geoclue-gcc46.patch) -md5sums=('33af8307f332e0065af056ecba65fec2' - '0cf8ecc350be702f623ed9a9715818c5') +license=(LGPL) +depends=(dbus-glib libxml2 dconf) +makedepends=(libsoup-gnome gtk-doc) +optdepends=('libsoup-gnome: Skyhook location provider') +install=geoclue.install +source=(http://freedesktop.org/~hadess/$pkgname-$pkgver.tar.gz) +md5sums=('779245045bfeeec4853da8baaa3a18e6') build() { cd $pkgname-$pkgver - patch -Np1 -i ../geoclue-gcc46.patch - - sed -i 's/libnm_glib/libnm-glib/g' configure.ac - sed -i '/libsoup-gnome/s/$/ gthread-2.0/' configure.ac - autoreconf -f -i - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ - --disable-static + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static make } diff --git a/abs/extra/geoclue/geoclue.install b/abs/extra/geoclue/geoclue.install new file mode 100644 index 0000000..c25dff2 --- /dev/null +++ b/abs/extra/geoclue/geoclue.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/abs/extra/glew/PKGBUILD b/abs/extra/glew/PKGBUILD index 5a71939..4731ab8 100644 --- a/abs/extra/glew/PKGBUILD +++ b/abs/extra/glew/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 147734 2012-01-27 15:57:44Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id$ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: SleepyDog pkgname=glew -pkgver=1.7.0 -pkgrel=3 +pkgver=1.11.0 +pkgrel=1 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64') url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') -depends=('libxmu' 'libxi' 'mesa') +depends=('libxmu' 'libxi' 'glu') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) -sha1sums=('9266f2360c1687a96f2ea06419671d370b2928d1') +sha1sums=('9bb5c87c055acd122a4956112bbb18ee72c38e5c') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + sed -i 's|lib64|lib|' config/Makefile.linux + sed -i '/^.PHONY: .*\.pc$/d' Makefile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make GLEW_DEST="${pkgdir}/usr" install.all install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a - chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver} +# chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver} } diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index a6ff092..7cb2ad9 100644 --- a/abs/extra/google-chrome/PKGBUILD +++ b/abs/extra/google-chrome/PKGBUILD @@ -1,11 +1,11 @@ -# Maintainer: Det <nimetonmaili at gmail a-dot com> +# Maintainer: Det <nimetonmaili g-mail> # Contributors: t3ddy, Lex Rivera aka x-demon, ruario # Check for new Linux releases in: http://googlechromereleases.blogspot.com/search/label/Stable%20updates # or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }' pkgname=google-chrome -pkgver=38.0.2125.104 +pkgver=40.0.2214.111 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -14,9 +14,8 @@ license=('custom:chrome') depends=('alsa-lib' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harfbuzz-icu' 'hicolor-icon-theme' 'icu' 'libcups' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils') optdepends=('kdebase-kdialog: needed for file dialogs in KDE' - 'ttf-google-fonts-git') + 'ttf-liberation: fix fonts for some PDFs') provides=("google-chrome=$pkgver") -replaces=('chromium') options=('!emptydirs' '!strip') install=$pkgname.install _channel=stable @@ -24,19 +23,17 @@ _arch=amd64 [[ $CARCH = i686 ]] && _arch=i386 source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb" 'eula_text.html') -md5sums=('a2b61a623da973f12e1cb18674b9fb93' - 'b7e752f549b215ac77f284b6486794b6') -[[ $CARCH = i686 ]] && md5sums[0]='84353f292685c20e19c3cd9a6d8712db' +[[ $CARCH = i686 ]] && md5sums[0]='b2e60863b171bfc152b25030df196ecb' package() { - msg2 "Extracting the data.tar.lzma" + msg2 "Extracting the data.tar.lzma..." bsdtar -xf data.tar.lzma -C "$pkgdir/" - msg2 "Moving stuff in place" + msg2 "Moving stuff in place..." # Icons for i in 16 22 24 32 48 64 128 256; do install -Dm644 "$pkgdir"/opt/google/chrome/product_logo_$i.png \ - "$pkgdir"/usr/share/icons/hicolor/${i}x$i/apps/google-chrome.png + "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/google-chrome.png done # Man page @@ -45,20 +42,24 @@ package() { # License install -Dm644 eula_text.html "$pkgdir"/usr/share/licenses/google-chrome/eula_text.html - msg2 "Symlinking missing Udev lib" + msg2 "Symlinking missing Udev lib..." ln -s /usr/lib/libudev.so.1 "$pkgdir"/opt/google/chrome/libudev.so.0 - msg2 "Fixing Chrome icon resolution" - _name=$(echo ${source/_*} | sed 's/.*/\u&/') - sed -i "/Exec=/i\StartupWMClass=$_name" "$pkgdir"/usr/share/applications/google-chrome.desktop + msg2 "Fixing Chrome icon resolution..." + sed -i "/Exec=/i\StartupWMClass=Google-chrome-$_channel" "$pkgdir"/usr/share/applications/google-chrome.desktop + + msg2 "Fixing permissions of documentation folder..." + chmod 755 "$pkgdir"/usr/share/doc/google-chrome-$_channel/ - msg2 "Adding support for CHROMIUM_USER_FLAGS" - sed -i 's/ "$@"/"$CHROMIUM_USER_FLAGS" "$@"/' "$pkgdir"/opt/google/chrome/google-chrome + msg2 "Adding support for CHROMIUM_USER_FLAGS..." + sed -i 's/ "$@"/ $CHROMIUM_USER_FLAGS "$@"/' "$pkgdir"/opt/google/chrome/google-chrome - msg2 "Removing unnecessities (e.g. Debian Cron job)" + msg2 "Removing unnecessities (e.g. Debian Cron job)..." rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/ rm "$pkgdir"/opt/google/chrome/product_logo_*.png - msg2 "Rename google-chrome-stable to google-chrome" + msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } +md5sums=('7814ce4a8c941a918d48ace4a2362ebd' + 'b7e752f549b215ac77f284b6486794b6') diff --git a/abs/extra/gptfdisk/PKGBUILD b/abs/extra/gptfdisk/PKGBUILD index 6b0c453..83716e5 100644 --- a/abs/extra/gptfdisk/PKGBUILD +++ b/abs/extra/gptfdisk/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 160220 2012-05-31 03:41:30Z foutrelis $ +# $Id$ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> pkgname=gptfdisk -pkgver=0.8.5 +pkgver=0.8.10 pkgrel=1 -pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" +pkgdesc="A text-mode partitioning tool that works on GUID Partition Table (GPT) disks" arch=('i686' 'x86_64') url="http://www.rodsbooks.com/gdisk/" license=('GPL2') -depends=('gcc-libs' 'util-linux' 'popt' 'icu') +depends=('gcc-libs' 'util-linux' 'popt') provides=("gdisk=$pkgver") conflicts=('gdisk') replaces=('gdisk') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -sha256sums=('15cc691f28212c157e05315662ed6b76ffdcc8de6fc118fa21c81ef5aae84af9') +sha256sums=('73e64151203ae0c347c488358e71ca582bb7fb7f0d66df86b71c42050390eb9b') build() { cd "$srcdir/$pkgname-$pkgver" - make } @@ -31,5 +30,3 @@ package () { install -m644 -t "$pkgdir/usr/share/man/man8" {{,c,s}gdisk,fixparts}.8 install -m644 -t "$pkgdir/usr/share/doc/gdisk" README NEWS } - -# vim:set ts=2 sw=2 et: diff --git a/abs/extra/graphviz/PKGBUILD b/abs/extra/graphviz/PKGBUILD index f3de8b6..0ee8e34 100644 --- a/abs/extra/graphviz/PKGBUILD +++ b/abs/extra/graphviz/PKGBUILD @@ -1,42 +1,57 @@ -# $Id: PKGBUILD 94713 2010-10-10 10:06:04Z andyrtr $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id$ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz -pkgver=2.26.3 -pkgrel=2 -pkgdesc="Creates acircular graph images" -arch=('i686' 'x86_64') +pkgver=2.38.0 +pkgrel=3 +pkgdesc='Graph visualization software' +url='http://www.graphviz.org/' license=('CPL') -depends=('gd>=2.0.35' 'librsvg>=2.22.3' 'libxaw>=1.0.5' 'ghostscript>=9.00') -url="http://www.graphviz.org/" -options=('!libtool') -source=(${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz) -install=graphviz.install -md5sums=('6f45946fa622770c45609778c0a982ee') +arch=('i686' 'x86_64') +depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts') +makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4' 'gtk2') +optdepends=('mono: sharp bindings' + 'guile: guile bindings' + 'lua51: lua bindings' + 'ocaml: ocaml bindings' + 'perl: perl bindings' + 'php: php bindings' + 'python2: python bindings' + 'r: r bindings' + 'tcl: tcl bindings' + 'qt4: gvedit' + 'gtk2: gtk output plugin') +source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" + 'format-string.patch') +sha1sums=('053c771278909160916ca5464a0a98ebf034c6ef' + '271d116bc022596a64b6ee061f3d2e50fa2e6025') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --without-gnomeui --docdir=/usr/share/doc/gvkp \ - --disable-tcl --disable-sharp --disable-ruby --disable-python \ - --disable-lua --disable-guile --disable-perl || return 1 +install=install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../format-string.patch # FS#42983 +} -#--bindir=/bindir --libdir=/libdir --includedir=/includedir --mandir=/mandir \ -#--infodir=/infodir \ -#--docdir=/docdir --htmldir=/htmldir --dvidir=/dvidir \ -#--pdfdir=/pdfdir --psdir=/psdir +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export LIBPOSTFIX=/ + export PYTHON=python2 + export LUA=lua5.1 - make || return 1 + ./configure --prefix=/usr + make } -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - #Fix a wrong file location for x86_64 - rm -rf ${pkgdir}/usr/lib64 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - # Fix non-fhs doc files. - cd ${pkgdir}/usr/share - mkdir doc - mv graphviz/doc doc/graphviz + # Workaround symlink upgrade bug (fixed in pacman trunk) + # Also deduplicates the tcl libraries (upstream bug?) + # Might have been this commit: https://github.com/ellson/graphviz/commit/f11aead + rm -r "${pkgdir}/usr/lib/tcl8.6/graphviz" + ln -s ../graphviz/tcl "$pkgdir/usr/lib/tcl8.6/graphviz" } diff --git a/abs/extra/graphviz/format-string.patch b/abs/extra/graphviz/format-string.patch new file mode 100644 index 0000000..1cc5867 --- /dev/null +++ b/abs/extra/graphviz/format-string.patch @@ -0,0 +1,21 @@ +diff -Naur old/lib/cgraph/scan.l new/lib/cgraph/scan.l +--- old/lib/cgraph/scan.l 2014-04-13 10:40:25.000000000 -1000 ++++ new/lib/cgraph/scan.l 2014-12-02 08:54:21.285050735 -1000 +@@ -149,7 +149,7 @@ + agxbput(&xb,buf); + agxbput(&xb,fname); + agxbput(&xb, " splits into two tokens\n"); +- agerr(AGWARN,agxbuse(&xb)); ++ agerr(AGWARN, "%s", agxbuse(&xb)); + + agxbfree(&xb); + return 1; +@@ -225,7 +225,7 @@ + agxbput (&xb, buf); + agxbput (&xb, yytext); + agxbput (&xb,"'\n"); +- agerr(AGERR,agxbuse(&xb)); ++ agerr(AGERR, "%s", agxbuse(&xb)); + agxbfree(&xb); + } + /* must be here to see flex's macro defns */ diff --git a/abs/extra/graphviz/graphviz.install b/abs/extra/graphviz/graphviz.install deleted file mode 100644 index 00510e3..0000000 --- a/abs/extra/graphviz/graphviz.install +++ /dev/null @@ -1,17 +0,0 @@ -# arg 1: the new package version -post_install() { - # Create plugin config /usr/lib/graphviz/config6 - rm -f usr/lib/graphviz/config{,6} - usr/bin/dot -c -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - rm -f usr/lib/graphviz/config{,6} -} diff --git a/abs/extra/graphviz/install b/abs/extra/graphviz/install new file mode 100644 index 0000000..65fba52 --- /dev/null +++ b/abs/extra/graphviz/install @@ -0,0 +1,12 @@ +post_install() { + rm -f usr/lib/graphviz/config{,6} + usr/bin/dot -c +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/graphviz/config{,6} +} diff --git a/abs/extra/gtk3/PKGBUILD b/abs/extra/gtk3/PKGBUILD index 9d4a7a1..5557008 100644 --- a/abs/extra/gtk3/PKGBUILD +++ b/abs/extra/gtk3/PKGBUILD @@ -1,42 +1,45 @@ -# $Id: PKGBUILD 163899 2012-07-21 19:20:27Z ibiru $ +# $Id$ # Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gtk3 -pkgver=3.4.4 +pkgver=3.14.5 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://www.gtk.org/" install=gtk3.install -depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord') -makedepends=('gobject-introspection') -options=('!libtool') -backup=(etc/gtk-3.0/settings.ini) -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz - settings.ini wacom.patch) -sha256sums=('f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' - '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') +depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi + libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon + adwaita-icon-theme json-glib rest) +makedepends=(gobject-introspection python2) +license=(LGPL) +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz) +sha256sums=('ba70f5ccde6646c6d8aa5a6398794b7bcf23fc45af22580a215d258f392dbbe2') + +prepare() { + cd gtk+-$pkgver +} + build() { cd "gtk+-$pkgver" - # Partially revert BGO#673440 in order to fix BGO#674157 - patch -Np1 -i ../wacom.patch - CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-gtk2-dependency \ - --disable-schemas-compile + --disable-schemas-compile \ + --enable-x11-backend \ + --enable-broadway-backend \ + --enable-wayland-backend + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } package() { cd "gtk+-$pkgver" make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini" } diff --git a/abs/extra/gtk3/gtk3.install b/abs/extra/gtk3/gtk3.install index ca20d28..f57b1bf 100644 --- a/abs/extra/gtk3/gtk3.install +++ b/abs/extra/gtk3/gtk3.install @@ -1,6 +1,7 @@ post_install() { /usr/bin/gtk-query-immodules-3.0 --update-cache /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { @@ -13,4 +14,5 @@ pre_remove() { post_remove() { /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } diff --git a/abs/extra/gtk3/settings.ini b/abs/extra/gtk3/settings.ini index 039000d..6a0643b 100644 --- a/abs/extra/gtk3/settings.ini +++ b/abs/extra/gtk3/settings.ini @@ -1,2 +1,4 @@ [Settings] -gtk-fallback-icon-theme = gnome +gtk-icon-theme-name = gnome +gtk-theme-name = Adwaita +gtk-font-name = Cantarell 11 diff --git a/abs/extra/gts/PKGBUILD b/abs/extra/gts/PKGBUILD new file mode 100644 index 0000000..b705a39 --- /dev/null +++ b/abs/extra/gts/PKGBUILD @@ -0,0 +1,28 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Thomas Dziedzic <gostrc at gmail> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=gts +pkgver=0.7.6 +pkgrel=3 +pkgdesc='Provides useful functions to deal with 3D surfaces meshed with interconnected triangles' +url='http://gts.sourceforge.net/' +license=('LGPL') +arch=('i686' 'x86_64') +depends=('glib2') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('000720bebecf0b153eb28260bd30fbd979dcc040') + +build() { + cd "${pkgname}-${pkgver}" + export LDFLAGS=${LDFLAGS//--as-needed,} + ./configure --prefix=/usr + make +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/abs/extra/handbrake/PKGBUILD b/abs/extra/handbrake/PKGBUILD index f7cef21..058f218 100644 --- a/abs/extra/handbrake/PKGBUILD +++ b/abs/extra/handbrake/PKGBUILD @@ -4,41 +4,30 @@ # Contributor: Sebastien Piccand <sebcactus gmail com> pkgname=('handbrake' 'handbrake-cli') -pkgver=0.9.9 -pkgrel=6 +pkgver=0.10.0 +pkgrel=1 arch=('i686' 'x86_64') url="http://handbrake.fr/" license=('GPL') makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify' - 'gst-plugins-base' 'gtk3' 'dbus-glib' 'fribidi' 'libass' - 'fontconfig' 'freetype2' 'libxml2' 'libogg' 'libvorbis' - 'libtheora' 'libsamplerate' 'libbluray' 'x264') + 'gst-plugins-base' 'gtk3' 'dbus-glib' 'fribidi' 'libass' 'lame' + 'fontconfig' 'freetype2' 'libxml2' 'libogg' 'libvorbis' 'cmake' + 'libtheora' 'libsamplerate' 'libbluray' 'x264' 'libx264' + 'libdvdnav') source=(http://downloads.sourceforge.net/project/handbrake/$pkgver/HandBrake-$pkgver.tar.bz2) -sha256sums=('a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3') +sha256sums=('a91042da3cc08454844f7c171ee2fde4f0ed08176407fc0328d5118227ed4114') prepare() { cd "$srcdir/HandBrake-$pkgver" - # Use Python 2 - sed -i 's/python /python2 /' gtk/src/Makefile.am - # Use more system libs # We had ffmpeg here as well but it broke PGS subtitle processing # https://forum.handbrake.fr/viewtopic.php?f=13&t=27581 sed -i \ -e '/MODULES += contrib\/libbluray/d' \ - -e '/MODULES += contrib\/x264/d' \ + -e '/MODULES += contrib\/libdvdnav/d' \ + -e '/MODULES += contrib\/libdvdread/d' \ make/include/main.defs - - # Fix configure.ac to work with automake 1.13 - cd gtk - sed -i \ - -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ - -e '/AM_PROG_CC_STDC/d' \ - -e 's/$pkg_gudev"/gmodule-2.0 $pkg_gudev"/' \ - configure.ac - - autoreconf -vi } build() { @@ -55,9 +44,9 @@ build() { package_handbrake() { pkgdesc="Multithreaded video transcoder" depends=('bzip2' 'gcc-libs' 'gst-plugins-base' 'libnotify' 'dbus-glib' - 'fribidi' 'libass' 'gtk3' 'fontconfig' 'freetype2' 'libxml2' + 'fribidi' 'libass' 'lame' 'gtk3' 'fontconfig' 'freetype2' 'libxml2' 'libogg' 'libvorbis' 'libtheora' 'libsamplerate' 'libbluray' - 'x264' 'desktop-file-utils' 'hicolor-icon-theme') + 'libx264' 'libdvdnav' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('gst-plugins-good: for video previews' 'gst-libav: for video previews') install=$pkgname.install @@ -70,8 +59,8 @@ package_handbrake() { package_handbrake-cli() { pkgdesc="Multithreaded video transcoder (CLI)" - depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi' 'libass' 'libxml2' 'libtheora' - 'libsamplerate' 'libbluray' 'x264') + depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi' 'libass' 'lame' 'libxml2' + 'libtheora' 'libsamplerate' 'libbluray' 'libx264' 'libdvdnav') cd "$srcdir/HandBrake-$pkgver/build" install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI" diff --git a/abs/extra/harfbuzz/PKGBUILD b/abs/extra/harfbuzz/PKGBUILD index c9f550f..1c066f1 100644 --- a/abs/extra/harfbuzz/PKGBUILD +++ b/abs/extra/harfbuzz/PKGBUILD @@ -3,24 +3,29 @@ pkgbase=(harfbuzz) pkgname=(harfbuzz harfbuzz-icu) -pkgver=0.9.19 +pkgver=0.9.36 pkgrel=1 pkgdesc="OpenType text shaping engine" arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/HarfBuzz" license=(MIT) -makedepends=(glib2 freetype2 graphite cairo icu) -options=(!libtool) +makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection python2) source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35') +sha256sums=('3bfbf7b016167ee6b2a2f83948fef75cc1253081873d6a91022161815956b9be') build() { cd $pkgbase-$pkgver ./configure --prefix=/usr \ - --with-glib --with-freetype --with-cairo --with-icu --with-graphite2 + --with-glib --with-freetype --with-cairo --with-icu --with-graphite2 \ + --with-gobject make } +check() { + cd $pkgbase-$pkgver + make -k check || : +} + package_harfbuzz() { depends=(glib2 freetype2 graphite) optdepends=('cairo: hb-view program') diff --git a/abs/extra/hspell/PKGBUILD b/abs/extra/hspell/PKGBUILD index 7700435..1b513e5 100644 --- a/abs/extra/hspell/PKGBUILD +++ b/abs/extra/hspell/PKGBUILD @@ -1,23 +1,53 @@ -# $Id: PKGBUILD 28768 2009-03-02 04:21:08Z eric $ +# $Id$ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=hspell -pkgver=1.0 +pkgbase=hspell +pkgname=('hspell' 'hunspell-he') +pkgver=1.2 pkgrel=2 -pkgdesc="Hebrew spell-checker" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL') url="http://www.ivrix.org.il/projects/spell-checker/" -depends=('glibc>=2.7' 'zlib' 'perl') -options=('!libtool' '!makeflags') -source=(ftp://ftp.archlinux.org/other/hspell/${pkgname}-${pkgver}.tar.gz) -md5sums=('3e12fa383c2cfd430918d115f33f9841') +makedepends=('glibc' 'zlib' 'perl' 'hunspell' 'gawk') +options=('!makeflags') +source=(http://hspell.ivrix.org.il/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('32fbc1a71e86ab46bf7870c6eec9a6be' + '858120037dd52ae823788518329ee7d3') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" - sed -i -e 's|/usr/bin/awk|/bin/awk|' wzip - ./configure --prefix=/usr --enable-linginfo - make || return 1 - make DESTDIR=${startdir}/pkg/ install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man \ + --enable-linginfo --enable-fatverb --enable-shared + make + make hunspell +} + +package_hspell() { + + pkgdesc="Hebrew spell-checker" + depends=('glibc' 'zlib' 'perl') + + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -f ${pkgdir}/usr/lib/libhspell.a +} + +package_hunspell-he() { + + pkgdesc="Hebrew hunspell dictionary" + + cd "${srcdir}/${pkgbase}-${pkgver}" + + install -dm755 ${pkgdir}/usr/share/hunspell + install -m644 he.dic ${pkgdir}/usr/share/hunspell/he_IL.dic + install -m644 he.aff ${pkgdir}/usr/share/hunspell/he_IL.aff + + # the symlinks + install -dm755 ${pkgdir}/usr/share/myspell/dicts + pushd $pkgdir/usr/share/myspell/dicts + for file in $pkgdir/usr/share/hunspell/*; do + ln -sv /usr/share/hunspell/$(basename $file) . + done + popd } diff --git a/abs/extra/hunspell/PKGBUILD b/abs/extra/hunspell/PKGBUILD index a4b178a..89f9c87 100644 --- a/abs/extra/hunspell/PKGBUILD +++ b/abs/extra/hunspell/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 166664 2012-09-15 07:49:23Z andyrtr $ +# $Id$ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Hussam Al-Tayeb <ht990332@gmail.com> pkgname=hunspell -pkgver=1.3.2 -pkgrel=2 +pkgver=1.3.3 +pkgrel=1 pkgdesc="Spell checker and morphological analyzer library and program" arch=('i686' 'x86_64') url="http://hunspell.sourceforge.net/" license=('GPL' 'LGPL' 'MPL') depends=('gcc-libs' 'readline') optdepends=('perl: for ispellaff2myspell') -options=('!libtool') source=(http://downloads.sourceforge.net/hunspell/hunspell-$pkgver.tar.gz) -md5sums=('3121aaf3e13e5d88dfff13fb4a5f1ab8') +md5sums=('4967da60b23413604c9e563beacc63b4') build() { cd "$srcdir/hunspell-$pkgver" diff --git a/abs/extra/hwloc/PKGBUILD b/abs/extra/hwloc/PKGBUILD index bcefb19..1155d34 100644 --- a/abs/extra/hwloc/PKGBUILD +++ b/abs/extra/hwloc/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 159285 2012-05-20 22:11:18Z stephane $ +# $Id$ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sylvain HENRY <hsyl20@yahoo.fr> # Contributor: Hervé YVIQUEL <elldekaa@gmail.com> pkgname=hwloc -pkgver=1.4.2 +pkgver=1.9 pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64') url="http://www.open-mpi.org/projects/hwloc/" license=('BSD') depends=('sh' 'pciutils' 'cairo' 'libxml2') -makedepends=('pkg-config') -options=('!libtool' '!docs') -source=(http://www.open-mpi.org/software/hwloc/v1.4/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('2c2ca4101b4ea6782393b555a320c566da50cb68') +options=('!docs') +source=(http://www.open-mpi.org/software/hwloc/v${pkgver}/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('99646446502e0f9952170bf1082be63361d99b6d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } +check() { + cd ${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/abs/extra/icon-naming-utils/PKGBUILD b/abs/extra/icon-naming-utils/PKGBUILD new file mode 100644 index 0000000..7a7aff2 --- /dev/null +++ b/abs/extra/icon-naming-utils/PKGBUILD @@ -0,0 +1,30 @@ +# $Id$ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=icon-naming-utils +pkgver=0.8.90 +pkgrel=3 +pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops." +arch=(any) +license=('GPL') +url="http://tango.freedesktop.org/" +depends=('perl-xml-simple') +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz + remove-legacy-calc.patch) +md5sums=('2c5c7a418e5eb3268f65e21993277fba' + 'd3490e31df95ae11c96f0af2a9ef2ed0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/remove-legacy-calc.patch" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/icon-naming-utils \ + --localstatedir=/var + make +} +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + mv "$pkgdir/usr/share/pkgconfig" "$pkgdir/usr/lib/pkgconfig" +} diff --git a/abs/extra/icon-naming-utils/remove-legacy-calc.patch b/abs/extra/icon-naming-utils/remove-legacy-calc.patch new file mode 100644 index 0000000..140a051 --- /dev/null +++ b/abs/extra/icon-naming-utils/remove-legacy-calc.patch @@ -0,0 +1,15 @@ +diff -Nur icon-naming-utils-0.8.90.orig/legacy-icon-mapping.xml icon-naming-utils-0.8.90/legacy-icon-mapping.xml +--- icon-naming-utils-0.8.90.orig/legacy-icon-mapping.xml 2011-06-06 12:18:27.059555925 +0000 ++++ icon-naming-utils-0.8.90/legacy-icon-mapping.xml 2011-06-06 12:18:47.709737921 +0000 +@@ -427,11 +427,6 @@ + </icon> + </context> + <context dir="apps"> +- <icon name="accessories-calculator"> +- <link>gnome-calculator</link> +- <link>kcalc</link> +- <link>calc</link> +- </icon> + <icon name="accessories-character-map"> + <link>gnome-character-map</link> + <link>gucharmap</link> diff --git a/abs/extra/icu/PKGBUILD b/abs/extra/icu/PKGBUILD index bf029ee..eafa339 100644 --- a/abs/extra/icu/PKGBUILD +++ b/abs/extra/icu/PKGBUILD @@ -1,36 +1,46 @@ -# $Id: PKGBUILD 160960 2012-06-07 13:35:03Z andyrtr $ +# $Id$ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Art Gramlich <art@gramlich-net.com> pkgname=icu -pkgver=49.1.2 -pkgrel=2 +pkgver=54.1 +pkgrel=1 pkgdesc="International Components for Unicode library" arch=(i686 x86_64) url="http://www.icu-project.org/" -license=('custom:"icu"') -depends=('gcc-libs' 'sh') +license=('custom:icu') +depends=('gcc-libs>=4.7.1-5' 'sh') +#makedepends=('clang') source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz icu.8198.revert.icu5431.patch) +md5sums=('e844caed8f2ca24c088505b0d6271bc0' + 'ebd5470fc969c75e52baf4af94a9ee82') -build() { - cd ${srcdir}/icu/source +prepare() { + cd icu/source # fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200 patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch +} + +build() { + cd icu/source ./configure --prefix=/usr \ --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --mandir=/usr/share/man + --mandir=/usr/share/man \ + --sbindir=/usr/bin make } +check() { + cd icu/source + make -k check # passes all +} + package() { - cd ${srcdir}/icu/source + cd icu/source make -j1 DESTDIR=${pkgdir} install # Install license install -Dm644 ${srcdir}/icu/license.html ${pkgdir}/usr/share/licenses/icu/license.html } -md5sums=('bbc609fe5237202d7abf016141012a45' - 'ebd5470fc969c75e52baf4af94a9ee82') diff --git a/abs/extra/iotop/PKGBUILD b/abs/extra/iotop/PKGBUILD new file mode 100644 index 0000000..4b25290 --- /dev/null +++ b/abs/extra/iotop/PKGBUILD @@ -0,0 +1,25 @@ +# $Id$ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + +pkgname=iotop +pkgver=0.6 +pkgrel=2 +pkgdesc='View I/O usage of processes' +arch=('any') +url='http://guichaz.free.fr/iotop/' +license=('GPL') +depends=('python2') +changelog=$pkgname.changelog +source=(http://guichaz.free.fr/$pkgname/files/$pkgname-$pkgver.tar.bz2) +sha256sums=('3adea2a24eda49bbbaeb4e6ed2042355b441dbd7161e883067a02bfc8dcef75b') + +package() { + cd ${srcdir}/$pkgname-$pkgver + + python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1 + +#FS#33906 fix + chmod 644 ${pkgdir}/usr/share/man/man8/iotop.8 + + mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin +} diff --git a/abs/extra/iotop/iotop.changelog b/abs/extra/iotop/iotop.changelog new file mode 100644 index 0000000..b79c079 --- /dev/null +++ b/abs/extra/iotop/iotop.changelog @@ -0,0 +1,35 @@ +2013-06-23 Thomas Bächler <thomas@archlinux.org> + * iotop 0.6-2 Remove files from /usr/sbin + +2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * iotop 0.6-1 + +2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * iotop 0.5-2 FS#33906 fix + +2013-02-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * iotop 0.5-1 + +2011-10-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * iotop 0.4.4 + +2011-03-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * iotop 0.4.3 + +2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.4.2 + +2010-06-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.4.1 + +2010-01-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.4 + +2009-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.3.1 + +2009-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.3 + +2008-08-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Moved to [community] repo diff --git a/abs/extra/java-common/PKGBUILD b/abs/extra/java-common/PKGBUILD new file mode 100644 index 0000000..502622e --- /dev/null +++ b/abs/extra/java-common/PKGBUILD @@ -0,0 +1,70 @@ +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> +pkgname=('java-runtime-common' 'java-environment-common') +pkgbase=java-common +pkgver=2 +pkgrel=2 +arch=('any') +url='www.archlinux.org' +license=('GPL') +checkdepends=('wget') +source=(profile_jre.csh + profile_jre.sh + bin_archlinux-java + test_archlinux-java + https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz) + +sha256sums=('9d25638cafc2fabd1ba6f2f26aa01233eccf3d31db003d956b571f0ab655dd23' + '519e9881a2a9f4fc3d581ea0ef0da594eedbfdfcf734f9fdc0bb595e8ac77e4c' + '272296ec7ca673b4f9f59fb70565328b6daef682c29cd964c988c018090c3fc2' + 'c2c413a6b2f8b88ed170a5b19f7cb620518e09686f0d286b4b27d30f571e5050' + '65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee') + +check() { + cd "${srcdir}" + ./test_archlinux-java +} + +package_java-runtime-common() { + pkgdesc='Common files for Java Runtime Environments' + conflicts=('java-common') + replaces=('java-common') + backup=(etc/profile.d/jre.sh + etc/profile.d/jre.csh) + install=install_java-runtime-common.sh + + cd "${srcdir}" + + install -d -m 755 "${pkgdir}/usr/lib/jvm/" + ln -s /dev/null "${pkgdir}/usr/lib/jvm/default" + ln -s /dev/null "${pkgdir}/usr/lib/jvm/default-runtime" + + install -D -m 644 profile_jre.sh "${pkgdir}/etc/profile.d/jre.sh" + install -D -m 644 profile_jre.csh "${pkgdir}/etc/profile.d/jre.csh" + install -D -m 755 bin_archlinux-java "${pkgdir}/usr/bin/archlinux-java" + + install -d -m 755 "${pkgdir}/usr/bin/" + # Official list of binaries that Java headless runtime packages MUST provide + # This list is based on Arch Linux' default Java implementation: "OpenJDK 7 Icedtea" + for b in \ + java keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200; + do + ln -s /usr/lib/jvm/default-runtime/bin/${b} "${pkgdir}/usr/bin/${b}" + done +} + +package_java-environment-common() { + pkgdesc='Common files for Java Development Kits' + + cd "${srcdir}" + + install -d -m 755 "${pkgdir}/usr/bin/" + # Official list of supplementary binaries that Java environment packages MUST provide + # This list is based on Arch Linux' default Java implementation: "OpenJDK 7 Icedtea" + for b in \ + appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jcmd \ + jconsole jdb jhat jinfo jmap jps jrunscript jsadebugd jstack jstat \ + jstatd native2ascii rmic schemagen serialver wsgen wsimport xjc; + do + ln -s /usr/lib/jvm/default/bin/${b} "${pkgdir}/usr/bin/${b}" + done +} diff --git a/abs/extra/java-common/bin_archlinux-java b/abs/extra/java-common/bin_archlinux-java new file mode 100755 index 0000000..453b0a4 --- /dev/null +++ b/abs/extra/java-common/bin_archlinux-java @@ -0,0 +1,178 @@ +#! /bin/bash + +# Arch Linux helper script to set/unset/check/fix the enabled Java environment +# This program may be freely redistributed under the terms of the GNU General Public License +# +# Author: Guillaume ALAUX <guillaume@archlinux.org> + +JVM_DIR=/usr/lib/jvm +DEFAULT_NAME=default +DEFAULT_PATH=${JVM_DIR}/${DEFAULT_NAME} +DEFAULT_NAME_JRE=default-runtime +DEFAULT_PATH_JRE=${JVM_DIR}/${DEFAULT_NAME_JRE} + + +# Utility functions + +check_root() { + if [ $(id -u) -ne 0 ]; then + echo 'This script must be run as root' + exit 1 + fi +} + +# $1: parameter count given to this script for this option +# $2: expected parameter count for this option +check_param_count() { + if [ $1 -ne $2 ]; then + echo 'Wrong parameter count' + exit 2 + fi +} + +# Second level functions + +get_default_java() { + path=$(readlink -e ${DEFAULT_PATH}) + if [ "x${path}" != "x/dev/null" ]; then + echo ${path/${JVM_DIR}\/} + else + echo "" + fi +} + +get_installed_javas() { + if [ -d ${JVM_DIR} ]; then + for dir in $(find ${JVM_DIR} -mindepth 1 -maxdepth 1 -type d | sort); do + if [ -x ${dir}/bin/javac ]; then + javas+=(${dir/${JVM_DIR}\/}) + else + if [ -x ${dir}/jre/bin/java ]; then + javas+=(${dir/${JVM_DIR}\/}/jre) + fi + fi + done + fi + echo ${javas[@]} +} + +# $1: Java environment name to test +is_java_valid() { + test "x$1" != "x${DEFAULT_NAME}" && test -x ${JVM_DIR}/$1/bin/java +} + +# $1: Java environment name to set as default +set_default_link_to() { + new_default=$1 + unlink ${DEFAULT_PATH} 2>/dev/null + ln -sf ${new_default} ${DEFAULT_PATH} + + unlink ${DEFAULT_PATH_JRE} 2>/dev/null + if [[ ${new_default} == */jre ]]; then + ln -sf ${new_default} ${DEFAULT_PATH_JRE} + else + ln -sf ${new_default}/jre ${DEFAULT_PATH_JRE} + fi +} + +unset_default_link() { + unlink ${DEFAULT_PATH} 2>/dev/null + unlink ${DEFAULT_PATH_JRE} 2>/dev/null +} + +# First level functions + +do_status() { + installed_java=($(get_installed_javas)) + if [ ${#installed_java[@]} -eq 0 ]; then + echo 'No compatible Java environment installed' + else + default_java=$(get_default_java) + echo 'Available Java environments:' + for java in ${installed_java[@]}; do + if [ "${java}/jre" = "${default_java}" ]; then + echo -e " ${java} (${java}/jre default)" + elif [ ${java} = "${default_java}" ]; then + echo -e " ${java} (default)" + else + echo " ${java}" + fi + done + if [ -z ${default_java} ]; then + echo "No Java environment set as default" + fi + fi +} + +do_get() { + get_default_java +} + +# $1: Java environment name to set as default +do_set() { + if ! is_java_valid $1; then + echo "'${JVM_DIR}/$1' is not a valid Java environment path" + exit 1 + fi + default=$(get_default_java) + if [ "x$1" != "x${default}" ] || ! is_java_valid ${default}; then + unset_default_link + set_default_link_to $1 + fi + + #parent_dir=$(dirname $1) + #if is_java_valid ${parent_dir}; then + # echo "Warning: '${parent_dir}' looks like a valid JDK whereas '$1' is set as default" + # echo "Fix this with 'archlinux-java set ${parent_dir}'" + #fi +} + +# $1: Java environment name to unset +do_unset() { + unset_default_link +} + +do_fix() { + default=$(get_default_java) + if is_java_valid ${default}; then + if is_java_valid $(dirname ${default}); then + unset_default_link + set_default_link_to $(dirname ${default}) + fi + else + prev=$(readlink ${DEFAULT_PATH}) + unset_default_link + prev_fix=("${prev/\/jre}" "${prev}/jre") + openjdk7=('java-7-openjdk' 'java-7-openjdk/jre') + to_check=(${prev_fix[@]} ${openjdk7[@]} $(get_installed_javas)) + for java in ${to_check[@]}; do + if ! is_java_valid $(get_default_java) && is_java_valid ${java}; then + set_default_link_to ${java} + fi + done + fi + if ! is_java_valid $(get_default_java); then + echo 'No valid Java environment found' + fi +} + +usage() { + echo "$(basename $0) <COMMAND>" + echo -e "\nCOMMAND:" + echo -e '\tstatus\t\tList installed Java environments and enabled one' + echo -e '\tget\t\tReturn the short name of the Java environment set as default' + echo -e '\tset <JAVA_ENV>\tForce <JAVA_ENV> as default' + echo -e '\tunset\t\tUnset current default Java environment' + echo -e '\tfix\t\tFix an invalid/broken default Java environment configuration' +} + +## Main +case $1 in + 'status') do_status;; + 'get') do_get;; + 'set') check_root; check_param_count $# 2; do_set $2;; + 'unset') check_root; do_unset;; + 'fix') check_root; do_fix;; + 'help' | '--help' | '-h' | '') usage;; + *) echo "$(basename $0): unknown option '$@'"; exit 1;; +esac diff --git a/abs/extra/java-common/bin_java-common-wrapper b/abs/extra/java-common/bin_java-common-wrapper new file mode 100755 index 0000000..19d9eda --- /dev/null +++ b/abs/extra/java-common/bin_java-common-wrapper @@ -0,0 +1,2 @@ +#!/bin/bash +exec "${JAVA_HOME:-/usr/lib/jvm/default}/bin/${0##*/}" "$@" diff --git a/abs/extra/java-common/install_java-runtime-common.sh b/abs/extra/java-common/install_java-runtime-common.sh new file mode 100644 index 0000000..f61d177 --- /dev/null +++ b/abs/extra/java-common/install_java-runtime-common.sh @@ -0,0 +1,16 @@ +pre_upgrade() { + if grep -q '^export _JAVA_AWT_WM_NONREPARENTING=1' /etc/profile.d/jre.sh > /dev/null 2>&1; then + echo "Variable '_JAVA_AWT_WM_NONREPARENTING' should not be set in /etc/profile.d/jre.sh any more" + echo "Please declare it in ~/.xinitrc or such" + fi +} + +post_install() { + echo 'For the complete set of Java binaries to be available in your PATH,' + echo 'you need to re-login or source /etc/profile.d/jre.sh' + echo 'Please note that this package does not support forcing JAVA_HOME as former package 'java-common' did' +} + +post_upgrade() { + archlinux-java fix +} diff --git a/abs/extra/java-common/profile_jre.csh b/abs/extra/java-common/profile_jre.csh new file mode 100644 index 0000000..a224d89 --- /dev/null +++ b/abs/extra/java-common/profile_jre.csh @@ -0,0 +1,3 @@ +# Do not change this unless you want to completely by-pass Arch Linux' way +# of handling Java versions and vendors. Instead, please use script `archlinux-java` +setenv PATH "${PATH}:/usr/lib/jvm/default/bin" diff --git a/abs/extra/java-common/profile_jre.sh b/abs/extra/java-common/profile_jre.sh new file mode 100644 index 0000000..f5b2585 --- /dev/null +++ b/abs/extra/java-common/profile_jre.sh @@ -0,0 +1,3 @@ +# Do not change this unless you want to completely by-pass Arch Linux' way +# of handling Java versions and vendors. Instead, please use script `archlinux-java` +export PATH=${PATH}:/usr/lib/jvm/default/bin diff --git a/abs/extra/java-common/test_archlinux-java b/abs/extra/java-common/test_archlinux-java new file mode 100755 index 0000000..867745d --- /dev/null +++ b/abs/extra/java-common/test_archlinux-java @@ -0,0 +1,286 @@ +#! /bin/sh +# +# To run this script, ensure shunit2 (https://code.google.com/p/shunit2/) +# is available on the local directory, then just run sh bin_archlinux-java_tests +# +# inotifywait -r -m -e MODIFY . | while read l; do sh bin_archlinux-java_tests; done + +declare test_dir + +. ./bin_archlinux-java > /dev/null + +INIT_JVM_DIR=${JVM_DIR} +INIT_DEFAULT_PATH=${DEFAULT_PATH} +INIT_DEFAULT_PATH_JRE=${DEFAULT_PATH_JRE} + +# Redefining this so that tested script can be invoked without root privileges +check_root() { + true +} + + +get_rand_str() { + echo $(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 10 | head -n 1) +} + +setUp() { + test_dir=$(mktemp -d) + JVM_DIR=${test_dir}${INIT_JVM_DIR} + DEFAULT_PATH=${test_dir}${INIT_DEFAULT_PATH} + DEFAULT_PATH_JRE=${test_dir}${INIT_DEFAULT_PATH_JRE} + JAVA_NAME=$(get_rand_str) + mkdir -p ${JVM_DIR} +} + +tearDown() { + rm -rf ${test_dir} +} + +# $1: path of Java environment to create +create_valid_jre_env() { + mkdir -p ${JVM_DIR}/$1/bin + for binary in java keytool orbd; do + touch ${JVM_DIR}/$1/bin/${binary} + chmod +x ${JVM_DIR}/$1/bin/${binary} + done +} + +# $1: path of Java environment to create +create_valid_jdk_env() { + create_valid_jre_env "$1" + for binary in javac javah jhat; do + touch ${JVM_DIR}/$1/bin/${binary} + chmod +x ${JVM_DIR}/$1/bin/${binary} + done + create_valid_jre_env "$1/jre" +} + +set_default_for_test() { + ln -s $1 ${DEFAULT_PATH} + if [ -d ${DEFAULT_PATH}/jre ]; then + ln -s $1/jre ${DEFAULT_PATH_JRE} + else + ln -s $1 ${DEFAULT_PATH_JRE} + fi +} + +assertDefaultNotSet() { + assertNull 'Default is set' "$(readlink ${DEFAULT_PATH})" + assertNull 'Default runtime is set' "$(readlink ${DEFAULT_PATH_JRE})" +} + +assertDefaultSetTo() { + new_java=$1 + assertEquals "Default points at wrong Java env" "${new_java}" "$(readlink ${DEFAULT_PATH})" + if [ ${new_java} == */jre ]; then + assertEquals "Default runtime points at wrong Java env" "${new_java}/jre" "$(readlink ${DEFAULT_PATH_JRE})" + fi +} + +# do_status + +test_do_status() { + JAVA_NAME_1="a$(get_rand_str)" + JAVA_NAME_2="b$(get_rand_str)" + create_valid_jre_env "${JAVA_NAME_1}/jre" + set_default_for_test "${JAVA_NAME_1}/jre" + create_valid_jdk_env "${JAVA_NAME_2}" + expected=$(echo -e "Available Java environments:\n ${JAVA_NAME_1}/jre (default)\n ${JAVA_NAME_2}") + assertEquals 'Wrong status output' "${expected}" "$(do_status)" +} + +test_do_status_no_default() { + JAVA_NAME_1="a$(get_rand_str)" + JAVA_NAME_2="b$(get_rand_str)" + create_valid_jre_env "${JAVA_NAME_1}/jre" + create_valid_jdk_env "${JAVA_NAME_2}" + mess="Available Java environments:" + mess+="\n ${JAVA_NAME_1}/jre" + mess+="\n ${JAVA_NAME_2}" + mess+="\nNo Java environment set as default" + expected=$(echo -e "${mess}") + assertEquals 'Wrong status output' "${expected}" "$(do_status)" +} + +test_do_status_no_javas() { + assertEquals 'Wrong status output' 'No compatible Java environment installed' "$(do_status)" +} + +test_do_status_jre_but_jdk_exists() { + create_valid_jdk_env "${JAVA_NAME}" + set_default_for_test "${JAVA_NAME}/jre" + mess="Available Java environments:" + mess+="\n ${JAVA_NAME} (${JAVA_NAME}/jre default)" + expected=$(echo -e "${mess}") + assertEquals 'Wrong status output' "${expected}" "$(do_status)" +} + +# do_get + +test_do_get_with_default() { + create_valid_jdk_env "${JAVA_NAME}" + set_default_for_test "${JAVA_NAME}" + assertEquals 'Wrong result' "${JAVA_NAME}" "$(do_get)" + assertDefaultSetTo "${JAVA_NAME}" +} + +test_do_get_without_default() { + create_valid_jdk_env "${JAVA_NAME}" + assertNull 'Wrong result' "$(do_get)" +} + +test_do_get_without_default() { + set_default_for_test "/dev/null" + assertNull 'Wrong result' "$(do_get)" +} + +# do_set + +test_do_set_new_invalid() { + create_valid_jdk_env "${JAVA_NAME}" + set_default_for_test "${JAVA_NAME}" + output=$(do_set "INVALID") + assertEquals 'Wrong status returned' 1 $? + assertEquals 'Wrong message' "'${JVM_DIR}/INVALID' is not a valid Java environment path" "${output}" + assertDefaultSetTo "${JAVA_NAME}" +} + +test_do_set_current_invalid() { + create_valid_jdk_env "${JAVA_NAME}" + set_default_for_test "INVALID" + $(do_set "${JAVA_NAME}") + assertEquals 'Wrong status returned' 0 $? + assertDefaultSetTo "${JAVA_NAME}" +} + +test_do_set_with_default_already_set() { + create_valid_jre_env "${JAVA_NAME}/jre" + set_default_for_test "${JAVA_NAME}/jre" + JAVA_NAME_2="$(get_rand_str)" + create_valid_jre_env "${JAVA_NAME_2}/jre" + $(do_set "${JAVA_NAME_2}/jre") + assertEquals 'Wrong status returned' 0 $? + assertDefaultSetTo "${JAVA_NAME_2}/jre" +} + +test_do_set_no_default() { + create_valid_jre_env "${JAVA_NAME}/jre" + $(do_set "${JAVA_NAME}/jre") + assertEquals 'Wrong status returned' 0 $? + assertDefaultSetTo "${JAVA_NAME}/jre" +} + +test_do_set_exists_jdk() { + create_valid_jdk_env "${JAVA_NAME}" + output=$(do_set "${JAVA_NAME}/jre") + assertEquals 'Wrong status returned' 0 $? + assertDefaultSetTo "${JAVA_NAME}/jre" + #mess="Warning: '${JAVA_NAME}' looks like a valid JDK whereas you only set '${JAVA_NAME}/jre' as default" + #mess+="\nFix this with 'archlinux-java set ${JAVA_NAME}'" + #expected=$(echo -e "${mess}") + #assertEquals 'Wrong message' "${expected}" "${output}" +} + +test_do_set_cleanup_old_java_default() { + create_valid_jdk_env "${JAVA_NAME}" + set_default_for_test "${JAVA_NAME}" + output=$(do_set "${JAVA_NAME}/jre") + assertEquals 'Wrong status returned' 0 $? + assertDefaultSetTo "${JAVA_NAME}/jre" +} + +test_do_set_devnull() { + create_valid_jdk_env "${JAVA_NAME}" + set_default_for_test "/dev/null" + output=$(do_set "${JAVA_NAME}/jre") + assertEquals 'Wrong status returned' 0 $? + assertDefaultSetTo "${JAVA_NAME}/jre" +} + +# do_unset + +test_do_unset_default_not_target() { + create_valid_jre_env "${JAVA_NAME}/jre" + set_default_for_test "${JAVA_NAME}/jre" + do_unset + assertDefaultNotSet +} + +test_do_unset_no_default_link() { + create_valid_jdk_env "${JAVA_NAME}" + set_default_for_test "${JAVA_NAME}" + unlink ${DEFAULT_PATH} + do_unset + assertDefaultNotSet +} + +test_do_unset_devnull() { + set_default_for_test "/dev/null" + do_unset + assertDefaultNotSet +} + +# do_fix + +test_do_fix_default_valid() { + create_valid_jre_env "${JAVA_NAME}/jre" + set_default_for_test "${JAVA_NAME}/jre" + do_fix + assertDefaultSetTo "${JAVA_NAME}/jre" +} + +test_do_fix_no_default() { + create_valid_jre_env "${JAVA_NAME}/jre" + do_fix + assertDefaultSetTo "${JAVA_NAME}/jre" +} + +test_do_fix_default_invalid_openjdk7_jdk_installed() { + create_valid_jdk_env "java-7-openjdk" + create_valid_jdk_env "${JAVA_NAME}" + do_fix + assertDefaultSetTo "java-7-openjdk" +} + +test_do_fix_default_invalid_openjdk7_jre_installed() { + create_valid_jdk_env "${JAVA_NAME}" + create_valid_jre_env "java-7-openjdk/jre" + do_fix + assertDefaultSetTo "java-7-openjdk/jre" +} + +test_do_fix_default_invalid_random_java_installed() { + create_valid_jdk_env "${JAVA_NAME}" + do_fix + assertDefaultSetTo "${JAVA_NAME}" +} + +test_do_fix_default_invalid_no_java_installed() { + assertEquals 'Wrong message' "No valid Java environment found" "$(do_fix)" + assertDefaultNotSet +} + +test_do_fix_jre_but_jdk_exists() { + create_valid_jdk_env "${JAVA_NAME}" + set_default_for_test "${JAVA_NAME}/jre" + do_fix + assertDefaultSetTo "${JAVA_NAME}" +} + +test_do_fix_jdk_but_jre_exists() { + create_valid_jdk_env "java-7-openjdk" + create_valid_jre_env "${JAVA_NAME}/jre" + set_default_for_test "${JAVA_NAME}" + do_fix + assertDefaultSetTo "${JAVA_NAME}/jre" +} + +test_do_fix_devnull() { + create_valid_jdk_env "${JAVA_NAME}" + set_default_for_test "/dev/null" + do_fix + assertDefaultSetTo "${JAVA_NAME}" +} + +# load shunit2 +. shunit2-2.1.6/src/shunit2 diff --git a/abs/extra/java7-openjdk/PKGBUILD b/abs/extra/java7-openjdk/PKGBUILD index d05bc06..06daab6 100644 --- a/abs/extra/java7-openjdk/PKGBUILD +++ b/abs/extra/java7-openjdk/PKGBUILD @@ -1,135 +1,113 @@ -# $Id: PKGBUILD 161798 2012-06-14 14:46:00Z andyrtr $ +# $Id$ # Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Guillaume ALAUX <guillaume@archlinux.org> -pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') - # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7 +pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc') pkgbase=java7-openjdk _java_ver=7 -_updatever=u5 -_openjdk_build=b21 -_openjdk_date=27_jun_2011 -_icedtea_ver=2.2.1 -_date=20110922 - -# check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=38deb372c569 -_HOTSPOT_CHANGESET=889dffcf4a54 -_JAXP_CHANGESET=335fb0b059b7 -_JAXWS_CHANGESET=5471e01ef43b -_JDK_CHANGESET=6c3b742b735d -_LANGTOOLS_CHANGESET=beea46c7086b -_OPENJDK_CHANGESET=0b776ef59474 +_icedtea_ver=2.5.3 +pkgver() { + _updatever=$(grep -E "^JDK_UPDATE_VERSION = (.)+" ${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \ + | sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/') + echo ${_java_ver}.u${_updatever}_${_icedtea_ver} +} +pkgver=7.u71_2.5.3 +pkgrel=3 _bootstrap=0 # 0/1 for quick build or full bootstrap -pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=1 arch=('i686' 'x86_64') -url="http://icedtea.classpath.org" +url='http://icedtea.classpath.org' license=('custom') options=('!emptydirs') makedepends=('jdk7-openjdk' 'libxp' 'libxslt' 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2' - 'java-rhino' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`? -[ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj') - -#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip - -_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2 -source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz{,.sig} - ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz - ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz - ${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz - ${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz - ${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz - ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz - ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz + 'java-rhino' 'zip' 'unzip' 'cpio' 'fastjar' 'wget' + 'eclipse-ecj') + +_icedtea_url=http://icedtea.classpath.org/download +_drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver} +source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz + icedtea_${_icedtea_ver}_openjdk.tar.bz2::${_drops_url}/openjdk.tar.bz2 + icedtea_${_icedtea_ver}_corba.tar.bz2::${_drops_url}/corba.tar.bz2 + icedtea_${_icedtea_ver}_jaxp.tar.bz2::${_drops_url}/jaxp.tar.bz2 + icedtea_${_icedtea_ver}_jaxws.tar.bz2::${_drops_url}/jaxws.tar.bz2 + icedtea_${_icedtea_ver}_jdk.tar.bz2::${_drops_url}/jdk.tar.bz2 + icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2 + icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2 fontconfig-paths.diff - fix_corba_cmds_path.diff - openjdk7_fix_jdk_cmds_path.diff openjdk7_nonreparenting-wm.diff - disable_Werror.diff - jdk7-openjdk.profile - jdk7-openjdk.profile.csh - jre7-openjdk.profile - jre7-openjdk.profile.csh) -sha256sums=('0f5ba163904f7c50374ab345216dd1b66c077fc431592eb3d4801f7ecda200b6' - '0c987bff8e490a57d1e16e328a54665073ef920166342a0a08e5593aa20cd215' - '15a6eab62f5108efbf7937b1de7697bd789971886fc1fc08ee8199e16a5c10fe' - 'b892b0db6f3e4f89fd480d46ecb7c9ce5c71a884ae5bfe953b4bda9eedf7ea93' - 'ff4ab3710fe316b7adc4e57d4d21ff967ca20e2ccc5267ac26b93cd22db8b3fd' - '1ef055749ee46ebf7a5be94403b461d8d32e95c98906da459aeb217a0784ff1d' - '48a513d18c919ec08d44cffdc12ae65f1e8942924c6cfcca5c1ffa8ca38afd0e' - '17055cf1490fab1cccc57bf3aa5b32d655c408859790c7f671bfde180ddf70cb' - 'b29a8929bb4aadbc033e99dca6a381ca6342f0373b9c3f67827bfc025187ba41' + giflib_5.1.diff) + +sha256sums=('44df11ac8e5ace7194e7372ef169909e0dab31d6b2f6bbae9a9c33af2cc54540' + '3ba1a30762f5d5890e8ee6af11f52213ab9c574c01f07c75a081c42034f5d5c9' + '8ceb2cd60782b7fc14b88e3d366f273873fa5436cf0e36b86406c0905b7dc43c' + '2d13a82078f3f2b8831d1e670e5e75719336a56490df64f16ab7647674a272ef' + '5a63d85307203f1aed1e31459ad5e32687909e0640d424ff6f540d9b1cceeb1e' + '40c4dda969be0ecd213e79269184e19cfc32100b83777dc529b3cf4b6aa3e12f' + '516f6c21719f4b5a2092847c147cde7890c5a30d4aed9425ff667c0164ef1dd0' + '8c8e1f7e97f47fe4029e0b0ba42b3515474adabe64e1fbee15c0e2e22a13aa28' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' - '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' - 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' - 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' - 'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97' - '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410' - '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' - 'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a' - '84d3b91cc57c67b2cf2ddb7fe5abcf1e88b5a151565aaecf4b595c7ce8f3fee9') - -noextract=("${_OPENJDK_CHANGESET}.tar.gz" - "${_CORBA_CHANGESET}.tar.gz" - "${_JAXP_CHANGESET}.tar.gz" - "${_JAXWS_CHANGESET}.tar.gz" - "${_JDK_CHANGESET}.tar.gz" - "${_LANGTOOLS_CHANGESET}.tar.gz" - "${_HOTSPOT_CHANGESET}.tar.gz") - - _jvmdir=/usr/lib/jvm/java-7-openjdk - - [ "$CARCH" = "x86_64" ] && _JARCH=amd64 - [ "$CARCH" = "i686" ] && _JARCH=i386 - + '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b' + '77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9') + +noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2 + icedtea_${_icedtea_ver}_corba.tar.bz2 + icedtea_${_icedtea_ver}_jaxp.tar.bz2 + icedtea_${_icedtea_ver}_jaxws.tar.bz2 + icedtea_${_icedtea_ver}_jdk.tar.bz2 + icedtea_${_icedtea_ver}_langtools.tar.bz2 + icedtea_${_icedtea_ver}_hotspot.tar.bz2) + +[ "$CARCH" = "x86_64" ] && _JARCH=amd64 +[ "$CARCH" = "i686" ] && _JARCH=i386 + +_jvmdir=/usr/lib/jvm/java-7-openjdk +_imgdir="icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image" +_nonheadless=(bin/policytool + lib/${_JARCH}/libjsoundalsa.so + lib/${_JARCH}/libsplashscreen.so + lib/${_JARCH}/xawt/libmawt.so) + build() { cd "${srcdir}/icedtea-${_icedtea_ver}" - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - # default is to build with first found java-environment found in our repos - is jdk7-openjdk - [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh - -# unset MAKEFLAGS # parallel build is currently broken - export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" . /etc/profile.d/apache-ant.sh - cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches - export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff patches/disable_Werror.diff" + cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches + export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \ + patches/openjdk7_nonreparenting-wm.diff \ + patches/giflib_5.1.diff" if [ "$_bootstrap" = "1" ]; then BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar" - else + else BOOTSTRAPOPT="--disable-bootstrap" fi ./configure \ - $BOOTSTRAPOPT \ + ${BOOTSTRAPOPT} \ --with-parallel-jobs="${MAKEFLAGS/-j}" \ --disable-tests \ - --with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \ + --disable-downloading --disable-Werror \ + --with-pkgversion="Arch Linux build ${pkgver}-${pkgrel}-${CARCH}" \ --with-jdk-home=${JAVA_HOME} \ - --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \ - --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \ - --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \ - --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \ - --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \ - --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \ - --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \ + --with-openjdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_openjdk.tar.bz2" \ + --with-hotspot-src-zip="${srcdir}/icedtea_${_icedtea_ver}_hotspot.tar.bz2" \ + --with-corba-src-zip="${srcdir}/icedtea_${_icedtea_ver}_corba.tar.bz2" \ + --with-jaxp-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxp.tar.bz2" \ + --with-jaxws-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxws.tar.bz2" \ + --with-jdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jdk.tar.bz2" \ + --with-langtools-src-zip="${srcdir}/icedtea_${_icedtea_ver}_langtools.tar.bz2" \ --enable-nss \ --with-rhino \ - --with-abs-install-dir=${_jvmdir} - #--help - #--enable-systemtap Enable inclusion of SystemTap trace support - needs systemtab from AUR - + --with-abs-install-dir=${_jvmdir} \ + --enable-infinality=no + # TODO latest version of openjdk will disable infinality by default make } @@ -139,214 +117,193 @@ check() { } package_jre7-openjdk-headless() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs" - depends=('libjpeg-turbo' 'lcms2' 'nss' - 'ca-certificates-java' 'java-rhino') - optdepends=('libcups: needed for Java Mauve support - libmawt.so' - 'fontconfig: needed for Java Mauve support - libmawt.so') - provides=('java-runtime-headless=7') + pkgdesc='OpenJDK Java 7 headless runtime environment' + depends=('java-runtime-common' 'libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-utils' 'libcups') + optdepends=('fontconfig: needed for Java Mauve support - libmawt.so' + 'java-rhino: for some JavaScript support') + provides=('java-runtime-headless=7' 'java-runtime-headless-openjdk=7') conflicts=('openjdk6') - # replaces=('openjdk6') # once we remove openjdk6 pkg from the repos - backup=(etc/profile.d/jre.sh - etc/profile.d/jre.csh - etc/java-7-openjdk/calendars.properties - etc/java-7-openjdk/content-types.properties - etc/java-7-openjdk/cursors/cursors.properties - etc/java-7-openjdk/flavormap.properties - etc/java-7-openjdk/fontconfig.bfc - etc/java-7-openjdk/fontconfig.properties - etc/java-7-openjdk/jvm.cfg - etc/java-7-openjdk/logging.properties - etc/java-7-openjdk/management/jmxremote.access - etc/java-7-openjdk/management/jmxremote.password - etc/java-7-openjdk/management/management.properties - etc/java-7-openjdk/management/snmp.acl - etc/java-7-openjdk/net.properties - etc/java-7-openjdk/psfont.properties.ja - etc/java-7-openjdk/psfontj2d.properties - etc/java-7-openjdk/security/java.policy - etc/java-7-openjdk/security/java.security - etc/java-7-openjdk/security/nss.cfg - etc/java-7-openjdk/sound.properties - etc/java-7-openjdk/tz.properties) + # TODO remove after some time + replaces=('jre7-openjdk-headless-wm') + # Upstream config files that should go to etc and get backup + _backup_etc=(etc/java-7-openjdk/${_JARCH}/jvm.cfg + etc/java-7-openjdk/calendars.properties + etc/java-7-openjdk/content-types.properties + etc/java-7-openjdk/flavormap.properties + etc/java-7-openjdk/fontconfig.bfc + etc/java-7-openjdk/fontconfig.properties + etc/java-7-openjdk/images/cursors/cursors.properties + etc/java-7-openjdk/logging.properties + etc/java-7-openjdk/management/jmxremote.access + etc/java-7-openjdk/management/jmxremote.password + etc/java-7-openjdk/management/management.properties + etc/java-7-openjdk/management/snmp.acl + etc/java-7-openjdk/net.properties + etc/java-7-openjdk/psfont.properties.ja + etc/java-7-openjdk/psfontj2d.properties + etc/java-7-openjdk/security/java.policy + etc/java-7-openjdk/security/java.security + etc/java-7-openjdk/security/nss.cfg + etc/java-7-openjdk/sound.properties + etc/java-7-openjdk/tz.properties) + backup=(${_backup_etc[@]}) install=jre7-openjdk-headless.install - cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre" + cd "${srcdir}/${_imgdir}/jre" - mv lib/fontconfig.Ubuntu.properties.src lib/fontconfig.properties - mv lib/fontconfig.Ubuntu.bfc lib/fontconfig.bfc - rm -f lib/fontconfig.*.bfc - rm -f lib/fontconfig.*.properties.src - rm -f lib/fontconfig.properties.src + install -d -m755 "${pkgdir}${_jvmdir}/jre" + cp -a bin lib "${pkgdir}${_jvmdir}/jre" - install -d -m755 ${pkgdir}/${_jvmdir}/jre/ - cp -a bin lib ${pkgdir}/${_jvmdir}/jre + # Set config files + mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.properties.src,properties} + mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.bfc,bfc} + mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,} + mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,} + rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.bfc + rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.properties.src + rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.properties.src - # Install man pages - pushd ../../j2re-image/man - install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/ - install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1 - install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1 - popd - - # more files that belong to the desktop package - mkdir ${srcdir}/tmp-desktop-jre - for file in \ - "/usr/lib/jvm/java-7-openjdk/jre/bin/policytool" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libjsoundalsa.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libsplashscreen.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt/libmawt.so" \ - "/usr/share/man/ja/man1/policytool.1" \ - "/usr/share/man/man1/policytool.1"; do - dirname=`dirname $file` - install -dm755 ${srcdir}/tmp-desktop-jre/$dirname || /bin/true - # mv file from fakeinstall to pkgdir - mv ${pkgdir}/$file ${srcdir}/tmp-desktop-jre$file + # Remove 'non-headless' files + for f in ${_nonheadless[@]}; do + rm "${pkgdir}${_jvmdir}/jre/${f}" done - rmdir ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt - # Link binaries into /usr/bin - pushd ${pkgdir}/${_jvmdir}/jre/bin - install -m755 -d ${pkgdir}/usr/bin/ + # Man pages + pushd "${pkgdir}${_jvmdir}/jre/bin" + install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/ for file in *; do - ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin + install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \ + "${pkgdir}/usr/share/man/man1/${file}.1" + install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \ + "${pkgdir}/usr/share/man/ja/man1/${file}.1" done popd - # Link JKS keystore from ca-certificates-java - rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts - ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts" - - # Set some variables - install -m755 -d ${pkgdir}/etc/profile.d/ - install -m755 ${srcdir}/jre7-openjdk.profile ${pkgdir}/etc/profile.d/jre.sh - install -m755 ${srcdir}/jre7-openjdk.profile.csh ${pkgdir}/etc/profile.d/jre.csh + # Link JKS keystore from ca-certificates-utils + rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" + ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" # Install license - install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/ + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgbase}/" install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ - ${pkgdir}/usr/share/licenses/${pkgbase} - - # Put some more files under backup control - install -m755 -d ${pkgdir}/etc/java-7-openjdk/ - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/ - # install dummy links to make them found by JAVA - cd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/ - for file in `ls ${pkgdir}/etc/java-7-openjdk/*.properties*`; do - ln -vsf /etc/java-7-openjdk/`basename $file` . + "${pkgdir}/usr/share/licenses/${pkgbase}" + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" + + # Move config files that were set in _backup_etc from ./lib to /etc + for file in ${_backup_etc[@]}; do + _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-7-openjdk/} + install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}" + ln -sf /${file} "${pkgdir}${_filepkgpath}" done - # some more - install -m755 -d ${pkgdir}/etc/java-7-openjdk/{cursors,management,security} - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/cursors.properties ${pkgdir}/etc/java-7-openjdk/cursors/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/ - ln -vsf /etc/java-7-openjdk/cursors/cursors.properties . - popd - mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password - mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} ${pkgdir}/etc/java-7-openjdk/management/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management - ln -vsf /etc/java-7-openjdk/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} . - popd - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security/{java.policy,java.security,nss.cfg} ${pkgdir}/etc/java-7-openjdk/security/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security - ln -vsf /etc/java-7-openjdk/security/{java.policy,java.security,nss.cfg} . - popd - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/ - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/ - ln -vsf /etc/java-7-openjdk/jvm.cfg . - popd } - + package_jre7-openjdk() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs -Full Java runtime environment - needed for executing Java GUI and Webstart programs" - depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme') - optdepends=('icedtea-web-java7: web browser plugin + Java Web Start' + pkgdesc='OpenJDK Java 7 full runtime environment' + depends=("jre7-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme') + optdepends=('icedtea-web: web browser plugin + Java Web Start' 'alsa-lib: for basic sound support' 'giflib: for gif format support' 'gtk2: for the Gtk+ look and feel - desktop usage' 'libxtst: linked in xawt/libmawt.so - desktop usage') - install=jre7-openjdk.install - provides=('java-runtime=7') + provides=('java-runtime=7' 'java-runtime-openjdk=7') conflicts=('openjdk6') - - mv ${srcdir}/tmp-desktop-jre/* ${pkgdir} - # Link binaries into /usr/bin - pushd ${pkgdir}/${_jvmdir}/jre/bin - install -m755 -d ${pkgdir}/usr/bin/ + # TODO remove after some time + replaces=('jre7-openjdk-wm') + install=jre7-openjdk.install + + cd "${srcdir}/${_imgdir}/jre" + + for f in ${_nonheadless[@]}; do + install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}" + done + + # Man pages + pushd "${pkgdir}${_jvmdir}/jre/bin" + install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/ for file in *; do - ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin + install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \ + "${pkgdir}/usr/share/man/man1/${file}.1" + install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \ + "${pkgdir}/usr/share/man/ja/man1/${file}.1" done popd - - cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre" - - # Install icons and menu entries - for s in 16 24 32 48 ; do - install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/ - install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \ - ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png + + for s in 16 24 32 48; do + install -D -m 644 \ + "${srcdir}/icedtea-${_icedtea_ver}/openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png" \ + "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png" done - + # Install desktop files. - install -m755 -d ${pkgdir}/usr/share/applications - install -m644 ${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop ${pkgdir}/usr/share/applications + install -d -m755 "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" "${pkgdir}/usr/share/applications" + + # link license + install -d -m755 "${pkgdir}/usr/share/licenses" + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" } package_jdk7-openjdk() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK" - depends=('jre7-openjdk') - provides=('java-environment=7') - conflicts=('java-environment') - # replaces=('openjdk6') - backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh) + pkgdesc='OpenJDK Java 7 development kit' + depends=('java-environment-common' "jre7-openjdk=${pkgver}-${pkgrel}") + provides=('java-environment=7' 'java-environment-openjdk=7') + replaces=('openjdk6' 'jdk7-openjdk-wm') + install=jdk7-openjdk.install - cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image" + cd "${srcdir}/${_imgdir}" # Main files - install -m755 -d ${pkgdir}/${_jvmdir}/ + install -d -m755 "${pkgdir}${_jvmdir}" - cp -a demo include lib sample ${pkgdir}/${_jvmdir} + cp -a include lib "${pkgdir}${_jvmdir}" # 'bin' files pushd bin - install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \ - ${pkgdir}/usr/bin/ \ - ${pkgdir}/usr/share/man/{,ja/}man1/ + install -d -m755 "${pkgdir}${_jvmdir}/bin/" \ + "${pkgdir}"/usr/share/man/{,ja/}man1/ # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page for b in $(ls | grep -v java-rmi.cgi); do if [ -e ../jre/bin/${b} ]; then # Provide a link of the jre binary in the jdk/bin/ directory - ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b} + ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}" else # Copy binary to jdk/bin/ - install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b} + install -m755 ${b} "${pkgdir}${_jvmdir}/bin/${b}" # Copy man page - install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1 - install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1 - # Link from /bin/ - ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b} + install -m644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}.1" + install -m644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}.1" fi done popd + # Handling 'java-rmi.cgi' separately + install -D -m755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi" + # Install desktop files. - install -m755 -d ${pkgdir}/usr/share/applications - install -m644 ${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop ${pkgdir}/usr/share/applications + install -d -m755 "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" "${pkgdir}/usr/share/applications" - # Handling 'java-rmi.cgi' separately - install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi + # Temporarily fixing FS#35141 + chmod go+r "${pkgdir}${_jvmdir}/lib/sa-jdi.jar" - # Set some variables - install -m755 -d ${pkgdir}/etc/profile.d/ - install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh - install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh + # link license + install -d -m755 "${pkgdir}/usr/share/licenses" + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" } package_openjdk7-src() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources" + pkgdesc='OpenJDK Java 7 sources' + replaces=('openjdk6-src') - install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \ - ${pkgdir}/${_jvmdir}/src.zip + install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip" +} + +package_openjdk7-doc() { + pkgdesc='OpenJDK Java 7 documentation' + + install -d -m755 "${pkgdir}/usr/share/doc/openjdk7-doc" + for i in "${srcdir}"/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do + cp -a $i "${pkgdir}/usr/share/doc/openjdk7-doc/" + done } diff --git a/abs/extra/java7-openjdk/disable_Werror.diff b/abs/extra/java7-openjdk/disable_Werror.diff deleted file mode 100644 index fa8887a..0000000 --- a/abs/extra/java7-openjdk/disable_Werror.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- openjdk/hotspot/make/linux/makefiles/gcc.make 2012-06-07 16:30:51.000000000 +0200 -+++ openjdk/hotspot/make/linux/makefiles/gcc.make.new 2012-06-14 15:32:44.967695139 +0200 -@@ -150,7 +150,7 @@ - endif - - # Compiler warnings are treated as errors --WARNINGS_ARE_ERRORS = -Werror -+#WARNINGS_ARE_ERRORS = -Werror - - # Except for a few acceptable ones - # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit diff --git a/abs/extra/java7-openjdk/fix_corba_cmds_path.diff b/abs/extra/java7-openjdk/fix_corba_cmds_path.diff deleted file mode 100644 index 7a3db95..0000000 --- a/abs/extra/java7-openjdk/fix_corba_cmds_path.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 -+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 -@@ -76,7 +76,7 @@ - CHMOD = $(UTILS_COMMAND_PATH)chmod - CMP = $(UTILS_USR_BIN_PATH)cmp - COMM = $(UTILS_USR_BIN_PATH)comm --COMPRESS = $(UTILS_USR_BIN_PATH)compress -+COMPRESS = $(UTILS_COMMAND_PATH)compress - CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio - CUT = $(UTILS_USR_BIN_PATH)cut -@@ -125,7 +125,7 @@ - TAIL = $(UTILS_USR_BIN_PATH)tail - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test --TOUCH = $(UTILS_COMMAND_PATH)touch -+TOUCH = $(UTILS_USR_BIN_PATH)touch - TR = $(UTILS_USR_BIN_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname -@@ -176,7 +176,7 @@ - # others have it in /usr/bin. - SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ - $(wildcard $(UTILS_USR_BIN_PATH)sort)) -- NAWK = $(USRBIN_PATH)gawk -+ NAWK = $(UTILS_COMMAND_PATH)gawk - # Intrinsic unix command, with backslash-escaped character interpretation - ECHO = /bin/echo -e - # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/abs/extra/java7-openjdk/giflib_5.1.diff b/abs/extra/java7-openjdk/giflib_5.1.diff new file mode 100644 index 0000000..a936157 --- /dev/null +++ b/abs/extra/java7-openjdk/giflib_5.1.diff @@ -0,0 +1,14 @@ +--- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.orig 2014-05-27 22:17:19.766866065 +0200 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2014-05-27 22:16:35.452894426 +0200 +@@ -310,7 +310,11 @@ + free(pBitmapBits); + free(pOldBitmapBits); + ++#if GIFLIB_MAJOR >= 5 ++ DGifCloseFile(gif, NULL); ++#else + DGifCloseFile(gif); ++#endif + + return 1; + } diff --git a/abs/extra/java7-openjdk/jdk7-openjdk.install b/abs/extra/java7-openjdk/jdk7-openjdk.install new file mode 100644 index 0000000..92b440e --- /dev/null +++ b/abs/extra/java7-openjdk/jdk7-openjdk.install @@ -0,0 +1,50 @@ +THIS_JDK='java-7-openjdk' + +fix_default() { + if [ ! -x /usr/bin/java ]; then + /usr/bin/archlinux-java unset + echo "" + else + /usr/bin/archlinux-java get + fi +} + +post_install() { + default=$(fix_default) + case ${default} in + "" | ${THIS_JDK}/jre) + /usr/bin/archlinux-java set ${THIS_JDK} + ;; + ${THIS_JDK}) + # Nothing + ;; + *) + echo "Default Java environment is already set to '${default}'" + echo "See 'archlinux-java help' to change it" + ;; + esac + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/bin/update-ca-trust + fi +} + +post_upgrade() { + default=$(fix_default) + if [ -z "${default}" -o "x${default}" = "x${THIS_JDK}/jre" ]; then + /usr/bin/archlinux-java set ${THIS_JDK} + fi + + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/bin/update-ca-trust + fi +} + +pre_remove() { + if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then + sudo /usr/bin/archlinux-java unset + if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then + sudo /usr/bin/archlinux-java set ${THIS_JDK}/jre + fi + fi +} diff --git a/abs/extra/java7-openjdk/jdk7-openjdk.profile b/abs/extra/java7-openjdk/jdk7-openjdk.profile deleted file mode 100644 index 91265cc..0000000 --- a/abs/extra/java7-openjdk/jdk7-openjdk.profile +++ /dev/null @@ -1,6 +0,0 @@ -export J2SDKDIR=/usr/lib/jvm/java-7-openjdk -export J2REDIR=$J2SDKDIR/jre -export JAVA_HOME=/usr/lib/jvm/java-7-openjdk - -# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING' -# in /etc/profile.d/jre7.sh diff --git a/abs/extra/java7-openjdk/jdk7-openjdk.profile.csh b/abs/extra/java7-openjdk/jdk7-openjdk.profile.csh deleted file mode 100644 index cc7dc8a..0000000 --- a/abs/extra/java7-openjdk/jdk7-openjdk.profile.csh +++ /dev/null @@ -1 +0,0 @@ -setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk" diff --git a/abs/extra/java7-openjdk/jre7-openjdk-headless.install b/abs/extra/java7-openjdk/jre7-openjdk-headless.install index 45f52fe..6f0ad5d 100644 --- a/abs/extra/java7-openjdk/jre7-openjdk-headless.install +++ b/abs/extra/java7-openjdk/jre7-openjdk-headless.install @@ -1,15 +1,48 @@ +THIS_JRE='java-7-openjdk/jre' + +fix_default() { + if [ ! -x /usr/bin/java ]; then + /usr/bin/archlinux-java unset + echo "" + else + /usr/bin/archlinux-java get + fi +} + post_install() { + default=$(fix_default) + case ${default} in + "") + /usr/bin/archlinux-java set ${THIS_JRE} + ;; + ${THIS_JRE} | ${THIS_JRE/\/jre}) + # Nothing + ;; + *) + echo "Default Java environment is already set to '${default}'" + echo "See 'archlinux-java help' to change it" + ;; + esac + if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore + /usr/bin/update-ca-trust fi } post_upgrade() { + if [ -z $(fix_default) ]; then + /usr/bin/archlinux-java set ${THIS_JRE} + fi + if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore + /usr/bin/update-ca-trust fi } -#post_remove() { -# -#} +pre_remove() { + default=$(fix_default) + if [ "x${default/\/jre}" = "x${THIS_JRE/\/jre}" ]; then + /usr/bin/archlinux-java unset + echo "No Java environment is set as default anymore" + fi +} diff --git a/abs/extra/java7-openjdk/jre7-openjdk.install b/abs/extra/java7-openjdk/jre7-openjdk.install index d98e79e..78e694f 100644 --- a/abs/extra/java7-openjdk/jre7-openjdk.install +++ b/abs/extra/java7-openjdk/jre7-openjdk.install @@ -1,18 +1,55 @@ +THIS_JRE='java-7-openjdk/jre' + +fix_default() { + if [ ! -x /usr/bin/java ]; then + /usr/bin/archlinux-java unset + echo "" + else + /usr/bin/archlinux-java get + fi +} + post_install() { + default=$(fix_default) + case ${default} in + "") + /usr/bin/archlinux-java set ${THIS_JRE} + ;; + ${THIS_JRE} | ${THIS_JRE/\/jre}) + # Nothing + ;; + *) + echo "Default Java environment is already set to '${default}'" + echo "See 'archlinux-java help' to change it" + ;; + esac + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - echo "when you use a non-reparenting window manager" - echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" - echo "/etc/profile.d/jre.sh" + echo "when you use a non-reparenting window manager," + echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh" + # update-desktop-database -q } post_upgrade() { + if [ -z $(fix_default) ]; then + /usr/bin/archlinux-java set ${THIS_JRE} + fi + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + # update-desktop-database -q } +pre_remove() { + if [ "x$(fix_default)" = "x${THIS_JRE/\/jre}" ]; then + /usr/bin/archlinux-java unset + echo "No Java environment is set as default anymore" + fi +} post_remove() { xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + # update-desktop-database -q } diff --git a/abs/extra/java7-openjdk/jre7-openjdk.profile b/abs/extra/java7-openjdk/jre7-openjdk.profile deleted file mode 100644 index c86ce85..0000000 --- a/abs/extra/java7-openjdk/jre7-openjdk.profile +++ /dev/null @@ -1,5 +0,0 @@ -export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre -export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre} - -# enable this for non-reparenting window managers -#export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/abs/extra/java7-openjdk/jre7-openjdk.profile.csh b/abs/extra/java7-openjdk/jre7-openjdk.profile.csh deleted file mode 100644 index a9aed27..0000000 --- a/abs/extra/java7-openjdk/jre7-openjdk.profile.csh +++ /dev/null @@ -1,5 +0,0 @@ -setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre" -setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre" - -# enable this for non-reparenting window managers -#setenv _JAVA_AWT_WM_NONREPARENTING 1 diff --git a/abs/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/abs/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff deleted file mode 100644 index 6cac91d..0000000 --- a/abs/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200 -+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200 -@@ -91,7 +91,7 @@ - CHMOD = $(UTILS_COMMAND_PATH)chmod - CMP = $(UTILS_USR_BIN_PATH)cmp - COMM = $(UTILS_USR_BIN_PATH)comm --COMPRESS = $(UTILS_USR_BIN_PATH)compress -+COMPRESS = $(UTILS_COMMAND_PATH)compress - CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio - CUT = $(UTILS_USR_BIN_PATH)cut -@@ -101,13 +101,13 @@ - DIRNAME = $(UTILS_USR_BIN_PATH)dirname - DUMP = $(UTILS_CCS_BIN_PATH)dump - ECHO = $(UTILS_COMMAND_PATH)echo --EGREP = $(UTILS_COMMAND_PATH)egrep -+EGREP = $(UTILS_USR_BIN_PATH)egrep - EXPR = $(UTILS_USR_BIN_PATH)expr - FILE = $(UTILS_USR_BIN_PATH)file - FIND = $(UTILS_USR_BIN_PATH)find - FMT = $(UTILS_COMMAND_PATH)fmt - GDB = $(UTILS_USR_BIN_PATH)gdb --GREP = $(UTILS_COMMAND_PATH)grep -+GREP = $(UTILS_USR_BIN_PATH)grep - GUNZIP = $(UTILS_COMMAND_PATH)gunzip - # GZIP is used for solaris. Linux and windows use tar czf - GZIP = $(UTILS_COMMAND_PATH)gzip -@@ -140,7 +140,7 @@ - TAIL = $(UTILS_USR_BIN_PATH)tail - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test --TOUCH = $(UTILS_COMMAND_PATH)touch -+TOUCH = $(UTILS_USR_BIN_PATH)touch - TR = $(UTILS_USR_BIN_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname diff --git a/abs/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff b/abs/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff index 22d54fc..fb4710c 100644 --- a/abs/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff +++ b/abs/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff @@ -1,16 +1,16 @@ ---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2011-08-07 18:45:05.000000000 +0200 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-08-07 18:45:54.000000000 +0200 -@@ -103,7 +103,8 @@ - COMPIZ_WM = 12, +--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2013-10-16 16:17:14.000000000 +0200 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2013-10-21 20:57:34.768580842 +0200 +@@ -105,7 +105,8 @@ LG3D_WM = 13, CWM_WM = 14, -- MUTTER_WM = 15; -+ MUTTER_WM = 15, -+ OTHER_NONREPARENTING_WM = 16; + MUTTER_WM = 15, +- MARCO_WM = 16; ++ MARCO_WM = 16, ++ OTHER_NONREPARENTING_WM = 17; public String toString() { switch (WMID) { case NO_WM: -@@ -583,7 +584,7 @@ +@@ -591,7 +592,7 @@ // TODO: according to wikipedia, compiz is now reparenting. This should // probably be updated. static boolean isNonReparentingWM() { @@ -19,7 +19,7 @@ } /* -@@ -771,9 +772,17 @@ +@@ -781,9 +782,17 @@ * supports WIN or _NET wm spec. */ else if (l_net_protocol.active()) { @@ -28,18 +28,18 @@ + awt_wmgr = XWM.OTHER_NONREPARENTING_WM; + } else { + awt_wmgr = XWM.OTHER_WM; -+ } ++ } } else if (win.active()) { - awt_wmgr = XWM.OTHER_WM; + if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { + awt_wmgr = XWM.OTHER_NONREPARENTING_WM; + } else { + awt_wmgr = XWM.OTHER_WM; -+ } ++ } } /* * Check for legacy WMs. -@@ -784,6 +793,8 @@ +@@ -794,6 +803,8 @@ awt_wmgr = XWM.MOTIF_WM; } else if (isOpenLook()) { awt_wmgr = XWM.OPENLOOK_WM; @@ -48,7 +48,7 @@ } else { awt_wmgr = XWM.OTHER_WM; } -@@ -1298,6 +1309,7 @@ +@@ -1309,6 +1320,7 @@ res = new Insets(28, 6, 6, 6); break; case NO_WM: diff --git a/abs/extra/jbigkit/PKGBUILD b/abs/extra/jbigkit/PKGBUILD new file mode 100644 index 0000000..76de230 --- /dev/null +++ b/abs/extra/jbigkit/PKGBUILD @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) + +pkgname=jbigkit +pkgver=2.1 +pkgrel=2 +pkgdesc="Data compression library/utilities for bi-level high-resolution images" +arch=('i686' 'x86_64') +url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/" +license=('GPL') +depends=() +options=('staticlibs') +source=(http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-$pkgver.tar.gz) +md5sums=('ebcf09bed9f14d7fa188d3bd57349522') + +build() { + cd $srcdir/$pkgname-$pkgver + unset CFLAGS CPPFLAGS LDFLAGS + [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" + make CFLAGS="$CFLAGS" +} + +package() { + cd $srcdir/$pkgname-$pkgver + + install -D -m644 libjbig/libjbig.a $pkgdir/usr/lib/libjbig.a + install -D -m644 libjbig/libjbig85.a $pkgdir/usr/lib/libjbig85.a + install -D -m644 libjbig/jbig.h $pkgdir/usr/include/jbig.h + install -D -m644 libjbig/jbig_ar.h $pkgdir/usr/include/jbig_ar.h + install -D -m644 libjbig/jbig85.h $pkgdir/usr/include/jbig85.h + + install -d -m755 $pkgdir/usr/share/man/man1 +# install -d -m755 $pkgdir/usr/share/man/man5 + install -m644 pbmtools/*.1* $pkgdir/usr/share/man/man1 +# install -m644 pbmtools/*.5* $pkgdir/usr/share/man/man5 + + install -D -m755 pbmtools/jbgtopbm $pkgdir/usr/bin/jbgtopbm + install -D -m755 pbmtools/pbmtojbg $pkgdir/usr/bin/pbmtojbg + install -D -m755 pbmtools/jbgtopbm85 $pkgdir/usr/bin/jbgtopbm85 + install -D -m755 pbmtools/pbmtojbg85 $pkgdir/usr/bin/pbmtojbg85 + + rm -f $pkgdir/usr/share/man/man5/p{b,g}m.5* +} diff --git a/abs/extra/jemalloc/PKGBUILD b/abs/extra/jemalloc/PKGBUILD new file mode 100644 index 0000000..5660be9 --- /dev/null +++ b/abs/extra/jemalloc/PKGBUILD @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Kovivchak Evgen <oneonfire@gmail.com> + +pkgname=jemalloc +pkgver=3.6.0 +pkgrel=1 +pkgdesc="General-purpose scalable concurrent malloc implementation" +arch=('i686' 'x86_64') +license=('BSD') +url="http://www.canonware.com/jemalloc/" +depends=('glibc') +makedepends=('autoconf' 'make' 'bash') +optdepends=( + 'perl: memory profiler' +) +source=(http://www.canonware.com/download/jemalloc/$pkgname-$pkgver.tar.bz2) + +build() { + cd "$srcdir/$pkgname-$pkgver" + CFLAGS="$CFLAGS -std=gnu11" ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + mv "$pkgdir"/usr/bin/{,jemalloc-}pprof + chmod 644 "$pkgdir"/usr/lib/*.a + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +sha256sums=('e16c2159dd3c81ca2dc3b5c9ef0d43e1f2f45b04548f42db12e7c12d7bdf84fe') diff --git a/abs/extra/js17/PKGBUILD b/abs/extra/js17/PKGBUILD new file mode 100644 index 0000000..980e8f0 --- /dev/null +++ b/abs/extra/js17/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 183635 2013-04-25 18:13:54Z ioni $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=js17 +pkgver=17.0.0 +pkgrel=1 +pkgdesc="JavaScript interpreter and libraries (legacy)" +arch=(i686 x86_64) +url="https://developer.mozilla.org/En/SpiderMonkey/17" +license=(MPL) +depends=(nspr gcc-libs readline) +makedepends=(python2 zip libffi) +conflicts=('js<24.2.0') +options=(!staticlibs) +source=(http://ftp.mozilla.org/pub/mozilla.org/js/mozjs$pkgver.tar.gz) +md5sums=('20b6f8f1140ef6e47daa3b16965c9202') + +build() { + unset CPPFLAGS + cd mozjs$pkgver/js/src + ./configure --prefix=/usr --with-system-nspr --with-system-ffi \ + --enable-readline --enable-threadsafe + make +} + +check() { + cd mozjs$pkgver/js/src + make check +} + +package() { + cd mozjs$pkgver/js/src + make DESTDIR="$pkgdir" install + find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -x {} + +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/json-glib/PKGBUILD b/abs/extra/json-glib/PKGBUILD new file mode 100644 index 0000000..9ad0257 --- /dev/null +++ b/abs/extra/json-glib/PKGBUILD @@ -0,0 +1,30 @@ +# $Id$ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=json-glib +pkgver=1.0.2 +pkgrel=1 +pkgdesc="JSON library built on GLib" +arch=('i686' 'x86_64') +url="http://live.gnome.org/JsonGlib" +license=('GPL') +depends=('glib2') +makedepends=('gobject-introspection') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a') + +build(){ + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} + +check(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} diff --git a/abs/extra/kodi-pvr-addons/PKGBUILD b/abs/extra/kodi-pvr-addons/PKGBUILD new file mode 100644 index 0000000..bf9c6d0 --- /dev/null +++ b/abs/extra/kodi-pvr-addons/PKGBUILD @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: BlackEagle <ike.devolder@gmail.com>> + +pkgname=kodi-pvr-addons +pkgver=20141212 +_relname='Helix_rc3' +pkgrel=2 +pkgdesc="PVR add-ons for current stable kodi" +arch=('i686' 'x86_64') +url="https://github.com/opdenkamp/xbmc-pvr-addons" +license=('GPL3') +groups=('kodi-addons') +depends=('kodi') +makedepends=('git') +optdepends=('tvheadend-git: tvheadend backend' 'mythtv: mythtv backend') +replaces=('xbmc-pvr-addons') +conflicts=('xbmc-pvr-addons' 'xbmc-pvr-addons-git') +source=("$pkgname-$pkgver.tar.gz::https://github.com/opdenkamp/xbmc-pvr-addons/archive/${_relname}.tar.gz") + +build() { + cd "$srcdir/xbmc-pvr-addons-${_relname}" + ./bootstrap + ./configure --prefix=/usr --enable-addons-with-dependencies + make +} + +package() { + cd "$srcdir/xbmc-pvr-addons-${_relname}" + make DESTDIR="$pkgdir/" install +} + +sha256sums=('e48de53c58245e512095d515d463f013e51e165fc617f1cb93e443cdd9f5096b') diff --git a/abs/extra/kodi/PKGBUILD b/abs/extra/kodi/PKGBUILD new file mode 100644 index 0000000..91fe23c --- /dev/null +++ b/abs/extra/kodi/PKGBUILD @@ -0,0 +1,135 @@ +# vim:set ts=2 sw=2 et: +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Contributor: Brad Fanella <bradfanella@archlinux.us> +# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> +# Contributor: Zeqadious <zeqadious.at.gmail.dot.com> +# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor: Maxime Gauduin <alucryd@gmail.com> + +_prefix=/usr + +pkgbase=kodi +pkgname=('kodi' 'kodi-eventclients') +pkgver=14.0 +_codename=Helix +pkgrel=2 +arch=('i686' 'x86_64') +url="http://kodi.tv" +license=('GPL2') +makedepends=( + 'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'git' 'glew' + 'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' 'libass' + 'libbluray' 'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd' + 'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libssh' 'libva' + 'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow' + 'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'sdl2' 'sdl_image' + 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' 'yajl' 'zip' +) +source=( + "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" + 'kodi.sh' + 'kodi_lib.conf' +) + +prepare() { + cd "$srcdir/xbmc-$pkgver-$_codename" + + find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" + + sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl + sed 's/python/python2/' -i tools/Linux/kodi.sh.in +} + +build() { + cd "$srcdir/xbmc-$pkgver-$_codename" + + # Bootstrapping + MAKEFLAGS=-j1 ./bootstrap + + #./configure --help + #return 1 + + # Configuring XBMC + export PYTHON_VERSION=2 # external python v2 + ./configure --prefix=$_prefix --exec-prefix=$_prefix \ + --disable-debug \ + --enable-optimizations \ + --enable-libbluray \ + --enable-external-libraries \ + --with-lirc-device=/run/lirc/lircd + + # Now (finally) build + make +} + +package_kodi() { + pkgdesc="A software media player and entertainment hub for digital media" + + # depends expected for kodi plugins: + # 'python2-pillow' 'python2-pybluez' 'python2-simplejson' + # depends expeced in FEH.py + # 'mesa-demos' 'xorg-xdpyinfo' + depends=( + 'python2-pillow' 'python2-pybluez' 'python2-simplejson' + 'mesa-demos' 'xorg-xdpyinfo' + 'bluez-libs' 'fribidi' 'glew' 'hicolor-icon-theme' 'libcdio' + 'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libssh' + 'libva' 'libxrandr' 'libxslt' 'lzo' 'sdl2' 'smbclient' 'taglib' 'tinyxml' + 'yajl' + ) + optdepends=( + 'afpfs-ng: Apple shares support' + 'bluez: Blutooth support' + 'libnfs: NFS shares support' + 'libplist: AirPlay support' + 'libcec: Pulse-Eight USB-CEC adapter support' + 'lirc: Remote controller support' + 'shairplay: AirPlay support' + 'udisks: Automount external drives' + 'unrar: Archives support' + 'unzip: Archives support' + 'upower: Display battery level' + 'lsb-release: log distro information in crashlog' + ) + install="kodi.install" + provides=('xbmc') + conflicts=('xbmc') + replaces=('xbmc') + + cd "$srcdir/xbmc-$pkgver-$_codename" + # Running make install + make DESTDIR="$pkgdir" install + + # Licenses + install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname} + for licensef in LICENSE.GPL copying.txt; do + mv ${pkgdir}${_prefix}/share/doc/kodi/${licensef} \ + ${pkgdir}${_prefix}/share/licenses/${pkgname} + done + + # LinHES stuff + mkdir -p ${pkgdir}/usr/LH/bin + install -D -m 0755 ${srcdir}/kodi.sh ${pkgdir}/usr/LH/bin + #add in kodi_lib.conf + install -D -m0744 ${srcdir}/kodi_lib.conf ${pkgdir}/etc/gen_lib_xml.d/kodi_lib.conf +} + +package_kodi-eventclients() { + pkgdesc="Kodi Event Clients" + + depends=('cwiid') + + cd "$srcdir/xbmc-$pkgver-$_codename" + + make DESTDIR="$pkgdir" eventclients WII_EXTRA_OPTS=-DCWIID_OLD + + install -dm755 "$pkgdir/usr/lib/python2.7/$pkgbase" + #mv "$pkgdir/kodi"/* "$pkgdir/usr/lib/python2.7/$pkgbase" + #rmdir "$pkgdir/kodi" +} + +md5sums=('9717c539789789b8aeaf1dcfdb9f2c69' + 'f6adc8e06d7076143ca2ad118126b158' + 'f04d1c89f5108c6aba36cf708a74cc95') diff --git a/abs/extra/kodi/__changelog b/abs/extra/kodi/__changelog new file mode 100644 index 0000000..8015995 --- /dev/null +++ b/abs/extra/kodi/__changelog @@ -0,0 +1,4 @@ +PKGBUILD - remove libpulse dep and remove --enable-pulse config option +PKGBUILD - Add /usr/LH/bin/kodi.sh +PKGBUILD - Add /etc/gen_lib_xml.d/kodi_lib.conf +kodi.install - add gen_lib_xml.py to post_install and post_remove diff --git a/abs/extra/kodi/kodi.install b/abs/extra/kodi/kodi.install new file mode 100644 index 0000000..d28289b --- /dev/null +++ b/abs/extra/kodi/kodi.install @@ -0,0 +1,19 @@ +post_install() { + update_icons + gen_lib_xml.py +} + +post_upgrade() { + update_icons +} + +post_remove() { + update_icons + gen_lib_xml.py +} + +update_icons() { + type -p gtk-update-icon-cache > /dev/null 2>&1 && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications + return 0 +} diff --git a/abs/extra/kodi/kodi.sh b/abs/extra/kodi/kodi.sh new file mode 100644 index 0000000..33dc7b6 --- /dev/null +++ b/abs/extra/kodi/kodi.sh @@ -0,0 +1,7 @@ +#!/bin/bash +#Stop XScreensaver +stop_xss.sh & +#Launch kodi +/usr/bin/kodi --lircdev /var/run/lirc/lircd +#Once kodi exits, start XSceensager again +killall stop_xss.sh diff --git a/abs/extra/kodi/kodi_lib.conf b/abs/extra/kodi/kodi_lib.conf new file mode 100644 index 0000000..a7351e3 --- /dev/null +++ b/abs/extra/kodi/kodi_lib.conf @@ -0,0 +1,9 @@ +<!--#KODI--> + <button> + <type>MENU_KODI</type> + <text>Launch Kodi</text> + <description>Open Kodi</description> + <action>EXEC /usr/LH/bin/kodi.sh</action> + </button> +<!--#KODI--> + diff --git a/abs/extra/libaacs/PKGBUILD b/abs/extra/libaacs/PKGBUILD new file mode 100644 index 0000000..02e38de --- /dev/null +++ b/abs/extra/libaacs/PKGBUILD @@ -0,0 +1,29 @@ +# $Id$ +# Maintainer: Martin Wimpress <code@flexion.org> +# Contributor: Gustavo Alvarez <sl1pkn07@gmail.com> +# Contributor: Dirk Berg <berg1981@googlemail.com> + +pkgname=libaacs +pkgver=0.8.0 +pkgrel=1 +pkgdesc="Advanced Access Content System" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://www.videolan.org/developers/libaacs.html" +depends=('libgcrypt') +source=("ftp://ftp.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('667fd744ddd73c8a3e51192dd3822f7e5002883c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./bootstrap + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 KEYDB.cfg "${pkgdir}/usr/share/doc/${pkgname}"/KEYDB.cfg + install -Dm644 README.txt "${pkgdir}/usr/share/doc/${pkgname}"/README.txt +} diff --git a/abs/extra/libaio/PKGBUILD b/abs/extra/libaio/PKGBUILD index 41ca5d6..08d74db 100644 --- a/abs/extra/libaio/PKGBUILD +++ b/abs/extra/libaio/PKGBUILD @@ -3,20 +3,28 @@ # Contributor: Thomas S Hatch <thatch45 at gmail dot com> pkgname=libaio -pkgver=0.3.109 -pkgrel=7 +pkgver=0.3.110 +pkgrel=1 pkgdesc="The Linux-native asynchronous I/O facility (aio) library" arch=('i686' 'x86_64') url="http://lse.sourceforge.net/io/aio.html" license=('LGPL') source=(http://ftp.de.debian.org/debian/pool/main/liba/$pkgname/${pkgname}_${pkgver}.orig.tar.gz) -md5sums=('435a5b16ca6198eaf01155263d855756') +md5sums=('2a35602e43778383e2f4907a4ca39ab8') build() { cd "$srcdir/$pkgname-$pkgver" + # AIO library is a thin wrapper around kernel syscalls, it does not use stdlib + # and other helpers like stack protection libraries + CFLAGS="-march=${CARCH/_/-} -mtune=generic -O2 -pipe" make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make partcheck +} + package() { cd "$srcdir/$pkgname-$pkgver" make prefix="$pkgdir/usr" install diff --git a/abs/extra/libbluray/PKGBUILD b/abs/extra/libbluray/PKGBUILD index 26c7c22..bdedee0 100644 --- a/abs/extra/libbluray/PKGBUILD +++ b/abs/extra/libbluray/PKGBUILD @@ -1,10 +1,10 @@ # $Id$ # Maintainer: Ionut Biru <ibiru@archlinux.org> -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Andrew Cook <ariscop@gmail.com> pkgname=libbluray -pkgver=0.5.0 +pkgver=0.6.2 pkgrel=1 pkgdesc='Library to access Blu-Ray disks for video playback' arch=('i686' 'x86_64') @@ -12,19 +12,14 @@ url='http://www.videolan.org/developers/libbluray.html' license=('LGPL2.1') depends=('libxml2' 'freetype2') source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('04cf15d0f3581a955d3a2ccb9dc06e9e') +md5sums=('f4d2f2cab53f976cbb22cbae069057bd') build() { cd $pkgname-$pkgver - - ./configure --prefix=/usr \ - --disable-static + ./configure --prefix=/usr make } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C $pkgname-$pkgver install } - -# vim:set ts=2 sw=2 et: diff --git a/abs/extra/libbsd/PKGBUILD b/abs/extra/libbsd/PKGBUILD index 2e9b745..d882b1e 100644 --- a/abs/extra/libbsd/PKGBUILD +++ b/abs/extra/libbsd/PKGBUILD @@ -3,33 +3,33 @@ # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=libbsd -pkgver=0.6.0 -pkgrel=2 +pkgver=0.7.0 +pkgrel=1 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" arch=('i686' 'x86_64') url="http://libbsd.freedesktop.org" license=('custom') depends=('glibc') options=('staticlibs') -source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc}) -md5sums=('f6c75f0a9818e323a589bcbd560a0eb4' +source=("http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz"{,.asc}) +md5sums=('fcceb4e66fd448ca4ed42ba22a8babb0' 'SKIP') build() { - cd $pkgname-$pkgver + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } check() { - cd $pkgname-$pkgver + cd "$pkgname-$pkgver" make check } package() { - cd $pkgname-$pkgver + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install rm "${pkgdir}"/usr/lib/libbsd.a diff --git a/abs/extra/libbsd/spt.patch b/abs/extra/libbsd/spt.patch deleted file mode 100644 index b19dc9b..0000000 --- a/abs/extra/libbsd/spt.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -u -r libbsd-0.5.2-orig/src/setproctitle.c libbsd-0.5.2/src/setproctitle.c ---- libbsd-0.5.2-orig/src/setproctitle.c 2013-06-08 18:26:04.000000000 +0200 -+++ libbsd-0.5.2/src/setproctitle.c 2013-06-18 02:35:59.441393418 +0200 -@@ -86,7 +86,7 @@ - if (environ != envp) - return 0; - -- /* Make a copy of the old environ array of pointers, in case -+ /* Make a deep copy of the old environ array of pointers, in case - * clearenv() or setenv() is implemented to free the internal - * environ array, because we will need to access the old environ - * contents to make the new copy. */ -@@ -94,11 +94,13 @@ - envcopy = malloc(envsize); - if (envcopy == NULL) - return errno; -- memcpy(envcopy, envp, envsize); -+ for (i = 0; envp[i]; i++) envcopy[i] = strdup(envp[i]); -+ envcopy[i] = NULL; - - error = spt_clearenv(); - if (error) { - environ = envp; -+ for(i = 0; envcopy[i]; i++) free(envcopy[i]); - free(envcopy); - return error; - } -@@ -116,18 +118,20 @@ - if (error) { - #ifdef HAVE_CLEARENV - /* Because the old environ might not be available -- * anymore we will make do with the shallow copy. */ -+ * anymore we will make do with the deep copy. */ - environ = envcopy; - #else - environ = envp; -+ for(i = 0; envcopy[i]; i++) free(envcopy[i]); - free(envcopy); - #endif - return error; - } - } - -- /* Dispose of the shallow copy, now that we've finished transfering -+ /* Dispose of the deep copy, now that we've finished transfering - * the old environment. */ -+ for(i = 0; envcopy[i]; i++) free(envcopy[i]); - free(envcopy); - - return 0; diff --git a/abs/extra/libcdio-paranoia/PKGBUILD b/abs/extra/libcdio-paranoia/PKGBUILD index 152b38a..380ded2 100644 --- a/abs/extra/libcdio-paranoia/PKGBUILD +++ b/abs/extra/libcdio-paranoia/PKGBUILD @@ -3,15 +3,15 @@ # Contributor: damir <damir@archlinux.org> pkgname=libcdio-paranoia -pkgver=10.2+0.90+1 -pkgrel=2 +pkgver=10.2+0.93+1 +pkgrel=1 pkgdesc="CD paranoia libraries from libcdio" arch=('i686' 'x86_64') license=('GPL' 'LGPL') url="http://www.gnu.org/software/libcdio/" depends=('libcdio') source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('e79e196864dd3b1ca87a01345abbda07' +md5sums=('0255aa50e660db7f2c39658b9c565814' 'SKIP') build() { diff --git a/abs/extra/libcdio/PKGBUILD b/abs/extra/libcdio/PKGBUILD index 803acef..d4b425b 100644 --- a/abs/extra/libcdio/PKGBUILD +++ b/abs/extra/libcdio/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: damir <damir@archlinux.org> pkgname=libcdio -pkgver=0.92 +pkgver=0.93 pkgrel=1 pkgdesc="GNU Compact Disc Input and Control Library" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('libcddb' 'ncurses' 'gcc-libs') install=libcdio.install source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig} libcdio-0.83-linking.patch) -md5sums=('86f3f2869c1d34e4c6e52db77992b918' +md5sums=('d154476feaac5a7b5f180e83eaf3d689' 'SKIP' '5a7f50209c03d5919d5b932f07871af7') diff --git a/abs/extra/libclc/PKGBUILD b/abs/extra/libclc/PKGBUILD new file mode 100644 index 0000000..2a7b414 --- /dev/null +++ b/abs/extra/libclc/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> + +pkgname=libclc +pkgver=0.0.1.217247 +pkgrel=1 +pkgdesc="Library requirements of the OpenCL C programming language" +arch=('any') +url="http://libclc.llvm.org/" +license=('MIT') +makedepends=('clang' 'svn' 'python2') +options=('staticlibs') +source=('libclc::svn+http://llvm.org/svn/llvm-project/libclc/trunk#revision=217247') +md5sums=(SKIP) + +build() { + cd libclc + + sed -i 's/"python < $in >/sys.executable + " < $in >/g' configure.py +# sed -i 's/python < $in >/python2 < $in >/g' configure.py + + python2 ./configure.py --prefix=/usr + make +} + +package() { + cd libclc + + make install DESTDIR="$pkgdir" + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + diff --git a/abs/extra/libdvdcss/PKGBUILD b/abs/extra/libdvdcss/PKGBUILD index 9e8edc9..010e6d7 100644 --- a/abs/extra/libdvdcss/PKGBUILD +++ b/abs/extra/libdvdcss/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 180007 2013-03-14 11:52:25Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id$ +# Maintainer: +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: arjan <arjan@archlinux.org> # Contributor Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libdvdcss -pkgver=1.2.13 +pkgver=1.3.0 pkgrel=1 -pkgdesc="A portable abstraction library for DVD decryption" +pkgdesc="Portable abstraction library for DVD decryption" url="http://www.videolan.org/libdvdcss" arch=('i686' 'x86_64') license=('GPL') depends=('glibc') -options=('!libtool' '!docs' '!emptydirs') -source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('1a4a5e55c7529da46386c1c333340eee2c325a77') +options=('!docs' '!emptydirs') +source=(http://download.videolan.org/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) +sha1sums=('b3ccd70a510aa04d644f32b398489a3122a7e11a') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/abs/extra/libgdiplus/PKGBUILD b/abs/extra/libgdiplus/PKGBUILD index 84e3f45..59b451f 100644 --- a/abs/extra/libgdiplus/PKGBUILD +++ b/abs/extra/libgdiplus/PKGBUILD @@ -1,29 +1,34 @@ -# $Id: PKGBUILD 148818 2012-02-05 11:51:42Z ibiru $ +# $Id$ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=libgdiplus -pkgver=2.10 -pkgrel=2 +pkgver=3.8 +pkgrel=1 pkgdesc="An Open Source Implementation of the GDI+ API" arch=(i686 x86_64) license=('MPL' 'LGPL') url="http://www.mono-project.com" -depends=('libtiff>=3.9.2-2' 'cairo>=1.8.10' 'giflib' 'glib2>=2.24.0' 'libexif') -makedepends=('pkgconfig') -options=('!libtool') -source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng15.patch) -md5sums=('451966e8f637e3a1f02d1d30f900255d' - 'a2d143676bbaceeb88b4c34069e93986') +depends=('libtiff' 'cairo' 'giflib' 'glib2' 'libexif') +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz + libgdiplus0-giflib5.patch) +md5sums=('e75440257b006d7fc2c39e9c56022c4e' + 'a2db6fbb81b1367b3d45eaff674c00a5') + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../libgdiplus0-giflib5.patch + + sed -i -e 's/-L\${libjpeg_prefix}\/lib -ljpeg/-ljpeg/' configure +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 <../libpng15.patch - ./configure --prefix=/usr --with-cairo=system || return 1 - - make || return 1 + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --with-cairo=system + + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/abs/extra/libgdiplus/gdiplus-png14.patch b/abs/extra/libgdiplus/gdiplus-png14.patch deleted file mode 100644 index d132608..0000000 --- a/abs/extra/libgdiplus/gdiplus-png14.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/pngcodec.c.orig 2010-01-16 23:47:17.000000000 +0100 -+++ src/pngcodec.c 2010-01-16 23:49:49.000000000 +0100 -@@ -352,7 +352,7 @@ - info_ptr->palette[i].blue, - info_ptr->palette[i].green, - info_ptr->palette[i].red, -- info_ptr->trans[i]); /* alpha */ -+ info_ptr->trans_alpha[i]); /* alpha */ - } - } - -@@ -418,7 +418,7 @@ - } - - if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { diff --git a/abs/extra/libgdiplus/libgdiplus-2.10.9-freetype25.patch b/abs/extra/libgdiplus/libgdiplus-2.10.9-freetype25.patch new file mode 100644 index 0000000..bd359f4 --- /dev/null +++ b/abs/extra/libgdiplus/libgdiplus-2.10.9-freetype25.patch @@ -0,0 +1,26 @@ +commit 180c02e0f2a2016eba8520b456ca929e9dcf03db +Author: Jo Shields <directhex@apebox.org> +Date: Mon Dec 16 09:24:57 2013 +0000 + + Use FreeType macros for tttables.h inclusion + + As of FreeType 2.1.6 (November 2003), using #include to include Freetype libraries directly is not supported. + + This has come to a head, as in FreeType 2.5.0, the location of headers has been moved around, breaking building of libgdiplus. + + This slight change uses the "official" way to include the required header file, without breaking building on older versions of the library. + +diff --git a/src/gdiplus-private.h b/src/gdiplus-private.h +index 59edf9e..dfccc02 100644 +--- a/src/gdiplus-private.h ++++ b/src/gdiplus-private.h +@@ -30,7 +30,8 @@ + #include <stdio.h> + #include <math.h> + #include <glib.h> +-#include <freetype/tttables.h> ++#include <ft2build.h> ++#include FT_TRUETYPE_TABLES_H + #include <pthread.h> + #include <unistd.h> + diff --git a/abs/extra/libgdiplus/libgdiplus-2.10.9-giflib-5.1.0.patch b/abs/extra/libgdiplus/libgdiplus-2.10.9-giflib-5.1.0.patch new file mode 100644 index 0000000..39d3c7a --- /dev/null +++ b/abs/extra/libgdiplus/libgdiplus-2.10.9-giflib-5.1.0.patch @@ -0,0 +1,30 @@ +diff -rupN a/src/gifcodec.c b/src/gifcodec.c +--- a/src/gifcodec.c 2011-12-02 18:23:12.000000000 +0100 ++++ b/src/gifcodec.c 2014-06-01 13:20:17.027203704 +0200 +@@ -581,7 +581,7 @@ gdip_load_gif_image (void *stream, GpIma + } + + FreeExtensionMono(&global_extensions); +- DGifCloseFile (gif); ++ DGifCloseFile (gif, NULL); + + *image = result; + return Ok; +@@ -597,7 +597,7 @@ error: + + if (gif != NULL) { + FreeExtensionMono (&global_extensions); +- DGifCloseFile (gif); ++ DGifCloseFile (gif, NULL); + } + + *image = NULL; +@@ -923,7 +923,7 @@ gdip_save_gif_image (void *stream, GpIma + } + } + +- EGifCloseFile (fp); ++ EGifCloseFile (fp, NULL); + + return Ok; + diff --git a/abs/extra/libgdiplus/libgdiplus-2.10.9-gold.patch b/abs/extra/libgdiplus/libgdiplus-2.10.9-gold.patch new file mode 100644 index 0000000..379ae94 --- /dev/null +++ b/abs/extra/libgdiplus/libgdiplus-2.10.9-gold.patch @@ -0,0 +1,16 @@ + tests/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 97f5f4e..c02ca25 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -228,7 +228,7 @@ DEPS = \ + $(top_builddir)/src/libgdiplus.la + + LDADDS = \ +- $(top_builddir)/src/libgdiplus.la ++ $(top_builddir)/src/libgdiplus.la -lX11 -lglib-2.0 + + testgdi_DEPENDENCIES = $(TEST_DEPS) + testgdi_LDADD = $(LDADDS) diff --git a/abs/extra/libgdiplus/libgdiplus0-giflib5.patch b/abs/extra/libgdiplus/libgdiplus0-giflib5.patch new file mode 100644 index 0000000..0f48e08 --- /dev/null +++ b/abs/extra/libgdiplus/libgdiplus0-giflib5.patch @@ -0,0 +1,153 @@ +--- + src/gifcodec.c | 50 +++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 41 insertions(+), 9 deletions(-) + +Index: libgdiplus-2.10.9/src/gifcodec.c +=================================================================== +--- libgdiplus-2.10.9.orig/src/gifcodec.c ++++ libgdiplus-2.10.9/src/gifcodec.c +@@ -39,8 +39,15 @@ GUID gdip_gif_image_format_guid = {0xb96 + + #include "gifcodec.h" + ++#if !defined(GIFLIB_MAJOR) || GIFLIB_MAJOR < 5 + /* giflib declares this incorrectly as EgifOpen */ + extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc); ++#endif ++#if !defined(GIFLIB_MAJOR) || !(GIFLIB_MAJOR > 5 || \ ++ (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)) ++# define DGifCloseFile(a, b) DGifCloseFile(a) ++# define EGifCloseFile(a, b) EGifCloseFile(a) ++#endif + + /* Data structure used for callback */ + typedef struct +@@ -105,7 +112,7 @@ gdip_gif_inputfunc (GifFileType *gif, Gi + */ + + static int +-AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) ++AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[]) + { + ExtensionBlock *ep; + +@@ -129,7 +136,7 @@ AddExtensionBlockMono(SavedImage *New, i + + if (ExtData) { + memcpy(ep->Bytes, ExtData, Len); +- ep->Function = New->Function; ++ ep->Function = func; + } + + return (GIF_OK); +@@ -232,20 +239,20 @@ DGifSlurpMono(GifFileType * GifFile, Sav + } + + case EXTENSION_RECORD_TYPE: { +- if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) { ++ int func; ++ if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) { + return (GIF_ERROR); + } + + while (ExtData != NULL) { + /* Create an extension block with our data */ +- if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) { ++ if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) { + return (GIF_ERROR); + } + + if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) { + return (GIF_ERROR); + } +- temp_save.Function = 0; + } + break; + } +@@ -303,12 +310,19 @@ gdip_load_gif_image (void *stream, GpIma + result = NULL; + loop_counter = FALSE; + ++#if GIFLIB_MAJOR < 5 + if (from_file) { + gif = DGifOpen(stream, &gdip_gif_fileinputfunc); + } else { + gif = DGifOpen (stream, &gdip_gif_inputfunc); + } +- ++#else ++ if (from_file) ++ gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL); ++ else ++ gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL); ++#endif ++ + if (gif == NULL) { + goto error; + } +@@ -581,7 +595,7 @@ gdip_load_gif_image (void *stream, GpIma + } + + FreeExtensionMono(&global_extensions); +- DGifCloseFile (gif); ++ DGifCloseFile (gif, NULL); + + *image = result; + return Ok; +@@ -597,7 +611,7 @@ error: + + if (gif != NULL) { + FreeExtensionMono (&global_extensions); +- DGifCloseFile (gif); ++ DGifCloseFile (gif, NULL); + } + + *image = NULL; +@@ -660,11 +674,22 @@ gdip_save_gif_image (void *stream, GpIma + return InvalidParameter; + } + ++#if GIFLIB_MAJOR < 5 + if (from_file) { + fp = EGifOpenFileName (stream, 0); + } else { + fp = EGifOpen (stream, gdip_gif_outputfunc); + } ++#else ++ if (from_file) ++ fp = EGifOpenFileName (stream, 0, NULL); ++ else ++ fp = EGifOpen (stream, gdip_gif_outputfunc, NULL); ++#define MakeMapObject GifMakeMapObject ++#define FreeMapObject GifFreeMapObject ++#define QuantizeBuffer GifQuantizeBuffer ++#define BitSize GifBitSize ++#endif + + if (!fp) { + return FileNotFound; +@@ -848,8 +873,15 @@ gdip_save_gif_image (void *stream, GpIma + Buffer[0] = 1; + Buffer[1] = ptr[0]; + Buffer[2] = ptr[1]; ++#if GIFLIB_MAJOR < 5 + EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0"); + EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer); ++#else ++ EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE); ++ EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0"); ++ EGifPutExtensionBlock(fp, 3, Buffer); ++ EGifPutExtensionTrailer(fp); ++#endif + } + } + +@@ -923,7 +955,7 @@ gdip_save_gif_image (void *stream, GpIma + } + } + +- EGifCloseFile (fp); ++ EGifCloseFile (fp, NULL); + + return Ok; + diff --git a/abs/extra/libgnome-keyring/PKGBUILD b/abs/extra/libgnome-keyring/PKGBUILD index 6a9dff1..f285a11 100644 --- a/abs/extra/libgnome-keyring/PKGBUILD +++ b/abs/extra/libgnome-keyring/PKGBUILD @@ -1,18 +1,19 @@ -#$Id: PKGBUILD 156896 2012-04-23 09:08:34Z ibiru $ +#$Id$ #Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=libgnome-keyring -pkgver=3.4.1 -pkgrel=1 +pkgver=3.12.0 +pkgrel=2 pkgdesc="GNOME keyring client library" arch=(i686 x86_64) license=('GPL' 'LGPL') -depends=('dbus-core' 'glib2' 'libgcrypt') -makedepends=('intltool' 'gobject-introspection') -options=('!libtool' '!emptydirs') +depends=('dbus' 'glib2' 'libgcrypt') +makedepends=('intltool' 'gobject-introspection' 'vala' 'python2') +optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets)') +options=('!emptydirs') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e74a3e4521767fe5f05cc97cda8a355239567d9763ec628280ede8c2a4a379e8') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783') build() { cd "$pkgname-$pkgver" diff --git a/abs/extra/libmatroska/PKGBUILD b/abs/extra/libmatroska/PKGBUILD index 78f4f25..963e241 100644 --- a/abs/extra/libmatroska/PKGBUILD +++ b/abs/extra/libmatroska/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 143895 2011-11-30 19:46:58Z giovanni $ +# $Id$ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor 03/08/04 <lefungus@altern.org> pkgname=libmatroska -pkgver=1.3.0 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 pkgdesc="Matroska library" arch=('i686' 'x86_64') url="http://dl.matroska.org/downloads/libmatroska/" license=('LGPL') depends=('libebml') source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f4a8c411f09d39c754eb726efd616043') +md5sums=('f61b2e5086f4bb9d24a43cc8af43a719') build() { cd "${srcdir}/${pkgname}-${pkgver}/make/linux" diff --git a/abs/extra/libmicrohttpd/PKGBUILD b/abs/extra/libmicrohttpd/PKGBUILD index 978b589..76c7b6e 100644 --- a/abs/extra/libmicrohttpd/PKGBUILD +++ b/abs/extra/libmicrohttpd/PKGBUILD @@ -6,17 +6,17 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.27 +pkgver=0.9.37 pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') url="http://www.gnu.org/software/libmicrohttpd/" license=('LGPL') -options=('!libtool') depends=('gnutls' 'libgcrypt') +optdepends=('file' 'curl') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('a10496b7f1b495aaf6897584da52f51b') +md5sums=('fdf1e0534d83bbf2663f80fa7873be77') build() { cd ${pkgname}-${pkgver} @@ -30,8 +30,6 @@ package() { make DESTDIR=${pkgdir} install install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/platform.h \ ${pkgdir}/usr/include/$pkgname/platform.h - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \ - ${pkgdir}/usr/include/$pkgname/plibc.h sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I${includedir}/libmicrohttpd#' \ $pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc } diff --git a/abs/extra/libmpdclient/PKGBUILD b/abs/extra/libmpdclient/PKGBUILD new file mode 100644 index 0000000..148b952 --- /dev/null +++ b/abs/extra/libmpdclient/PKGBUILD @@ -0,0 +1,28 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libmpdclient +pkgver=2.9 +pkgrel=1 +pkgdesc='Asynchronous API library for interfacing MPD in the C, C++ & Objective C languages' +url='http://www.musicpd.org/libs/libmpdclient/' +license=('custom:BSD') +arch=('i686' 'x86_64') +source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz") +sha1sums=('1a3557d4d1f78085db6285a8c8cb9085c300d9d3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-documentation + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + cd "${pkgdir}" + install -d usr/share/licenses/libmpdclient + ln -s ../../doc/libmpdclient/COPYING usr/share/licenses/libmpdclient/COPYING +} diff --git a/abs/extra/libomxil-bellagio/PKGBUILD b/abs/extra/libomxil-bellagio/PKGBUILD new file mode 100644 index 0000000..37a8d60 --- /dev/null +++ b/abs/extra/libomxil-bellagio/PKGBUILD @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Fly-away <flyaaway@gmail.com> + +pkgname=libomxil-bellagio +pkgver=0.9.3 +pkgrel=1 +pkgdesc="An opensource implementation of the OpenMAX Integration Layer API" +arch=('i686' 'x86_64') +url="http://omxil.sourceforge.net" +license=('LGPL') +depends=('glibc') +source=("http://downloads.sourceforge.net/project/omxil/omxil/Bellagio%200.9.3/${pkgname}-${pkgver}.tar.gz" + fedora-fixes.patch) +md5sums=('a1de827fdb75c02c84e55f740ca27cb8' + 'c34f9facf0cf26171c81f2fc3d562ec6') + +prepare() { + cd ${srcdir}/${pkgname}-$pkgver + + # Fixes from fedora repo + patch -Np1 -i ../fedora-fixes.patch + autoreconf -fiv +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/${pkgname} + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install +} + diff --git a/abs/extra/libomxil-bellagio/fedora-fixes.patch b/abs/extra/libomxil-bellagio/fedora-fixes.patch new file mode 100644 index 0000000..2ae3c3c --- /dev/null +++ b/abs/extra/libomxil-bellagio/fedora-fixes.patch @@ -0,0 +1,199 @@ +When libomxdynamicloader.so is loaded, it complains that RM_Deinit can't be resolved. +Link explicitly against omxil-bellagio so that ld.so can find the reference. + +Signed-off-by: Qais Yousef <qais.yousef@imgtec.com> + +--- bellagio-0.9.3/src/dynamic_loader/Makefile.am.old 2012-03-23 15:07:47.379021034 +0000 ++++ bellagio-0.9.3/src/dynamic_loader/Makefile.am 2012-03-23 15:08:47.563034818 +0000 +@@ -3,7 +3,7 @@ + omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la + libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h + +-libomxdynamicloader_la_LDFLAGS = ++libomxdynamicloader_la_LDFLAGS = -L$(abs_top_srcdir)/src/.libs -lomxil-bellagio + libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/base \ +Fix dependency issue to allow parallel build + +Signed-off-by: Qais Yousef <qais.yousef@imgtec.com> + +Index: bellagio-0.9.3/src/Makefile.am +=================================================================== +--- bellagio-0.9.3.orig/src/Makefile.am ++++ bellagio-0.9.3/src/Makefile.am +@@ -8,6 +8,7 @@ omxregister_bellagio_SOURCES = omxregist + omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \ + -I$(top_srcdir)/include + omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir) ++omxregister_bellagio_DEPENDENCIES = libomxil-bellagio.la + + lib_LTLIBRARIES = libomxil-bellagio.la + libomxil_bellagio_la_SOURCES = component_loader.h \ +We always access globalComponentList[] at indexComponent=-1 which causes a +segfault. Use i as the index instead. + +Signed-off-by: Qais Yousef <qais.yousef@imgtec.com> + +--- bellagio-0.9.3/src/omx_reference_resource_manager.c.old 2012-03-13 10:15:25.743940980 +0000 ++++ bellagio-0.9.3/src/omx_reference_resource_manager.c 2012-03-13 10:18:02.201971009 +0000 +@@ -485,7 +485,6 @@ + OMX_ERRORTYPE RM_removeFromWaitForResource(OMX_COMPONENTTYPE *openmaxStandComp) { + omx_base_component_PrivateType* omx_base_component_Private; + int i = 0; +- int indexComponent = -1; + + DEBUG(DEB_LEV_FUNCTION_NAME, "In %s\n", __func__); + omx_base_component_Private = (omx_base_component_PrivateType*)openmaxStandComp->pComponentPrivate; +@@ -493,16 +492,13 @@ + while(listOfcomponentRegistered[i].component_name != NULL ) { + if (!strcmp(listOfcomponentRegistered[i].component_name, omx_base_component_Private->name)) { + // found component in the list of the resource manager +- removeElemFromList(&globalComponentList[indexComponent], openmaxStandComp); +- break; ++ removeElemFromList(&globalComponentList[i], openmaxStandComp); ++ DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__); ++ return OMX_ErrorNone; + } + i++; + } +- if (indexComponent <0) { +- // No resource to be handled +- DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__); +- return OMX_ErrorNone; +- } +- DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__); ++ // No resource to be handled ++ DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__); + return OMX_ErrorNone; + } + OMX_INDEXTYPE/OMX_INDEXVENDORTYPE in one switch + src/base/omx_base_component.c | 54 ++++++++++++++++++++++------------------- + 1 files changed, 29 insertions(+), 25 deletions(-) +--- a/src/base/omx_base_component.c ++++ a/src/base/omx_base_component.c +@@ -915,14 +915,6 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter( + return OMX_ErrorBadParameter; + } + switch(nParamIndex) { +- case OMX_IndexParameterThreadsID: +- if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) { +- break; +- } +- threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure; +- threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID; +- threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID; +- break; + case OMX_IndexParamAudioInit: + case OMX_IndexParamVideoInit: + case OMX_IndexParamImageInit: +@@ -988,28 +980,40 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter( + } + } + break; +- case OMX_IndexVendorCompPropTunnelFlags: +- pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure; ++ default: ++ /* additional switch statement for extended OMX_INDEXTYPE */ ++ switch((OMX_INDEXVENDORTYPE) nParamIndex) { ++ case OMX_IndexParameterThreadsID: ++ if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) { ++ break; ++ } ++ threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure; ++ threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID; ++ threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID; ++ break; ++ case OMX_IndexVendorCompPropTunnelFlags: ++ pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure; + +- if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts + +- omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts + +- omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts + +- omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) { ++ if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts + ++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts + ++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts + ++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) { + +- DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n", +- __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__); ++ DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n", ++ __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__); + +- return OMX_ErrorBadPortIndex; +- } ++ return OMX_ErrorBadPortIndex; ++ } + +- pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex]; ++ pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex]; + +- pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags; +- pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier; +- break; +- default: +- err = OMX_ErrorUnsupportedIndex; +- break; ++ pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags; ++ pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier; ++ break; ++ default: ++ err = OMX_ErrorUnsupportedIndex; ++ break; ++ } + } + DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s for component %p\n", __func__, hComponent); + return err; +diff -up libomxil-bellagio-0.9.3/Makefile.am.nodoc libomxil-bellagio-0.9.3/Makefile.am +--- libomxil-bellagio-0.9.3/Makefile.am.nodoc 2011-01-12 08:53:26.000000000 +0100 ++++ libomxil-bellagio-0.9.3/Makefile.am 2012-04-23 13:46:15.410823381 +0200 +@@ -7,7 +7,6 @@ EXTRA_DIST = libomxil-bellagio.spec + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libomxil-bellagio.pc + +-docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@ + doc_DATA = README \ + ChangeLog \ + TODO +diff -up libomxil-bellagio-0.9.3/src/omxregister.c.unused libomxil-bellagio-0.9.3/src/omxregister.c +--- libomxil-bellagio-0.9.3/src/omxregister.c.unused 2011-01-12 08:53:26.000000000 +0100 ++++ libomxil-bellagio-0.9.3/src/omxregister.c 2012-12-10 22:02:28.621695659 +0100 +@@ -248,7 +248,15 @@ static int buildComponentsList(FILE* omx + } + fptr(stComponents); + err = fwrite(lib_absolute_path, 1, strlen(lib_absolute_path), omxregistryfp); +- err = fwrite("\n", 1, 1, omxregistryfp); ++ if (err != strlen(lib_absolute_path)) { ++ DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(lib_absolute_path), fileno(omxregistryfp)); ++ continue; ++ } ++ err = fwrite("\n", 1, strlen(buffer), omxregistryfp); ++ if (err != strlen(buffer)) { ++ DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(buffer), fileno(omxregistryfp)); ++ continue; ++ } + + + for (i = 0; i<num_of_comp; i++) { +--- libomxil-bellagio-0.9.3/include/OMX_Types.h.orig 2011-01-12 08:53:26.000000000 +0100 ++++ libomxil-bellagio-0.9.3/include/OMX_Types.h 2013-02-25 09:53:55.000000000 +0100 +@@ -314,6 +314,18 @@ + * platform & operating specific object used to reference the window */ + typedef void* OMX_NATIVE_WINDOWTYPE; + ++ ++/** Define the OMX IL version that corresponds to this set of header files. ++ * We also define a combined version that can be used to write or compare ++ * values of the 32bit nVersion field, assuming a little endian architecture */ ++#define OMX_VERSION_MAJOR 1 ++#define OMX_VERSION_MINOR 1 ++#define OMX_VERSION_REVISION 2 ++#define OMX_VERSION_STEP 0 ++ ++#define OMX_VERSION ((OMX_VERSION_STEP<<24) | (OMX_VERSION_REVISION<<16) | (OMX_VERSION_MINOR<<8) | OMX_VERSION_MAJOR) ++ ++ + /** The OMX_VERSIONTYPE union is used to specify the version for + a structure or component. For a component, the version is entirely + specified by the component vendor. Components doing the same function diff --git a/abs/extra/libproxy/PKGBUILD b/abs/extra/libproxy/PKGBUILD index 9fb8e85..70a1362 100644 --- a/abs/extra/libproxy/PKGBUILD +++ b/abs/extra/libproxy/PKGBUILD @@ -1,32 +1,22 @@ -# $Id: PKGBUILD 24494 2009-01-17 20:42:01Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libproxy -pkgver=0.4.7 -pkgrel=2 +pkgver=0.4.11 +pkgrel=4 pkgdesc="A library that provides automatic proxy configuration management" arch=(i686 x86_64) license=('LGPL') depends=('gcc-libs') -optdepends=('kdelibs: KDE configuration module' - 'networkmanager: NetworkManager configuration module' - 'perl: Perl bindings' - 'python2: Python bindings') -makedepends=('cmake' 'automoc4' 'python2' 'perl') +optdepends=('perl: Perl bindings' + 'python2: Python bindings' + 'glib2: gsettings configuration module') +makedepends=('cmake' 'python2' 'perl') url="http://libproxy.googlecode.com" -source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz - libproxy-0.4.7-unistd.patch) -options=('!libtool') -md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5' - 'e90c03f296e553ace347b46f4fea3625') +source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +md5sums=('3cd1ae2a4abecf44b3f24d6639d2cd84') build() { - cd "${srcdir}" - - # Fix build with GCC 4.7 (patch from Fedora) - patch -d "${pkgname}-${pkgver}" -Np1 -i \ - "${srcdir}/libproxy-0.4.7-unistd.patch" - mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -37,11 +27,13 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DWITH_WEBKIT=OFF \ -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ - -DCMAKE_C_FLAGS="${CFLAGS}" + -DCMAKE_C_FLAGS="${CFLAGS}" \ + -DWITH_KDE4=OFF \ + -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2 make } package() { - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install } diff --git a/abs/extra/libproxy/__changelog b/abs/extra/libproxy/__changelog index 8bc6f71..178dc00 100644 --- a/abs/extra/libproxy/__changelog +++ b/abs/extra/libproxy/__changelog @@ -1 +1 @@ -removed kdelibs - +PKGBUILD: remove networkmanager from makedepends and depends diff --git a/abs/extra/libproxy/libproxy-0.4.7-unistd.patch b/abs/extra/libproxy/libproxy-0.4.7-unistd.patch deleted file mode 100644 index 803f819..0000000 --- a/abs/extra/libproxy/libproxy-0.4.7-unistd.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- libproxy-0.4.7/libproxy/url.cpp.orig 2012-02-28 21:05:15.572948027 +0000 -+++ libproxy-0.4.7/libproxy/url.cpp 2012-02-28 21:05:45.635937474 +0000 -@@ -27,6 +27,7 @@ - #define close _close - #endif - #include <fcntl.h> // For ::open() -+#include <unistd.h> // For ::read() and ::close() - #include <cstring> // For memcpy() - #include <sstream> // For int/string conversion (using stringstream) - #include <cstdio> // For sscanf() ---- libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp.orig 2012-02-28 21:06:01.552943358 +0000 -+++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp 2012-02-28 21:11:21.429953982 +0000 -@@ -18,6 +18,7 @@ - ******************************************************************************/ - - #include <sys/stat.h> -+#include <unistd.h> - #include <cstdlib> - #include <map> - #include <fstream> ---- libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp.orig 2012-02-28 21:06:11.637943033 +0000 -+++ libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp 2012-02-28 21:11:46.560961409 +0000 -@@ -17,6 +17,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - ******************************************************************************/ - -+#include <unistd.h> // for ::gethostname() - #include <cstring> // ? - - #include "../extension_pacrunner.hpp" ---- libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp.orig 2012-02-28 21:06:29.615943614 +0000 -+++ libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp 2012-02-28 21:12:35.530965553 +0000 -@@ -17,6 +17,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - ******************************************************************************/ - -+#include <unistd.h> // for ::gethostname() - #include "../extension_pacrunner.hpp" - using namespace libproxy; - diff --git a/abs/extra/libsecret/PKGBUILD b/abs/extra/libsecret/PKGBUILD new file mode 100644 index 0000000..dcd82fb --- /dev/null +++ b/abs/extra/libsecret/PKGBUILD @@ -0,0 +1,27 @@ +# $Id$ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libsecret +pkgver=0.18 +pkgrel=1 +pkgdesc='Library for storing and retrieving passwords and other secrets.' +arch=('i686' 'x86_64') +license=('LGPL') +url="https://wiki.gnome.org/Projects/Libsecret" +depends=('glib2' 'libgcrypt') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'vala') +optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets)') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) +sha256sums=('0c73aa762dbd1e38ba7b03de350e23ce818cb810b0784375e95ef61e004b02e3') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/abs/extra/libshairport/PKGBUILD b/abs/extra/libshairport/PKGBUILD index d6e406c..aa86087 100644 --- a/abs/extra/libshairport/PKGBUILD +++ b/abs/extra/libshairport/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 68571 2012-03-28 10:35:14Z idevolder $ +# $Id$ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgname=libshairport _developer='amejia1' -_version=1.2.1 -_commithash='aeb4987' +_version=1.2.1.20121215 +_commithash='16395d8' pkgver=${_version} -pkgrel=2 +pkgrel=3 pkgdesc="emulates an AirPort Express" arch=('i686' 'x86_64') url='https://github.com/amejia1/libshairport' license=('GPL') depends=('openssl' 'libao') source=("$pkgname-$pkgver.tar.gz::https://github.com/amejia1/libshairport/tarball/$_commithash") -sha256sums=('003c65f56123a7cb090b2d7249f0facbef668f7db6048f4b458713892a6911ca') -options=(!libtool) +sha256sums=('98b73313d0a8f2abcb32e11f4fd4b422777a495cd62dbe881d5061b91959d1d5') _srcfolder=$_developer-$pkgname-$_commithash diff --git a/abs/extra/libsoup/PKGBUILD b/abs/extra/libsoup/PKGBUILD index 7144432..ee50628 100644 --- a/abs/extra/libsoup/PKGBUILD +++ b/abs/extra/libsoup/PKGBUILD @@ -1,48 +1,36 @@ -# $Id: PKGBUILD 156920 2012-04-23 09:09:05Z ibiru $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgbase=libsoup -pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.38.1 +pkgname=libsoup +pkgver=2.48.0 pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking') +pkgdesc="GNOME HTTP Library" +arch=(i686 x86_64) +license=(LGPL) url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -options=('!libtool' '!emptydirs') -sha256sums=('71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a') +depends=(glib2 libxml2 glib-networking sqlite) +makedepends=(intltool gobject-introspection python2) +checkdepends=(apache php php-apache) +provides=("libsoup-gnome=$pkgver-$pkgrel") +conflicts=(libsoup-gnome) +replaces=(libsoup-gnome) +options=('!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('ea34dd64fe44343445daf6dd690d0691e9d973468de44878da97371c16d89784') build() { - cd "$pkgbase-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } -package_libsoup() { - pkgdesc="GNOME HTTP Library - base library" - depends=('glib2' 'libxml2' 'glib-networking') - - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - - rm -f "$pkgdir"/usr/lib/libsoup-gnome-2.4.* - rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-gnome-2.4.pc" - rm -rf "$pkgdir/usr/include/libsoup-gnome-2.4" - rm -f "$pkgdir/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib" +check() { + cd $pkgname-$pkgver + make check } -package_libsoup-gnome() { - pkgdesc="GNOME HTTP Library - GNOME libraries" - depends=("libsoup=$pkgver" 'libgnome-keyring' 'sqlite') - - cd "$pkgbase-$pkgver" +package() { + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - - rm -f "$pkgdir"/usr/lib/libsoup-2.4.* - rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-2.4.pc" - rm -rf "$pkgdir/usr/include/libsoup-2.4" - rm -rf "$pkgdir/usr/share" - rm -f "$pkgdir/usr/lib/girepository-1.0/Soup-2.4.typelib" } diff --git a/abs/extra/libsoup/__changelog b/abs/extra/libsoup/__changelog new file mode 100644 index 0000000..29f2771 --- /dev/null +++ b/abs/extra/libsoup/__changelog @@ -0,0 +1 @@ +PKGBUILD: remove python from deps diff --git a/abs/extra/libssh/PKGBUILD b/abs/extra/libssh/PKGBUILD index a2dc1bf..c93c52f 100644 --- a/abs/extra/libssh/PKGBUILD +++ b/abs/extra/libssh/PKGBUILD @@ -1,31 +1,47 @@ -# $Id: PKGBUILD 138141 2011-09-17 12:41:18Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id$ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: ice-man <icemanf@gmail.com> # Contributor: sergeantspoon <sergeantspoon@archlinux.us> pkgname=libssh -pkgver=0.5.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="Library for accessing ssh client services through C libraries" url="http://www.libssh.org/" license=('LGPL') arch=('i686' 'x86_64') -depends=('openssl') -makedepends=('cmake' 'doxygen') -source=("https://red.libssh.org/attachments/download/27/${pkgname}-${pkgver}.tar.gz") -md5sums=('38b67c48af7a9204660a3e08f97ceba6') +depends=('zlib' 'openssl') +makedepends=('cmake' 'cmocka' 'doxygen') +checkdepends=('openssh') +source=(https://red.libssh.org/attachments/download/87/${pkgname}-${pkgver}.tar.xz) +md5sums=('66cf16e77f60913b4d54f18c92cdbf71') + + +prepare() { + # disable the test. It is confused by our clean container setup. + # 'extra-x86-build' uses user 'nobody' that has a record in /etc/passwd file + # but $HOME envvar is set to '/build'. The test expects that $HOME corresponds to passwd file. + sed 's/unit_test(torture_path_expand_tilde_unix),//' -i libssh-${pkgver}/tests/unittests/torture_misc.c +} build() { - cd "${srcdir}" - mkdir build + mkdir build || true cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DWITH_GSSAPI=OFF \ + -DWITH_TESTING=ON make } +check() { + cd build + make test +} + package(){ - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/abs/extra/libtorrent-rasterbar/PKGBUILD b/abs/extra/libtorrent-rasterbar/PKGBUILD index d1f4910..164f6ab 100644 --- a/abs/extra/libtorrent-rasterbar/PKGBUILD +++ b/abs/extra/libtorrent-rasterbar/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.16.16 -pkgrel=1 +pkgver=0.16.17 +pkgrel=3 epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" @@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') options=('!emptydirs') source=(http://downloads.sourceforge.net/sourceforge/libtorrent/$pkgname-$pkgver.tar.gz) -sha1sums=('de8faed5cbc09baddb2748cb7b75edd07ab0addc') +sha1sums=('e713b5dfc45194bfc50fa21096ab67c374ae3740') build() { cd $pkgname-$pkgver diff --git a/abs/extra/libupnp/PKGBUILD b/abs/extra/libupnp/PKGBUILD new file mode 100644 index 0000000..1df79d3 --- /dev/null +++ b/abs/extra/libupnp/PKGBUILD @@ -0,0 +1,29 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: kastor <kastor@fobos.org.ar> + +pkgname=libupnp +pkgver=1.6.19 +pkgrel=1 +pkgdesc="Portable Open Source UPnP Development Kit" +arch=('i686' 'x86_64') +url="http://pupnp.sourceforge.net/" +license=('BSD') +depends=('glibc') +makedepends=('pkgconfig') +source=("http://downloads.sourceforge.net/sourceforge/pupnp/${pkgname}-${pkgver}.tar.bz2") +md5sums=('ee16e5d33a3ea7506f38d71facc057dd') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR=${pkgdir} install + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/custom/${pkgname}/LICENSE +} diff --git a/abs/extra/libutempter/PKGBUILD b/abs/extra/libutempter/PKGBUILD new file mode 100644 index 0000000..bbc27d9 --- /dev/null +++ b/abs/extra/libutempter/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libutempter +pkgver=1.1.6 +pkgrel=2 +pkgdesc="Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files" +arch=('i686' 'x86_64') +url="ftp://ftp.altlinux.org/pub/people/ldv/utempter" +license=('LGPL') +depends=('glibc') +source=(ftp://ftp.altlinux.org/pub/people/ldv/utempter/$pkgname-$pkgver.tar.bz2) +md5sums=('b43827806923903aba2bc7cd3a2d45b7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + RPM_OPT_FLAGS="$CFLAGS" make + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + chown root:utmp "$pkgdir/usr/lib/utempter/utempter" + chmod 2755 "$pkgdir/usr/lib/utempter/utempter" +} diff --git a/abs/extra/libva/PKGBUILD b/abs/extra/libva/PKGBUILD index 5840a77..dad11fd 100644 --- a/abs/extra/libva/PKGBUILD +++ b/abs/extra/libva/PKGBUILD @@ -1,33 +1,29 @@ -# $Id: PKGBUILD 161866 2012-06-16 00:18:39Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id$ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> pkgname=libva -pkgver=1.0.16 +pkgver=1.4.1 pkgrel=1 -pkgdesc="Video Acceleration (VA) API for Linux" +pkgdesc='Video Acceleration (VA) API for Linux' arch=('i686' 'x86_64') -url="http://freedesktop.org/wiki/Software/vaapi" +url='http://freedesktop.org/wiki/Software/vaapi' license=('MIT') -depends=('libegl' 'libgl' 'libdrm' 'libxfixes') +depends=('libgl' 'libdrm' 'libxfixes') makedepends=('mesa') -optdepends=('vdpau-video: vdpau back-end for nvidia' - 'libva-driver-intel: back-end for intel cards') -options=('!libtool') -install=libva.install -source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2) +optdepends=('libva-vdpau-driver: backend for Nvidia and AMD cards' + 'libva-intel-driver: backend for Intel cards') +source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('8e3e7096750c14d1f98da807df7c1ba5') build() { - cd "$pkgname-$pkgver" - ./autogen.sh + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - install -m644 -D COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } - -# vim:set ts=2 sw=2 et: -md5sums=('49d74e1e4f8a4937af7a62d457f61106') diff --git a/abs/extra/libva/libva.install b/abs/extra/libva/libva.install deleted file mode 100644 index 4d8b8e2..0000000 --- a/abs/extra/libva/libva.install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 1.0.15-1)" -lt 0 ]; then - echo 'Starting with libva version 1.0.15, the intel back-end is now in libva-driver-intel.' - fi -} diff --git a/abs/extra/libwebkit/PKGBUILD b/abs/extra/libwebkit/PKGBUILD deleted file mode 100644 index 93a98cd..0000000 --- a/abs/extra/libwebkit/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 157142 2012-04-24 22:33:15Z ibiru $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=libwebkit -pkgname=(libwebkit libwebkit3) -pkgver=1.8.1 -pkgrel=1 -pkgdesc="An opensource web content engine" -arch=('i686' 'x86_64') -url="http://webkitgtk.org/" -license=('custom') -depends=('libxt' 'libxslt' 'sqlite' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl' - 'geoclue') -makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa') -options=('!libtool' '!emptydirs') -source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz webkit.patch) - -build() { - cd "$srcdir/webkit-$pkgver" - patch -Np1 < ../webkit.patch - mkdir build-gtk{2,3} - - # clear makeflags: race during introspection. - # WebKit*.gir should be created before WebKit*.typelib, but isn't - MAKEFLAGS= - - ( cd build-gtk2 && _build --with-gtk=2.0 ) - ( cd build-gtk3 && _build --with-gtk=3.0 ) -} - -_build() { - PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ - --enable-introspection \ - --with-font-backend=freetype \ - --with-unicode-backend=icu \ - --enable-spellcheck "$@" - make all stamp-po -} - -package_libwebkit() { - pkgdesc+=" (for GTK2)" - depends+=(gtk2) - - cd "$srcdir/webkit-$pkgver/build-gtk2" - make DESTDIR="$pkgdir" install - install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE" -} - -package_libwebkit3() { - pkgdesc+=" (for GTK3)" - depends+=(gtk3) - - cd "$srcdir/webkit-$pkgver/build-gtk3" - make DESTDIR="$pkgdir" install - install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE" -} - - - -md5sums=('f2f01b1fdc7262a2eede81ebed0970b2' - 'dab90271e918f48ed215648521d5a8a0') diff --git a/abs/extra/libwebkit/index.html b/abs/extra/libwebkit/index.html deleted file mode 100644 index 5d6ef44..0000000 --- a/abs/extra/libwebkit/index.html +++ /dev/null @@ -1,89 +0,0 @@ -<html> - <head> - <title> </title> - - <script type="text/javascript"> - function bredir(a, b, c, d, e, ldr, ifc) { - var f, g, h, i, j; - var k = false; - var l = false; - var m = [ - [300, 250, false], - [250, 250, false], - [240, 400, false], - [336, 280, false], - [180, 150, false], - [468, 60, false], - [234, 60, false], - [88, 31, false], - [120, 90, false], - [120, 60, false], - [120, 240, false], - [125, 125, false], - [728, 90, false], - [160, 600, false], - [120, 600, false], - [300, 600, false], - [300, 125, false], - [530, 300, false], - [190, 200, false], - [470, 250, false], - [720, 300, true], - [500, 350, true], - [550, 480, true] - ]; - if (typeof window.innerHeight == "number") { - g = window.innerHeight; - f = window.innerWidth; - } else if (typeof document.body.offsetHeight == "number") { - g = document.body.offsetHeight; - f = document.body.offsetWidth; - } - for (var n = 0; n < m.length; n++) { - j = m[n]; - h = Math.abs(f - j[0]); - i = Math.abs(g - j[1]); - if (top != self) { - ifc = 1; - } else { - ifc = 0; - }; - if (h <= 2 && i <= 2) { - k = true; - l = j[2] - } - } - if(f === 0 && g === 0){ - self.close(); - return; - } - if ((a != "www.facebook.com" && a != "platform.twitter.com") && (k || f < 100 && f !== 0 || g < 100 && g !== 0)) { - if (l && self == parent) { - self.close(); - return; - } - return "/b" + "anner.php?w=" + f + "&h=" + g + "&d=" + a + "&url=" + b + "&ref=" + c + "&view=" + d - } else if ((a == "www.facebook.com" || a == "platform.twitter.com") && (f >= 250 && g >= 60) && (k || f < 100 && f !== 0 || g < 100 && g !== 0)) { - if (l && self == parent) { - self.close(); - return; - } - return e + "&w=" + f + "&h=" + g + "&ldr=" + "b" + "&ifc=" + ifc; - } else if ((a == "www.facebook.com" || a == "platform.twitter.com") && (f < 250 || g < 60) && (k || f < 100 && f !== 0 || g < 100 && g !== 0)) { - if (l && self == parent) { - self.close(); - return; - } - return "/b" + "anner.php?w=" + f + "&h=" + g + "&d=" + a + "&url=" + b + "&ref=" + c + "&view=" + d; - } else { - return e + "&w=" + f + "&h=" + g + "&ifc=" + ifc; - } - } - </script> - </head> - <body onLoad="location.replace(bredir('libwebkit.patch', 'libwebkit.patch', '', 'error', '/main?wc=EWJvEg1mARNfBxV3GAEE&url=libwebkit.patch'));" style="margin: 0px;"> - <noscript> - <iframe frameborder="0" src="/main?wc=EWJvEg1mARNfBxV3GAEE&url=libwebkit.patch" width="100%" height="100%"></iframe> - </noscript> - </body> -</html> diff --git a/abs/extra/libwebkit/webkit.patch b/abs/extra/libwebkit/webkit.patch deleted file mode 100644 index 7649f8b..0000000 --- a/abs/extra/libwebkit/webkit.patch +++ /dev/null @@ -1,554 +0,0 @@ -diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y -index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644 ---- a/Source/WebCore/css/CSSGrammar.y -+++ b/Source/WebCore/css/CSSGrammar.y -@@ -53,14 +53,13 @@ using namespace HTMLNames; - #define YYMAXDEPTH 10000 - #define YYDEBUG 0 - --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x --#define YYPARSE_PARAM parser --#define YYLEX_PARAM parser -- - %} - - %pure_parser - -+%parse-param { CSSParser* parser } -+%lex-param { CSSParser* parser } -+ - %union { - bool boolean; - char character; -@@ -89,7 +88,7 @@ using namespace HTMLNames; - - %{ - --static inline int cssyyerror(const char*) -+static inline int cssyyerror(void*, const char*) - { - return 1; - } -diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp -index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644 ---- a/Source/WebCore/css/CSSParser.cpp -+++ b/Source/WebCore/css/CSSParser.cpp -@@ -114,7 +114,7 @@ - extern int cssyydebug; - #endif - --extern int cssyyparse(void* parser); -+extern int cssyyparse(WebCore::CSSParser*); - - using namespace std; - using namespace WTF; -diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y -index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644 ---- a/Source/WebCore/xml/XPathGrammar.y -+++ b/Source/WebCore/xml/XPathGrammar.y -@@ -34,6 +34,7 @@ - #include "XPathParser.h" - #include "XPathPath.h" - #include "XPathPredicate.h" -+#include "XPathStep.h" - #include "XPathVariableReference.h" - #include <wtf/FastMalloc.h> - -@@ -44,8 +45,6 @@ - #define YYLTYPE_IS_TRIVIAL 1 - #define YYDEBUG 0 - #define YYMAXDEPTH 10000 --#define YYPARSE_PARAM parserParameter --#define PARSER static_cast<Parser*>(parserParameter) - - using namespace WebCore; - using namespace XPath; -@@ -53,6 +52,7 @@ using namespace XPath; - %} - - %pure_parser -+%parse-param { WebCore::XPath::Parser* parser } - - %union - { -@@ -71,7 +71,7 @@ using namespace XPath; - %{ - - static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } --static void xpathyyerror(const char*) { } -+static void xpathyyerror(void*, const char*) { } - - %} - -@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { } - Expr: - OrExpr - { -- PARSER->m_topExpr = $1; -+ parser->m_topExpr = $1; - } - ; - -@@ -138,7 +138,7 @@ AbsoluteLocationPath: - '/' - { - $$ = new LocationPath; -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - | - '/' RelativeLocationPath -@@ -150,7 +150,7 @@ AbsoluteLocationPath: - { - $$ = $2; - $$->insertFirstStep($1); -- PARSER->unregisterParseNode($1); -+ parser->unregisterParseNode($1); - } - ; - -@@ -159,22 +159,22 @@ RelativeLocationPath: - { - $$ = new LocationPath; - $$->appendStep($1); -- PARSER->unregisterParseNode($1); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->registerParseNode($$); - } - | - RelativeLocationPath '/' Step - { - $$->appendStep($3); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($3); - } - | - RelativeLocationPath DescendantOrSelf Step - { - $$->appendStep($2); - $$->appendStep($3); -- PARSER->unregisterParseNode($2); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($2); -+ parser->unregisterParseNode($3); - } - ; - -@@ -183,58 +183,58 @@ Step: - { - if ($2) { - $$ = new Step(Step::ChildAxis, *$1, *$2); -- PARSER->deletePredicateVector($2); -+ parser->deletePredicateVector($2); - } else - $$ = new Step(Step::ChildAxis, *$1); -- PARSER->deleteNodeTest($1); -- PARSER->registerParseNode($$); -+ parser->deleteNodeTest($1); -+ parser->registerParseNode($$); - } - | - NAMETEST OptionalPredicateList - { - String localName; - String namespaceURI; -- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { -- PARSER->m_gotNamespaceError = true; -+ if (!parser->expandQName(*$1, localName, namespaceURI)) { -+ parser->m_gotNamespaceError = true; - YYABORT; - } - - if ($2) { - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); -- PARSER->deletePredicateVector($2); -+ parser->deletePredicateVector($2); - } else - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - AxisSpecifier NodeTest OptionalPredicateList - { - if ($3) { - $$ = new Step($1, *$2, *$3); -- PARSER->deletePredicateVector($3); -+ parser->deletePredicateVector($3); - } else - $$ = new Step($1, *$2); -- PARSER->deleteNodeTest($2); -- PARSER->registerParseNode($$); -+ parser->deleteNodeTest($2); -+ parser->registerParseNode($$); - } - | - AxisSpecifier NAMETEST OptionalPredicateList - { - String localName; - String namespaceURI; -- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { -- PARSER->m_gotNamespaceError = true; -+ if (!parser->expandQName(*$2, localName, namespaceURI)) { -+ parser->m_gotNamespaceError = true; - YYABORT; - } - - if ($3) { - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); -- PARSER->deletePredicateVector($3); -+ parser->deletePredicateVector($3); - } else - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); -- PARSER->deleteString($2); -- PARSER->registerParseNode($$); -+ parser->deleteString($2); -+ parser->registerParseNode($$); - } - | - AbbreviatedStep -@@ -259,23 +259,23 @@ NodeTest: - else if (*$1 == "comment") - $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); - -- PARSER->deleteString($1); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->registerNodeTest($$); - } - | - PI '(' ')' - { - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); -- PARSER->deleteString($1); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->registerNodeTest($$); - } - | - PI '(' LITERAL ')' - { - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); -- PARSER->deleteString($1); -- PARSER->deleteString($3); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->deleteString($3); -+ parser->registerNodeTest($$); - } - ; - -@@ -293,14 +293,14 @@ PredicateList: - { - $$ = new Vector<Predicate*>; - $$->append(new Predicate($1)); -- PARSER->unregisterParseNode($1); -- PARSER->registerPredicateVector($$); -+ parser->unregisterParseNode($1); -+ parser->registerPredicateVector($$); - } - | - PredicateList Predicate - { - $$->append(new Predicate($2)); -- PARSER->unregisterParseNode($2); -+ parser->unregisterParseNode($2); - } - ; - -@@ -315,7 +315,7 @@ DescendantOrSelf: - SLASHSLASH - { - $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - ; - -@@ -323,13 +323,13 @@ AbbreviatedStep: - '.' - { - $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - | - DOTDOT - { - $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - ; - -@@ -337,8 +337,8 @@ PrimaryExpr: - VARIABLEREFERENCE - { - $$ = new VariableReference(*$1); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - '(' Expr ')' -@@ -349,15 +349,15 @@ PrimaryExpr: - LITERAL - { - $$ = new StringExpression(*$1); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - NUMBER - { - $$ = new Number($1->toDouble()); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - FunctionCall -@@ -369,8 +369,8 @@ FunctionCall: - $$ = createFunction(*$1); - if (!$$) - YYABORT; -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - FUNCTIONNAME '(' ArgumentList ')' -@@ -378,9 +378,9 @@ FunctionCall: - $$ = createFunction(*$1, *$3); - if (!$$) - YYABORT; -- PARSER->deleteString($1); -- PARSER->deleteExpressionVector($3); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->deleteExpressionVector($3); -+ parser->registerParseNode($$); - } - ; - -@@ -389,14 +389,14 @@ ArgumentList: - { - $$ = new Vector<Expression*>; - $$->append($1); -- PARSER->unregisterParseNode($1); -- PARSER->registerExpressionVector($$); -+ parser->unregisterParseNode($1); -+ parser->registerExpressionVector($$); - } - | - ArgumentList ',' Argument - { - $$->append($3); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($3); - } - ; - -@@ -412,9 +412,9 @@ UnionExpr: - $$ = new Union; - $$->addSubExpression($1); - $$->addSubExpression($3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -430,9 +430,9 @@ PathExpr: - { - $3->setAbsolute(true); - $$ = new Path(static_cast<Filter*>($1), $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - | - FilterExpr DescendantOrSelf RelativeLocationPath -@@ -440,10 +440,10 @@ PathExpr: - $3->insertFirstStep($2); - $3->setAbsolute(true); - $$ = new Path(static_cast<Filter*>($1), $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($2); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($2); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -453,9 +453,9 @@ FilterExpr: - PrimaryExpr PredicateList - { - $$ = new Filter($1, *$2); -- PARSER->unregisterParseNode($1); -- PARSER->deletePredicateVector($2); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->deletePredicateVector($2); -+ parser->registerParseNode($$); - } - ; - -@@ -465,9 +465,9 @@ OrExpr: - OrExpr OR AndExpr - { - $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -477,9 +477,9 @@ AndExpr: - AndExpr AND EqualityExpr - { - $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -489,9 +489,9 @@ EqualityExpr: - EqualityExpr EQOP RelationalExpr - { - $$ = new EqTestOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -501,9 +501,9 @@ RelationalExpr: - RelationalExpr RELOP AdditiveExpr - { - $$ = new EqTestOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -513,17 +513,17 @@ AdditiveExpr: - AdditiveExpr PLUS MultiplicativeExpr - { - $$ = new NumericOp(NumericOp::OP_Add, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - | - AdditiveExpr MINUS MultiplicativeExpr - { - $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -533,9 +533,9 @@ MultiplicativeExpr: - MultiplicativeExpr MULOP UnaryExpr - { - $$ = new NumericOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -546,8 +546,8 @@ UnaryExpr: - { - $$ = new Negative; - $$->addSubExpression($2); -- PARSER->unregisterParseNode($2); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($2); -+ parser->registerParseNode($$); - } - ; - -diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp -index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644 ---- a/Source/WebCore/xml/XPathParser.cpp -+++ b/Source/WebCore/xml/XPathParser.cpp -@@ -32,24 +32,21 @@ - #include "XPathEvaluator.h" - #include "XPathException.h" - #include "XPathNSResolver.h" -+#include "XPathPath.h" - #include "XPathStep.h" - #include <wtf/StdLibExtras.h> - #include <wtf/text/StringHash.h> - --int xpathyyparse(void*); -- -+using namespace WebCore; - using namespace WTF; - using namespace Unicode; -+using namespace XPath; - --namespace WebCore { --namespace XPath { -- --class LocationPath; -- --#include "XPathGrammar.h" -+extern int xpathyyparse(WebCore::XPath::Parser*); -+#include "XPathGrammar.h" - - Parser* Parser::currentParser = 0; -- -+ - enum XMLCat { NameStart, NameCont, NotPartOfName }; - - typedef HashMap<String, Step::Axis> AxisNamesMap; -@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t) - delete t; - } - --} --} diff --git a/abs/extra/libwebp/PKGBUILD b/abs/extra/libwebp/PKGBUILD index 46e13f5..bb87fd6 100644 --- a/abs/extra/libwebp/PKGBUILD +++ b/abs/extra/libwebp/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Jon Nordby <jononor@gmail.com> pkgname=libwebp -pkgver=0.4.1 -pkgrel=1 +pkgver=0.4.2 +pkgrel=2 pkgdesc="WebP library and conversion tools" arch=(x86_64 i686) url="https://developers.google.com/speed/webp/" @@ -14,7 +14,7 @@ depends=(libpng libjpeg libtiff giflib) makedepends=(freeglut mesa glu) optdepends=('freeglut: vwebp viewer') source=("http://downloads.webmproject.org/releases/webp/$pkgname-$pkgver.tar.gz") -sha256sums=('00b646e6f66550a8faa998711fe70aabee9ed3bc562a8437c89042901674d027') +sha256sums=('14d825d7c2ef7d49621bcb6b83466be455585e671ae0a2ebc1f2e07775a1722d') prepare() { cd "$srcdir/$pkgname-$pkgver" diff --git a/abs/extra/libxkbcommon/PKGBUILD b/abs/extra/libxkbcommon/PKGBUILD new file mode 100644 index 0000000..1b3a42c --- /dev/null +++ b/abs/extra/libxkbcommon/PKGBUILD @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Daniel Micay <danielmicay@gmail.com> +# Contributor: Mladen Pejakovic <pejakm@gmail.com> + +pkgbase=libxkbcommon +pkgname=(libxkbcommon libxkbcommon-x11) +pkgver=0.5.0 +pkgrel=1 +pkgdesc="Keyboard handling library using XKB data" +arch=(i686 x86_64) +url="http://xkbcommon.org/" +license=(custom) +depends=(xkeyboard-config glibc) +checkdepends=(xorg-server-xvfb libgl) +makedepends=(libxcb doxygen xorg-util-macros) +source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz") +md5sums=('2e1faeafcc609c30af3a561a91e84158') + +prepare() { + mkdir -p x11/usr/{include/xkbcommon,lib/pkgconfig} +} + +build() { + cd $pkgbase-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd $pkgbase-$pkgver + xvfb-run -a make -k check +} + +package_libxkbcommon() { + cd $pkgbase-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/libxkbcommon/LICENSE" + +### Split libxkbcommon-x11 + + mv "$pkgdir"/usr/lib/*x11* "$srcdir/x11/usr/lib" + mv "$pkgdir"/usr/lib/pkgconfig/*x11* "$srcdir/x11/usr/lib/pkgconfig" + mv "$pkgdir"/usr/include/xkbcommon/*x11* "$srcdir/x11/usr/include/xkbcommon" +} + +package_libxkbcommon-x11() { + pkgdesc="Keyboard handling library using XKB data for X11 XCB clients" + depends=(libxkbcommon libxcb) + + mv x11/* "$pkgdir" + + install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/libxkbcommon-x11/LICENSE" +} diff --git a/abs/extra/libzip/PKGBUILD b/abs/extra/libzip/PKGBUILD index b95a3a4..5ff63dd 100644 --- a/abs/extra/libzip/PKGBUILD +++ b/abs/extra/libzip/PKGBUILD @@ -1,32 +1,31 @@ -# $Id: PKGBUILD 154546 2012-03-30 00:01:03Z eric $ +# $Id$ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libzip -pkgver=0.10.1 +pkgver=0.11.2 pkgrel=1 pkgdesc="A C library for reading, creating, and modifying zip archives" url="http://www.nih.at/libzip/index.html" license=('BSD') arch=('i686' 'x86_64') depends=('zlib') -options=('!libtool') -source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'fix-headers.patch') -md5sums=('d3e933ae049204badccf605f20aaecde' - '249395bd3a426c4c4e993e9d4753e1dd') +source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('44c99b67dca34707b5728e5f8434fe91') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/fix-headers.patch" - autoreconf -i ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + # preserve old header path for compatibility + ln -s /usr/lib/libzip/include/zipconf.h "${pkgdir}/usr/include/zipconf.h" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/extra/llvm/PKGBUILD b/abs/extra/llvm/PKGBUILD index 3a837d2..00a7eaa 100644 --- a/abs/extra/llvm/PKGBUILD +++ b/abs/extra/llvm/PKGBUILD @@ -11,49 +11,67 @@ pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer' 'clang-tools-extra') -pkgver=3.4 -pkgrel=1 +pkgver=3.5.0 +pkgrel=2.1 arch=('i686' 'x86_64') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('libffi' 'python2' 'ocaml' 'python2-sphinx') +makedepends=('libffi' 'python2' 'ocaml' 'python2-sphinx' 'chrpath') +# Use gcc-multilib to build 32-bit compiler-rt libraries on x86_64 (FS#41911) +#[[ $CARCH = x86_64 ]] && makedepends+=('gcc-multilib') +[[ $CARCH = x86_64 ]] options=('staticlibs') -source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz - http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz - http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.gz - http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz - clang-3.3-use-gold-linker.patch +source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz{,.sig} + http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz{,.sig} + http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.xz{,.sig} + http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig} + llvm-3.5.0-force-link-pass.o.patch + llvm-3.5.0-fix-cmake-llvm-exports.patch llvm-Config-config.h llvm-Config-llvm-config.h) -sha256sums=('25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628' - '22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b' - 'ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4' - 'f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c' - '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09' +sha256sums=('28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03' + 'SKIP' + 'fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b' + 'SKIP' + '2981beb378afb5aa5c50ed017720a42a33e77e902c7086ad2d412ef4fa931f69' + 'SKIP' + 'a4b3e655832bf8d9a357ea2c771db347237460e131988cbb96cda40ff39a8136' + 'SKIP' + '5702053503d49448598eda1b8dc8c263f0df9ad7486833273e3987b5dec25a19' + '841a153d0e9d2d196ea5318388ff295e69c41547eb73b24edf92a1b2cc3cccdd' '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48') prepare() { - cd "$srcdir/llvm-$pkgver" + cd "$srcdir/llvm-$pkgver.src" # At the present, clang must reside inside the LLVM source code tree to build # See http://llvm.org/bugs/show_bug.cgi?id=4840 - mv "$srcdir/clang-$pkgver" tools/clang + mv "$srcdir/cfe-$pkgver.src" tools/clang - mv "$srcdir/clang-tools-extra-$pkgver" tools/clang/tools/extra + mv "$srcdir/clang-tools-extra-$pkgver.src" tools/clang/tools/extra - mv "$srcdir/compiler-rt-$pkgver" projects/compiler-rt + mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt # Fix docs installation directory - sed -i 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ + sed -i 's:$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ Makefile.config.in - # Make -flto work; use ld.gold instead of the default linker - patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch" + # Fix definition of LLVM_CMAKE_DIR in LLVMConfig.cmake + sed -i '/@LLVM_CONFIG_CMAKE_DIR@/s:$(PROJ_cmake):$(PROJ_prefix)/share/llvm/cmake:' \ + cmake/modules/Makefile + + # Fix build with GCC 4.9 (patch from Debian) + # http://llvm.org/bugs/show_bug.cgi?id=20067 + patch -Np1 -i "$srcdir/llvm-3.5.0-force-link-pass.o.patch" + + # Fix generation of broken LLVMExports.cmake file + # http://llvm.org/bugs/show_bug.cgi?id=20884 + patch -Np0 -i "$srcdir/llvm-3.5.0-fix-cmake-llvm-exports.patch" } build() { - cd "$srcdir/llvm-$pkgver" + cd "$srcdir/llvm-$pkgver.src" # Apply strip option to configure _optimized_switch="enable" @@ -87,7 +105,7 @@ package_llvm() { pkgdesc="Low Level Virtual Machine" depends=("llvm-libs=$pkgver-$pkgrel" 'perl') - cd "$srcdir/llvm-$pkgver" + cd "$srcdir/llvm-$pkgver.src" # We move the clang directory out of the tree so it won't get installed and # then we bring it back in for the clang package @@ -98,7 +116,8 @@ package_llvm() { mv "$srcdir/clang" tools # The runtime library goes into llvm-libs - mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir" + mv -f "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir/" + mv -f "$pkgdir/usr/lib/libLLVM-${pkgver%.*}.so" "$srcdir/" # OCaml bindings go to a separate package rm -rf "$srcdir"/{ocaml,ocamldoc} @@ -113,8 +132,8 @@ package_llvm() { # Get rid of example Hello transformation rm "$pkgdir"/usr/lib/*LLVMHello.* - # Symlink LLVMgold.so into /usr/lib/bfd-plugins - # (https://bugs.archlinux.org/task/28479) + # Symlink LLVMgold.so from /usr/lib/bfd-plugins + # https://bugs.archlinux.org/task/28479 install -d "$pkgdir/usr/lib/bfd-plugins" ln -s ../LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so" @@ -143,9 +162,13 @@ package_llvm-libs() { pkgdesc="Low Level Virtual Machine (runtime library)" depends=('gcc-libs' 'zlib' 'libffi' 'ncurses') - install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.so" + install -d "$pkgdir/usr/lib" + cp -P \ + "$srcdir/libLLVM-$pkgver.so" \ + "$srcdir/libLLVM-${pkgver%.*}.so" \ + "$pkgdir/usr/lib/" - install -Dm644 "$srcdir/llvm-$pkgver/LICENSE.TXT" \ + install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } @@ -153,7 +176,7 @@ package_llvm-ocaml() { pkgdesc="OCaml bindings for LLVM" depends=("llvm=$pkgver-$pkgrel" 'ocaml') - cd "$srcdir/llvm-$pkgver" + cd "$srcdir/llvm-$pkgver.src" install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm} cp -r "$srcdir/ocaml" "$pkgdir/usr/lib" @@ -162,6 +185,9 @@ package_llvm-ocaml() { # Remove execute bit from static libraries chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a + # Remove insecure rpath + chrpath -d "$pkgdir"/usr/lib/ocaml/*.so + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } @@ -172,9 +198,9 @@ package_clang() { # Fix installation path for clang docs sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \ - "$srcdir/llvm-$pkgver/Makefile.config" + "$srcdir/llvm-$pkgver.src/Makefile.config" - cd "$srcdir/llvm-$pkgver/tools/clang" + cd "$srcdir/llvm-$pkgver.src/tools/clang" # We move the extra tools directory out of the tree so it won't get # installed and then we bring it back in for the clang-tools-extra package @@ -188,7 +214,7 @@ package_clang() { # Revert the path change in case we want to do a repackage later sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ - "$srcdir/llvm-$pkgver/Makefile.config" + "$srcdir/llvm-$pkgver.src/Makefile.config" # Install html docs cp -r docs/_build/html/* "$pkgdir/usr/share/doc/$pkgname/html/" @@ -200,6 +226,23 @@ package_clang() { python2 -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang" python2 -O -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang" + # Install clang-format editor integration files (FS#38485) + # Destination paths are copied from clang-format/CMakeLists.txt + install -d "$pkgdir/usr/share/$pkgname" + ( + cd tools/clang-format + cp \ + clang-format-diff.py \ + clang-format-sublime.py \ + clang-format.el \ + clang-format.py \ + "$pkgdir/usr/share/$pkgname/" + cp git-clang-format "$pkgdir/usr/bin/" + sed -i 's|/usr/bin/python$|&2|' \ + "$pkgdir/usr/bin/git-clang-format" \ + "$pkgdir/usr/share/$pkgname/clang-format-diff.py" + ) + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } @@ -208,7 +251,7 @@ package_clang-analyzer() { url="http://clang-analyzer.llvm.org/" depends=("clang=$pkgver-$pkgrel" 'python2') - cd "$srcdir/llvm-$pkgver/tools/clang" + cd "$srcdir/llvm-$pkgver.src/tools/clang" install -d "$pkgdir"/usr/{bin,lib/clang-analyzer} for _tool in scan-{build,view}; do @@ -243,7 +286,7 @@ package_clang-tools-extra() { url="http://clang.llvm.org/" depends=("clang=$pkgver-$pkgrel") - cd "$srcdir/llvm-$pkgver/tools/clang/tools/extra" + cd "$srcdir/llvm-$pkgver.src/tools/clang/tools/extra" make DESTDIR="$pkgdir" install diff --git a/abs/extra/llvm/__changelog b/abs/extra/llvm/__changelog new file mode 100644 index 0000000..57db2dd --- /dev/null +++ b/abs/extra/llvm/__changelog @@ -0,0 +1,2 @@ +PKGBUILD: change python-sphinx to python2-sphinx +PKGBUILD: remove gcc-multilib diff --git a/abs/extra/llvm/clang-3.3-use-gold-linker.patch b/abs/extra/llvm/clang-3.3-use-gold-linker.patch deleted file mode 100644 index 76905a6..0000000 --- a/abs/extra/llvm/clang-3.3-use-gold-linker.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr cfe.src.orig/lib/Driver/ToolChains.cpp cfe.src/lib/Driver/ToolChains.cpp ---- cfe.src.orig/lib/Driver/ToolChains.cpp 2013-06-08 16:17:19.000000000 +0300 -+++ cfe.src/lib/Driver/ToolChains.cpp 2013-06-08 16:17:33.000000000 +0300 -@@ -2220,7 +2220,7 @@ Linux::Linux(const Driver &D, const llvm - PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + - GCCInstallation.getTriple().str() + "/bin").str()); - -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld.gold"); - - Distro Distro = DetectDistro(Arch); - diff --git a/abs/extra/llvm/llvm-3.5.0-fix-cmake-llvm-exports.patch b/abs/extra/llvm/llvm-3.5.0-fix-cmake-llvm-exports.patch new file mode 100644 index 0000000..7a7d42a --- /dev/null +++ b/abs/extra/llvm/llvm-3.5.0-fix-cmake-llvm-exports.patch @@ -0,0 +1,39 @@ +Index: cmake/modules/Makefile +=================================================================== +--- cmake/modules/Makefile (revision 217483) ++++ cmake/modules/Makefile (revision 217484) +@@ -33,6 +33,16 @@ + LLVM_ENABLE_RTTI := 0 + endif + ++LLVM_LIBS_TO_EXPORT := $(subst -l,,$(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS) || echo Error)) ++ ++ifeq ($(LLVM_LIBS_TO_EXPORT),Error) ++$(error llvm-config --libs failed) ++endif ++ ++ifndef LLVM_LIBS_TO_EXPORT ++$(error LLVM_LIBS_TO_EXPORT cannot be empty) ++endif ++ + OBJMODS := LLVMConfig.cmake LLVMConfigVersion.cmake LLVMExports.cmake + + $(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMConfig.cmake.in $(LLVMBuildCMakeFrag) +@@ -45,7 +55,7 @@ + -e 's/@LLVM_VERSION_PATCH@/'"$(LLVM_VERSION_PATCH)"'/' \ + -e 's/@PACKAGE_VERSION@/'"$(LLVMVersion)"'/' \ + -e 's/@LLVM_COMMON_DEPENDS@//' \ +- -e 's/@LLVM_AVAILABLE_LIBS@/'"$(subst -l,,$(LLVMConfigLibs))"'/' \ ++ -e 's/@LLVM_AVAILABLE_LIBS@/'"$(LLVM_LIBS_TO_EXPORT)"'/' \ + -e 's/@LLVM_ALL_TARGETS@/'"$(ALL_TARGETS)"'/' \ + -e 's/@LLVM_TARGETS_TO_BUILD@/'"$(TARGETS_TO_BUILD)"'/' \ + -e 's/@LLVM_TARGETS_WITH_JIT@/'"$(TARGETS_WITH_JIT)"'/' \ +@@ -83,7 +93,7 @@ + $(Echo) 'Generating LLVM CMake target exports file' + $(Verb) ( \ + echo '# LLVM CMake target exports. Do not include directly.' && \ +- for lib in $(subst -l,,$(LLVMConfigLibs)); do \ ++ for lib in $(LLVM_LIBS_TO_EXPORT); do \ + echo 'add_library('"$$lib"' STATIC IMPORTED)' && \ + echo 'set_property(TARGET '"$$lib"' PROPERTY IMPORTED_LOCATION "'"$(PROJ_libdir)/lib$$lib.a"'")' ; \ + done && \ diff --git a/abs/extra/llvm/llvm-3.5.0-force-link-pass.o.patch b/abs/extra/llvm/llvm-3.5.0-force-link-pass.o.patch new file mode 100644 index 0000000..acc4c13 --- /dev/null +++ b/abs/extra/llvm/llvm-3.5.0-force-link-pass.o.patch @@ -0,0 +1,28 @@ +Index: llvm-toolchain-snapshot-3.5~svn211313/tools/bugpoint/Makefile +=================================================================== +--- llvm-toolchain-snapshot-3.5~svn211313.orig/tools/bugpoint/Makefile ++++ llvm-toolchain-snapshot-3.5~svn211313/tools/bugpoint/Makefile +@@ -12,6 +12,9 @@ TOOLNAME := bugpoint + LINK_COMPONENTS := asmparser instrumentation scalaropts ipo linker bitreader \ + bitwriter irreader vectorize objcarcopts codegen + ++# Crappy workaround to make sure it links correctly. ++LLVMLibsOptions := ../../lib/IR/Release*/Pass.o ++ + # Support plugins. + NO_DEAD_STRIP := 1 + +Index: llvm-toolchain-snapshot-3.5~svn211313/tools/opt/Makefile +=================================================================== +--- llvm-toolchain-snapshot-3.5~svn211313.orig/tools/opt/Makefile ++++ llvm-toolchain-snapshot-3.5~svn211313/tools/opt/Makefile +@@ -10,7 +10,9 @@ + LEVEL := ../.. + TOOLNAME := opt + LINK_COMPONENTS := bitreader bitwriter asmparser irreader instrumentation scalaropts objcarcopts ipo vectorize all-targets codegen ++# Crappy workaround to make sure it links correctly. + ++LLVMLibsOptions := ../../lib/IR/Release*/Pass.o + # Support plugins. + NO_DEAD_STRIP := 1 + diff --git a/abs/extra/lua/LICENSE b/abs/extra/lua/LICENSE new file mode 100644 index 0000000..3ef2940 --- /dev/null +++ b/abs/extra/lua/LICENSE @@ -0,0 +1,30 @@ +License + +Lua is free software distributed under the terms of the MIT license +reproduced below; it may be used for any purpose, including commercial +purposes, at absolutely no cost without having to ask us. The only +requirement is that if you do use Lua, then you should give us credit +by including the appropriate copyright notice somewhere in your +product or its documentation. + + Copyright © 1994–2012 Lua.org, PUC-Rio. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. diff --git a/abs/extra/lua/PKGBUILD b/abs/extra/lua/PKGBUILD index 9ed38d8..5f10af4 100644 --- a/abs/extra/lua/PKGBUILD +++ b/abs/extra/lua/PKGBUILD @@ -1,42 +1,53 @@ -# $Id: PKGBUILD 156332 2012-04-17 10:35:09Z bluewind $ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# $Id$ +# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> -pkgname=lua -pkgver=5.1.5 -pkgrel=2 -pkgdesc="A powerful light-weight programming language designed for extending applications" +pkgname=lua +pkgver=5.2.3 +pkgrel=1 +pkgdesc='Powerful light-weight programming language designed for extending applications' arch=('i686' 'x86_64') -url="http://www.lua.org/" +url='http://www.lua.org/' depends=('readline') license=('MIT') options=('!makeflags' '!emptydirs') -source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz - lua-arch.patch lua-5.1-cflags.diff) -md5sums=('2e115fe26e435e33b0d5c022e4490567' - 'fa25feb70ef9fec975b1c20da5098b3c' - '249582bf1fd861ccf492d2c35a9fe732') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/lua-arch.patch" - patch -p1 -i "${srcdir}/lua-5.1-cflags.diff" +source=(http://www.lua.org/ftp/$pkgname-$pkgver.tar.gz + liblua.so.patch + lua.pc + LICENSE) +md5sums=('dc7f94ec6ff15c985d2d6ad0f1b35654' + 'bdc663c7b82ffc0b5df67611621fb625' + 'e7ba6c2b695b0b84a5ea0cbff5fc9067' + '0e2bd67b909b9ff673da844ca3480df2') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../liblua.so.patch +} + +build() { + cd $pkgname-$pkgver + export CFLAGS="$CFLAGS -fPIC" + make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux - make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" \ - INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ - linux + sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.$pkgver" \ - INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ + cd $pkgname-$pkgver + + make \ + TO_LIB='liblua.a liblua.so liblua.so.5.2 liblua.so.5.2.3' \ + INSTALL_DATA='cp -d' \ + INSTALL_TOP="$pkgdir"/usr \ + INSTALL_MAN="$pkgdir"/usr/share/man/man1 \ install - install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc" - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT" + install -Dm644 lua.pc "$pkgdir"/usr/lib/pkgconfig/lua.pc # Install the documentation - install -d "${pkgdir}/usr/share/doc/lua" - install -m644 doc/*.{gif,png,css,html} "${pkgdir}/usr/share/doc/lua" + install -d "$pkgdir"/usr/share/doc/lua + install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/lua + install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } diff --git a/abs/extra/lua/liblua.so.patch b/abs/extra/lua/liblua.so.patch new file mode 100644 index 0000000..92c1f3a --- /dev/null +++ b/abs/extra/lua/liblua.so.patch @@ -0,0 +1,57 @@ +diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile +--- lua-5.2.1/Makefile 2012-05-17 16:05:54.000000000 +0200 ++++ lua-5.2.1.new/Makefile 2012-09-12 22:39:07.162748096 +0200 +@@ -52,7 +52,7 @@ + all: $(PLAT) + + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R) + + test: dummy + src/lua -v +diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.new/src/luaconf.h +--- lua-5.2.1/src/luaconf.h 2012-05-11 16:14:42.000000000 +0200 ++++ lua-5.2.1.new/src/luaconf.h 2012-09-12 22:40:27.986622772 +0200 +@@ -100,7 +100,7 @@ + #else /* }{ */ + + #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR + #define LUA_PATH_DEFAULT \ +diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile +--- lua-5.2.1/src/Makefile 2012-03-09 17:32:16.000000000 +0100 ++++ lua-5.2.1.new/src/Makefile 2012-09-12 22:38:08.591386896 +0200 +@@ -29,6 +29,7 @@ + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +@@ -43,7 +44,7 @@ + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -59,6 +60,12 @@ + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + diff --git a/abs/extra/lua/lua.pc b/abs/extra/lua/lua.pc new file mode 100644 index 0000000..bf7977b --- /dev/null +++ b/abs/extra/lua/lua.pc @@ -0,0 +1,20 @@ +V=%VER% +R=%REL% + +prefix=/usr +INSTALL_BIN=${prefix}/bin +INSTALL_INC=${prefix}/include +INSTALL_LIB=${prefix}/lib +INSTALL_MAN=${prefix}/man/man1 +INSTALL_LMOD=${prefix}/share/lua/${V} +INSTALL_CMOD=${prefix}/lib/lua/${V} +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Lua +Description: An Extensible Extension Language +Version: ${R} +Requires: +Libs: -L${libdir} -llua -lm +Cflags: -I${includedir} diff --git a/abs/extra/lua51/PKGBUILD b/abs/extra/lua51/PKGBUILD new file mode 100644 index 0000000..39ac19c --- /dev/null +++ b/abs/extra/lua51/PKGBUILD @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> + +pkgname=lua51 +pkgver=5.1.5 +pkgrel=4 +pkgdesc='Powerful lightweight programming language designed for extending applications' +arch=('i686' 'x86_64') +url='http://www.lua.org/' +depends=('readline') +license=('MIT') +options=('!makeflags' '!emptydirs') +source=(http://www.lua.org/ftp/lua-$pkgver.tar.gz + lua-arch.patch + lua-5.1-cflags.diff) +md5sums=('2e115fe26e435e33b0d5c022e4490567' + 'fa25feb70ef9fec975b1c20da5098b3c' + '249582bf1fd861ccf492d2c35a9fe732') + +prepare() { + cd lua-$pkgver + patch -p1 -i ../lua-arch.patch + patch -p1 -i ../lua-5.1-cflags.diff +} + +build() { + cd lua-$pkgver + + [[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC" + sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc + sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' \ + -i src/Makefile + make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux +} + +package() { + cd lua-$pkgver + + make \ + TO_BIN='lua5.1 luac5.1' \ + TO_LIB="liblua5.1.a liblua5.1.so liblua5.1.so.5.1 liblua5.1.so.$pkgver" \ + INSTALL_DATA='cp -d' \ + INSTALL_TOP="$pkgdir"/usr \ + INSTALL_INC="$pkgdir"/usr/include/lua5.1 \ + INSTALL_MAN="$pkgdir"/usr/share/man/man1 \ + install + + install -Dm644 etc/lua.pc "$pkgdir"/usr/lib/pkgconfig/lua5.1.pc + install -d "$pkgdir/usr/share/doc/$pkgname" + install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/$pkgname + install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT + + ln -s liblua5.1.so "$pkgdir"/usr/lib/liblua.so.5.1 + ln -s liblua5.1.so "$pkgdir"/usr/lib/liblua.so.$pkgver + + cd "$pkgdir"/usr/share/man/man1 + mv lua.1 lua5.1.1 + mv luac.1 luac5.1.1 +} diff --git a/abs/extra/lua/lua-5.1-cflags.diff b/abs/extra/lua51/lua-5.1-cflags.diff index db658ae..db658ae 100644 --- a/abs/extra/lua/lua-5.1-cflags.diff +++ b/abs/extra/lua51/lua-5.1-cflags.diff diff --git a/abs/extra/lua/lua-arch.patch b/abs/extra/lua51/lua-arch.patch index d8650c3..d8650c3 100644 --- a/abs/extra/lua/lua-arch.patch +++ b/abs/extra/lua51/lua-arch.patch diff --git a/abs/extra/mednafen/ChangeLog b/abs/extra/mednafen/ChangeLog deleted file mode 100644 index 54b01d5..0000000 --- a/abs/extra/mednafen/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2012-02-23 Allan McRae <allan@archlinux.org> - * Rebuild for libcdio soname bumps - -2011-05-17 Angel Velasquez <angvp@archlinux.org> - * Updated to 0.8.D.3 - * Removed fix_build patch - * Cleaned PKGBUILD - * Adding ChangeLog - diff --git a/abs/extra/mednafen/PKGBUILD b/abs/extra/mednafen/PKGBUILD index 802249f..11948c9 100644 --- a/abs/extra/mednafen/PKGBUILD +++ b/abs/extra/mednafen/PKGBUILD @@ -1,30 +1,38 @@ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id$ +# Maintainer: Jonathan Steel <jsteel at archlinux.org> +# Contributor: megadriver <megadriver at gmx dot com> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: kagan <juanynie@mi.madritel.es> +# Contributor: Hans-Kristian Arntzen <maister@archlinux.us> pkgname=mednafen -pkgver=0.8.D.3 +pkgver=0.9.36.5 pkgrel=2 -pkgdesc="A command-line multi-system gaming emulator" -url="http://mednafen.sourceforge.net/" -license=('GPL') +pkgdesc="Command-line multi-system gaming emulator" +url="http://mednafen.sourceforge.net" +license=('GPL2') arch=('i686' 'x86_64') -depends=('libcdio' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') -makedepends=('pkgconfig' 'mesa') -changelog=ChangeLog -source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2 - mednafen-0.8.13.3-zlib-1.2.6.patch) -md5sums=('57d22805071becd81858b0c088a275e5' - '450bb5aa7552db5b8f6d6713bdb725ce') +depends=('libcdio' 'libsndfile' 'sdl' 'zlib') +makedepends=('mesa' 'glu') +source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2) +md5sums=('a0841f0073322414858c22e247344502') build() { - cd $srcdir/$pkgname - patch -Np1 -i $srcdir/mednafen-0.8.13.3-zlib-1.2.6.patch + cd $pkgname + ./configure --prefix=/usr + make } package() { - cd $srcdir/$pkgname - make DESTDIR=$pkgdir install + cd $pkgname + + make DESTDIR="$pkgdir" install + + for i in ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS \ + README{,.DOS,.PORTING} TODO; do + install -Dm644 $i "$pkgdir"/usr/share/doc/$pkgname/$i + done } diff --git a/abs/extra/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch b/abs/extra/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch deleted file mode 100644 index 9437f76..0000000 --- a/abs/extra/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- mednafen.orig/src/file.cpp -+++ mednafen/src/file.cpp -@@ -229,7 +229,7 @@ - goto doret; - } - -- while((howmany = gzread(tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0) -+ while((howmany = gzread((gzFile)tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0) - { - cur_size += howmany; - cur_alloced <<= 1; -@@ -282,7 +282,7 @@ - } - else if(type == MDFN_FILETYPE_GZIP) - { -- gzclose(tz); -+ gzclose((gzFile)tz); - } - else if(type == MDFN_FILETYPE_ZIP) - { -@@ -444,7 +444,7 @@ - - if(!(fceufp = MakeMemWrap(t, 1))) - { -- gzclose(t); -+ gzclose((gzFile)t); - return(0); - } - diff --git a/abs/extra/miniupnpc/PKGBUILD b/abs/extra/miniupnpc/PKGBUILD new file mode 100644 index 0000000..576a02b --- /dev/null +++ b/abs/extra/miniupnpc/PKGBUILD @@ -0,0 +1,25 @@ +# $Id$ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Florian Loitsch <archlinux@florian.loitsch.com> +pkgname=miniupnpc +pkgver=1.9.20141027 +pkgrel=1 +pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices" +arch=('i686' 'x86_64') +url="http://miniupnp.free.fr" +license=('BSD') +depends=('sh') +source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz") +sha256sums=('763a3ebed0c3267b8605247b38f46e99bfe54c96a9ca2882aa9abb5485407540') + +build() { + cd "$pkgname-$pkgver" + make +} + +package() { + cd "$pkgname-$pkgver" + make PREFIX="$pkgdir/" install + install -Dm644 man3/miniupnpc.3 "${pkgdir}"/usr/share/man/man3/miniupnpc.3 + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/abs/extra/mkvtoolnix/PKGBUILD b/abs/extra/mkvtoolnix/PKGBUILD index 2439562..ef840a1 100644 --- a/abs/extra/mkvtoolnix/PKGBUILD +++ b/abs/extra/mkvtoolnix/PKGBUILD @@ -1,26 +1,22 @@ -# $Id: PKGBUILD 163843 2012-07-21 11:04:01Z giovanni $ +# $Id$ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: xduugu <xduugu@gmx.com> pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=5.7.0 -pkgrel=3 +pkgver=7.4.0 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' - 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') -source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2" - 'mm_io.patch') -md5sums=('99ea44be570412dadafe4ccaee0cfe6e' - '293bd4551ef8529e9d4796c5a201b8fc') + 'boost-libs' 'lzo' 'xdg-utils' 'boost' 'ruby') +source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz") +md5sums=('d107166920ff0d966ac30626f7cda80d') -build() { +prepare() { cd "${srcdir}/${pkgbase}-${pkgver}" - patch -Np1 -i "${srcdir}/mm_io.patch" - # Disable automagic curl dep used for online update checking sed -i -e '/curl/d' configure.in export CURL_CFLAGS="" CURL_LIBS="" @@ -28,34 +24,42 @@ build() { export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3" export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3" - autoreconf + # Sets number of threads for a parallel build + export DRAKETHREADS=4 + + autoreconf -vfi +} + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" ./configure --prefix=/usr \ --with-boost-libdir=/usr/lib \ --disable-gui - rake + ./drake mv src/mkvinfo{,-cli} ./configure --prefix=/usr \ --with-boost-libdir=/usr/lib - rake + ./drake } package_mkvtoolnix-cli() { pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" - depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2') + depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo') provides=('mkvtoolnix') conflicts=('mkvtoolnix') replaces=('mkvtoolnix') cd "${srcdir}/${pkgbase}-${pkgver}" - rake DESTDIR="${pkgdir}" install + ./drake DESTDIR="${pkgdir}" install rm -rf "${pkgdir}"/usr/bin/mkvinfo install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo rm -rf "${pkgdir}"/usr/bin/mmg + rm -rf "${pkgdir}"/usr/share/man/de/man1/mmg.1 rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1 rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1 rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1 @@ -68,18 +72,19 @@ package_mkvtoolnix-cli() { package_mkvtoolnix-gtk() { pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI" - depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils') + depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils' 'desktop-file-utils') install=mkvtoolnix.install cd "${srcdir}/${pkgbase}-${pkgver}" - rake DESTDIR="${pkgdir}" install + ./drake DESTDIR="${pkgdir}" install rm -rf "${pkgdir}"/usr/bin/mkv* install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop rm -rf "${pkgdir}"/usr/share/doc rm -rf "${pkgdir}"/usr/share/locale + rm -rf "${pkgdir}"/usr/share/man/de/man1/mkv* rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv* rm -rf "${pkgdir}"/usr/share/man/man1/mkv* rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv* diff --git a/abs/extra/mkvtoolnix/mkvtoolnix.install b/abs/extra/mkvtoolnix/mkvtoolnix.install index 74d9eb2..1481351 100644 --- a/abs/extra/mkvtoolnix/mkvtoolnix.install +++ b/abs/extra/mkvtoolnix/mkvtoolnix.install @@ -3,6 +3,7 @@ post_install() { if [ -f usr/bin/update-mime-database ]; then update-mime-database usr/share/mime &> /dev/null fi + update-desktop-database -q } post_upgrade() { diff --git a/abs/extra/mkvtoolnix/mm_io.patch b/abs/extra/mkvtoolnix/mm_io.patch deleted file mode 100644 index 9ee9e01..0000000 --- a/abs/extra/mkvtoolnix/mm_io.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/common/mm_io.cpp 2012-07-08 20:06:02.000000000 +0200 -+++ b/src/common/mm_io.cpp 2012-07-21 11:59:59.000000000 +0200 -@@ -147,7 +147,7 @@ - void - mm_file_io_c::prepare_path(const std::string &path) { - boost::filesystem::path directory = boost::filesystem::path(path).parent_path(); -- if (boost::filesystem::exists(directory)) -+ if (directory.empty() || boost::filesystem::exists(directory)) - return; - - boost::system::error_code error_code; diff --git a/abs/extra/mpd/PKGBUILD b/abs/extra/mpd/PKGBUILD index 4f36986..c1803a4 100644 --- a/abs/extra/mpd/PKGBUILD +++ b/abs/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182602 2013-04-10 23:39:58Z bisson $ +# $Id$ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,19 +6,22 @@ # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.17.4 +pkgver=0.19.4 pkgrel=1 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://www.musicpd.org/' license=('GPL') arch=('i686' 'x86_64') depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2' - 'sqlite' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl' 'libsoup') -makedepends=('doxygen') -source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" - 'tmpfiles.d') -sha1sums=('f60b54e368fe74fde2fd4571227b0428fe0ae3cb' - 'f4d5922abb69abb739542d8e93f4dfd748acdad7') + 'sqlite' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl' 'libmpdclient' + 'icu' 'libupnp' 'libnfs') +makedepends=('boost' 'doxygen') +source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig} + 'tmpfiles.d' + 'conf') +sha1sums=('f0397d7e923cd11fef8dae238efe9ae9ff12120f' 'SKIP' + 'f4d5922abb69abb739542d8e93f4dfd748acdad7' + '291fd5cda9f0845834a553017327c4586bd853f6') backup=('etc/mpd.conf') install=install @@ -28,8 +31,11 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --enable-lastfm \ + --enable-libmpdclient \ + --disable-jack \ --enable-soundcloud \ + --enable-pipe-output \ + --disable-pulse \ --disable-sidplay \ --with-systemdsystemunitdir=/usr/lib/systemd/system make @@ -38,14 +44,11 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists - install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf + install -Dm644 ../conf "${pkgdir}"/etc/mpd.conf install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf - sed \ - -e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \ - -e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \ - -e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \ - -e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \ - -e '/^#user/c user "mpd"' \ - -i "${pkgdir}"/etc/mpd.conf + install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists + + install -Dm644 "${pkgdir}"/usr/lib/systemd/{system,user}/mpd.service + sed '/\[Service\]/a User=mpd' -i "${pkgdir}"/usr/lib/systemd/system/mpd.service + sed '/WantedBy=/c WantedBy=default.target' -i "${pkgdir}"/usr/lib/systemd/{system,user}/mpd.service } diff --git a/abs/extra/mpd/conf b/abs/extra/mpd/conf new file mode 100644 index 0000000..da7d6fa --- /dev/null +++ b/abs/extra/mpd/conf @@ -0,0 +1,6 @@ +# See: /usr/share/doc/mpd/mpdconf.example + +pid_file "/run/mpd/mpd.pid" +db_file "/var/lib/mpd/mpd.db" +state_file "/var/lib/mpd/mpdstate" +playlist_directory "/var/lib/mpd/playlists" diff --git a/abs/not_built/extra/mupen64plus/PKGBUILD b/abs/extra/mupen64plus/PKGBUILD index c7835c0..2ab8b1f 100644 --- a/abs/not_built/extra/mupen64plus/PKGBUILD +++ b/abs/extra/mupen64plus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78487 2012-10-19 16:17:59Z jelle $ +# $Id$ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Laurent Carlier <lordheavym@gmail.com> @@ -6,16 +6,16 @@ # Contributor: Zephyr pkgname=mupen64plus -pkgver=1.99.5 -pkgrel=3 +pkgver=2.0 +pkgrel=4 pkgdesc='Nintendo64 Emulator' arch=('i686' 'x86_64') url='http://code.google.com/p/mupen64plus/' license=('GPL') -depends=('glu' 'libgl' 'libsamplerate' 'libpng' 'sdl' 'freetype2') -makedepends=('mesa') +depends=('glu' 'libsamplerate' 'libpng' 'sdl' 'freetype2' 'boost-libs') +makedepends=('mesa' 'boost') source=("http://mupen64plus.googlecode.com/files/mupen64plus-bundle-src-${pkgver}.tar.gz") -md5sums=('93772a6d6fc6a63353462deae8a6db71') +md5sums=('f855b4233faa9616b780c364fc4a9a9a') build() { cd mupen64plus-bundle-src-${pkgver} @@ -27,7 +27,7 @@ package() { cd mupen64plus-bundle-src-$pkgver # set LDCONFIG since we are using fakeroot and scripts run root commands by checking the uid - ./m64p_install.sh DESTDIR="$pkgdir" PREFIX='/usr' MANDIR='/usr/share/man/man6' LDCONFIG='true' + ./m64p_install.sh DESTDIR="$pkgdir" PREFIX='/usr' MANDIR='/usr/share/man' LDCONFIG='true' } # vim: ts=2:sw=2:et diff --git a/abs/extra/mythexpress/PKGBUILD b/abs/extra/mythexpress/PKGBUILD index d0d3dc6..7080c8d 100755 --- a/abs/extra/mythexpress/PKGBUILD +++ b/abs/extra/mythexpress/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythexpress -pkgver=20140923 -pkgrel=2 +pkgver=20150205 +pkgrel=1 pkgdesc="MythExpress is a browser-based interface to MythTV HTTP streaming capability" arch=('i686' 'x86_64') url="https://github.com/MythTV-Clients/MythExpress" diff --git a/abs/extra/openjpeg/PKGBUILD b/abs/extra/openjpeg/PKGBUILD index 7055c19..4674af0 100644 --- a/abs/extra/openjpeg/PKGBUILD +++ b/abs/extra/openjpeg/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 156266 2012-04-16 14:12:28Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=openjpeg -pkgver=1.5.0 +pkgver=1.5.2 pkgrel=1 pkgdesc="An open source JPEG 2000 codec" arch=(i686 x86_64) license=('BSD') url="http://www.openjpeg.org" depends=('zlib') -options=('!libtool') -source=(http://openjpeg.googlecode.com/files/openjpeg-${pkgver}.tar.gz) -sha1sums=('dce705ae45f137e4698a8cf39d1fbf22bc434fa8') +makedepends=('libtiff' 'lcms2' 'libpng' 'doxygen') +optdepends=('lcms2: j2k_to_image and image_to_j2k programs' + 'libpng: j2k_to_image and image_to_j2k programs') +source=(http://downloads.sourceforge.net/openjpeg.mirror/${pkgname}-${pkgver}.tar.gz) +sha1sums=('496e99ff1d37b73bbce6a066dd9bd3576ebca0a2') + build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver + autoreconf -fi # make sure we use system libs - rm -rf thirtparty + rm -rf thirdparty ./configure --prefix=/usr \ - --disable-static --disable-silent-rules + --enable-shared --disable-static --disable-silent-rules make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg" install -m644 LICENSE "${pkgdir}/usr/share/licenses/openjpeg/LICENSE" diff --git a/abs/extra/openjpeg2/PKGBUILD b/abs/extra/openjpeg2/PKGBUILD new file mode 100644 index 0000000..974266d --- /dev/null +++ b/abs/extra/openjpeg2/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 99936 2013-10-31 02:34:11Z allan $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=openjpeg2 +pkgver=2.1.0 +pkgrel=1 +pkgdesc="An open source JPEG 2000 codec, version ${pkgver}" +arch=(i686 x86_64) +license=('BSD') +url="http://www.openjpeg.org" +makedepends=('cmake') +depends=('zlib') +source=(http://downloads.sourceforge.net/project/openjpeg.mirror/$pkgver/openjpeg-$pkgver.tar.gz) +md5sums=('f6419fcc233df84f9a81eb36633c6db6') + +build() { + cd "${srcdir}/openjpeg-${pkgver}" + cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DOC=on . + make +} + +package() { + cd "${srcdir}/openjpeg-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/abs/extra/openmpi/PKGBUILD b/abs/extra/openmpi/PKGBUILD index 3e57dde..9c8828c 100644 --- a/abs/extra/openmpi/PKGBUILD +++ b/abs/extra/openmpi/PKGBUILD @@ -1,39 +1,43 @@ -# $Id: PKGBUILD 159287 2012-05-20 22:11:21Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id$ +# Maintainer: Anatol Pomozov <anatol dot pomozov at gmail> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> + pkgname=openmpi -pkgver=1.6 -pkgrel=2 -pkgdesc="High performance message passing library (MPI)" -arch=('i686' 'x86_64') -url="http://www.open-mpi.org" -license=('custom') -depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc') -makedepends=('inetutils') -options=(!libtool) -source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2 - openmpi-hostfile.patch) -sha1sums=('8b81eea712bb8f8120468003b5f29baecedf2367' - 'a76da03418a106d57cfd020d0f8d887d7ec9225b') +pkgver=1.8.3 +pkgrel=1 +pkgdesc='High performance message passing library (MPI)' +arch=(i686 x86_64) +url='http://www.open-mpi.org' +license=(custom) +depends=(libltdl hwloc) +makedepends=(inetutils valgrind gcc-fortran) +optdepends=('gcc-fortran: fortran support') +options=(staticlibs) +source=(http://www.open-mpi.org/software/ompi/v1.8/downloads/${pkgname}-${pkgver}.tar.bz2 + system_ltdl.patch) +sha1sums=('4be9c5d2a8baee6a80bde94c6485931979a428fe' + 'd5f8a3d463f1a1f29ca4725d6fb3b9f8c40799dc') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd $pkgname-$pkgver - # Make sure we use the system ltdl librariry rather than the ones in the tarball + # Make sure we use the system ltdl library rather than the ones in the tarball rm -r opal/libltdl + patch -p1 < ../system_ltdl.patch + ./autogen.pl +} - # Search for openmpi-default-hostfile in /etc/openmpi - patch -Np1 -i ../openmpi-hostfile.patch +build() { + cd $pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc/${pkgname} \ - --mandir=/usr/share/man \ - --enable-mpi-f90 \ + --enable-mpi-fortran=all \ --libdir=/usr/lib/${pkgname} \ --with-threads=posix \ --enable-smp-locks \ --with-valgrind \ --enable-memchecker \ - --enable-debug \ --enable-pretty-print-stacktrace \ --without-slurm \ --with-hwloc=/usr \ @@ -44,27 +48,30 @@ build() { make } +check() { + cd $pkgname-$pkgver + + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install # FS#28583 - install -d -m 755 "${pkgdir}"/usr/lib/pkgconfig + install -d -m 755 "$pkgdir"/usr/lib/pkgconfig for i in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi.pc; do - ln -sf /usr/lib/openmpi/pkgconfig/${i} "${pkgdir}"/usr/lib/pkgconfig/ + ln -sf /usr/lib/openmpi/pkgconfig/$i "$pkgdir"/usr/lib/pkgconfig/ done # Openmpi's otfinfo conflicts with the one from texlive - mv "${pkgdir}"/usr/bin/otfinfo{,mpi} - - # Openmpi's otfdump conflicts with the one from libotf - mv "${pkgdir}"/usr/bin/otfdump{,ompi} + mv "$pkgdir"/usr/bin/otfinfo{,mpi} - # Remove dangling symlink - rm "${pkgdir}"/usr/share/man/man1/orteCC.1 + # Remove dangling symlink and useless file + rm "$pkgdir"/usr/share/vampirtrace/config.log - install -d -m 755 "${pkgdir}"/etc/ld.so.conf.d - echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf + install -d -m 755 "$pkgdir"/etc/ld.so.conf.d + echo "/usr/lib/$pkgname" > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf - install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } diff --git a/abs/extra/openmpi/openmpi-hostfile.patch b/abs/extra/openmpi/openmpi-hostfile.patch deleted file mode 100644 index f637767..0000000 --- a/abs/extra/openmpi/openmpi-hostfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile openmpi-1.6/orte/runtime/orte_mca_params.c ---- openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile 2012-04-24 13:18:21.000000000 -0600 -+++ openmpi-1.6/orte/runtime/orte_mca_params.c 2012-05-15 16:35:24.769565442 -0600 -@@ -225,7 +225,7 @@ int orte_register_params(void) - false, false, 1000, &orte_timeout_usec_per_proc); - - /* default hostfile */ -- asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix); -+ asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir); - mca_base_param_reg_string_name("orte", "default_hostfile", - "Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)", - false, false, orte_default_hostfile, &orte_default_hostfile); diff --git a/abs/extra/openmpi/system_ltdl.patch b/abs/extra/openmpi/system_ltdl.patch new file mode 100644 index 0000000..300da38 --- /dev/null +++ b/abs/extra/openmpi/system_ltdl.patch @@ -0,0 +1,66 @@ +diff --git a/config/ltdl.m4 b/config/ltdl.m4 +index ea76f4d..2f1cbfe 100644 +--- a/config/ltdl.m4 ++++ b/config/ltdl.m4 +@@ -162,6 +162,8 @@ m4_defun([_LTDL_INSTALLABLE], + fi + fi + ++enable_ltdl_install=no ++ + # If configure.ac declared an installable ltdl, and the user didn't override + # with --disable-ltdl-install, we will install the shipped libltdl. + case $enable_ltdl_install in +diff --git a/ompi/debuggers/Makefile.am b/ompi/debuggers/Makefile.am +index 2adf3fd..5b22a91 100644 +--- a/ompi/debuggers/Makefile.am ++++ b/ompi/debuggers/Makefile.am +@@ -46,8 +46,7 @@ headers = \ + # Simple checks to ensure that the DSOs are functional + + dlopen_test_SOURCES = dlopen_test.c +-dlopen_test_CPPFLAGS = -I$(top_srcdir)/opal/libltdl +-dlopen_test_LDADD = $(top_builddir)/opal/libltdl/libltdlc.la ++dlopen_test_LDADD = -lltdl + + predefined_gap_test_SOURCES = predefined_gap_test.c + predefined_gap_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +diff --git a/ompi/debuggers/dlopen_test.c b/ompi/debuggers/dlopen_test.c +index 029a4ee..023afb8 100644 +--- a/ompi/debuggers/dlopen_test.c ++++ b/ompi/debuggers/dlopen_test.c +@@ -13,7 +13,7 @@ + #include <string.h> + #include <stdlib.h> + +-#include "opal/libltdl/ltdl.h" ++#include "ltdl.h" + + static int do_test(void); + +diff --git a/test/support/components.c b/test/support/components.c +index 41c4345..6b4b464 100644 +--- a/test/support/components.c ++++ b/test/support/components.c +@@ -24,7 +24,7 @@ + + #include "opal/constants.h" + #include "opal/mca/mca.h" +-#include "opal/libltdl/ltdl.h" ++#include "ltdl.h" + + #include "components.h" + +diff --git a/test/support/components.h b/test/support/components.h +index 6db1f0d..fc8dfc5 100644 +--- a/test/support/components.h ++++ b/test/support/components.h +@@ -20,7 +20,7 @@ + #ifndef OMPI_SUPPORT_COMPONENTS_H + #define OMPI_SUPPORT_COMPONENTS_H + +-#include "opal/libltdl/ltdl.h" ++#include "ltdl.h" + #include "opal/mca/mca.h" + + BEGIN_C_DECLS diff --git a/abs/not_built/extra/community/patchutils/PKGBUILD b/abs/extra/patchutils/PKGBUILD index 8aedbf0..81b2aef 100644 --- a/abs/not_built/extra/community/patchutils/PKGBUILD +++ b/abs/extra/patchutils/PKGBUILD @@ -3,15 +3,15 @@ # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=patchutils -pkgver=0.3.2 +pkgver=0.3.3 pkgrel=1 pkgdesc="A small collection of programs that operate on patch files" license=('GPL') url="http://cyberelk.net/tim/patchutils/" depends=('perl') arch=('i686' 'x86_64') -source=(http://cyberelk.net/tim/data/patchutils/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('74607b4a28c9009c6aeeed0e91098917') +source=(http://cyberelk.net/tim/data/patchutils/stable/$pkgname-$pkgver.tar.xz) +md5sums=('b640b6b8af6183f83eacf7bd6d2460cb') build() { cd $srcdir/$pkgname-$pkgver diff --git a/abs/extra/plex-home-theater/PKGBUILD b/abs/extra/plex-home-theater/PKGBUILD new file mode 100755 index 0000000..122105a --- /dev/null +++ b/abs/extra/plex-home-theater/PKGBUILD @@ -0,0 +1,76 @@ +# $Id$ +# Maintainer: Maxime Gauduin <alucryd@archlinux.org> +# Contributor: Daniel Wallace <daniel.wallace@gatech.edu> + +pkgname=plex-home-theater +_pkgver=1.2.3.378-0c92ed32 +pkgver=${_pkgver%-*} +pkgrel=1 +pkgdesc='Plex Home Theater' +arch=('i686' 'x86_64') +url='http://www.plexapp.com/' +license=('GPL2') +depends=('boost-libs' 'curl' 'ffmpeg-compat' 'glew' 'libcdio' 'libmad' + 'libmicrohttpd' 'libmpeg2' 'libsamplerate' 'libssh' 'libusb-compat' + 'libvdpau' 'libxrandr' 'lzo' 'sdl_image' 'sdl_mixer' 'smbclient' + 'taglib' 'tinyxml' 'yajl') +makedepends=('boost' 'cmake' 'doxygen' 'java-environment' 'libcec' 'libplist' + 'libshairport' 'nasm' 'swig' 'unzip' 'zip') +optdepends=('libplist: AirPlay support' + 'libshairport: AirPlay support' + 'libcec: Pulse-Eight USB-CEC adapter support') +source=("https://github.com/plexinc/plex-home-theater-public/archive/v${_pkgver}.tar.gz" + 'plex-ffmpeg-compat.patch' + 'plex-libcec-2.2.0.patch' + 'plex-lirc-socket.patch' + 'plex_lib.conf' + 'plexhometheater.sh') + +prepare() { + cd plex-home-theater-public-${_pkgver} + + patch -Np1 -i ../plex-libcec-2.2.0.patch + patch -Np1 -i ../plex-lirc-socket.patch + patch -Np1 -i ../plex-ffmpeg-compat.patch +} + +build() { + cd plex-home-theater-public-${_pkgver} + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_C_FLAGS="$CMAKE_C_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \ + -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \ + -DENABLE_{AUTOUPDATE,DUMP_SYMBOLS}='FALSE' -DENABLE_PYTHON='TRUE' \ + -DPYTHON_EXEC='/usr/bin/python2' -DUSE_INTERNAL_FFMPEG='FALSE' \ + -DCREATE_BUNDLE='FALSE' + make +} + +package() { + cd plex-home-theater-public-${_pkgver}/build + + make DESTDIR="${pkgdir}" install + install -dm 755 "${pkgdir}"/usr/{lib/plexhometheater,share/{applications,pixmaps}} + mv "${pkgdir}"/usr/bin/{system,xbmc-xrandr} "${pkgdir}"/usr/lib/plexhometheater/ + mv "${pkgdir}"/usr/share/XBMC "${pkgdir}"/usr/share/plexhometheater + install -m 755 "${srcdir}"/plexhometheater.sh "${pkgdir}"/usr/bin/ + install -m 644 ../plex/Resources/plexhometheater.desktop "${pkgdir}"/usr/share/applications/ + install -m 644 ../plex/Resources/plex-icon-256.png "${pkgdir}"/usr/share/pixmaps/plexhometheater.png + + # LinHES stuff + #add in plex_lib.conf + install -D -m0744 ${srcdir}/plex_lib.conf ${pkgdir}/etc/gen_lib_xml.d/plex_lib.conf +} + +# vim: ts=2 sw=2 et: +md5sums=('59f6d8386d9533b7c9a0c9e559a83c0f' + '6704244166497db7fa6b3ddd43a0e53b' + '066484ad4949f96ddddaa8b1d4d709e1' + 'b96a1d70174d80d3f2272bdc5b48e4a3' + '8735a4e7857bc85085482c4f8bcb1d01' + '8fae1350cc36f40ed65fbf96128a02d0') diff --git a/abs/extra/plex-home-theater/__changelog b/abs/extra/plex-home-theater/__changelog new file mode 100644 index 0000000..83f5069 --- /dev/null +++ b/abs/extra/plex-home-theater/__changelog @@ -0,0 +1,3 @@ +PKGBUILD - Remove opt dep pulseaudio +PKGBUILD - Added plex_lib.conf, this file goes in /etc/gen_lib_xml.d/ +plexhometheater.install - add gen_lib_xml.py to post_install and post_remove diff --git a/abs/extra/plex-home-theater/plex-ffmpeg-compat.patch b/abs/extra/plex-home-theater/plex-ffmpeg-compat.patch new file mode 100755 index 0000000..1601500 --- /dev/null +++ b/abs/extra/plex-home-theater/plex-ffmpeg-compat.patch @@ -0,0 +1,29 @@ +diff -rupN plex-home-theater.orig/plex/CMakeModules/FindFFmpeg.cmake plex-home-theater/plex/CMakeModules/FindFFmpeg.cmake +--- plex-home-theater.orig/plex/CMakeModules/FindFFmpeg.cmake 2014-09-15 11:46:21.751638700 +0200 ++++ plex-home-theater/plex/CMakeModules/FindFFmpeg.cmake 2014-09-15 11:43:25.678039000 +0200 +@@ -41,7 +41,7 @@ MACRO(FFMPEG_FIND varname shortname head + /opt/csw/include # Blastwave + /opt/include + /usr/freeware/include +- PATH_SUFFIXES ffmpeg ++ PATH_SUFFIXES ffmpeg-compat + DOC "Location of FFMPEG Headers" + ) + +@@ -62,7 +62,7 @@ MACRO(FFMPEG_FIND varname shortname head + /opt/csw/include # Blastwave + /opt/include + /usr/freeware/include +- PATH_SUFFIXES ffmpeg ++ PATH_SUFFIXES ffmpeg-compat + DOC "Location of FFMPEG Headers" + ) + ENDIF(NOT FFMPEG_${varname}_INCLUDE_DIRS) +@@ -85,6 +85,7 @@ MACRO(FFMPEG_FIND varname shortname head + /opt/csw/lib + /opt/lib + /usr/freeware/lib64 ++ PATH_SUFFIXES ffmpeg-compat + DOC "Location of FFMPEG Libraries" + ) + diff --git a/abs/extra/plex-home-theater/plex-home-theater.install b/abs/extra/plex-home-theater/plex-home-theater.install new file mode 100644 index 0000000..3633bdc --- /dev/null +++ b/abs/extra/plex-home-theater/plex-home-theater.install @@ -0,0 +1,7 @@ +post_install() { + gen_lib_xml.py +} + +post_remove() { + gen_lib_xml.py +} diff --git a/abs/extra/plex-home-theater/plex-libcec-2.2.0.patch b/abs/extra/plex-home-theater/plex-libcec-2.2.0.patch new file mode 100644 index 0000000..8c35296 --- /dev/null +++ b/abs/extra/plex-home-theater/plex-libcec-2.2.0.patch @@ -0,0 +1,114 @@ +From e62cdd0c9ae9818c5c35c6b6b57ba8ff322ca052 Mon Sep 17 00:00:00 2001 +From: Maxime Gauduin <alucryd@gmail.com> +Date: Tue, 4 Nov 2014 17:07:10 +0100 +Subject: [PATCH] libCEC 2.2.0 fixes + +--- + project/BuildDependencies/scripts/0_package.list | 1 + + project/BuildDependencies/scripts/libcec_d.bat | 15 --------------- + project/BuildDependencies/scripts/libcec_d.txt | 2 +- + system/peripherals.xml | 2 +- + xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp | 2 ++ + xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 11 ++++++++--- + 6 files changed, 13 insertions(+), 20 deletions(-) + delete mode 100644 project/BuildDependencies/scripts/libcec_d.bat + +diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list +index d2a00aa..6f441f3 100644 +--- a/project/BuildDependencies/scripts/0_package.list ++++ b/project/BuildDependencies/scripts/0_package.list +@@ -11,4 +11,5 @@ libnfs-1.6.0-win32 + libshairplay-d689c6-win32 + libjpeg-turbo-1.2.0-win32 + libbluray-0.2.3-win32 ++libcec-2.2.0-win32-1 + taglib-1.8beta-win32 +diff --git a/project/BuildDependencies/scripts/libcec_d.bat b/project/BuildDependencies/scripts/libcec_d.bat +deleted file mode 100644 +index 0b41b8a..0000000 +--- a/project/BuildDependencies/scripts/libcec_d.bat ++++ /dev/null +@@ -1,15 +0,0 @@ +-@ECHO OFF +- +-SET LOC_PATH=%CD% +-SET FILES=%LOC_PATH%\libcec_d.txt +- +-CALL dlextract.bat libcec %FILES% +- +-cd %TMP_PATH% +- +-mkdir "%CUR_PATH%\include\libcec" +-xcopy libcec\include\* "%CUR_PATH%\include\libcec\." /E /Q /I /Y +- +-copy libcec\libcec.dll "%XBMC_PATH%\system\." +- +-cd %LOC_PATH% +diff --git a/project/BuildDependencies/scripts/libcec_d.txt b/project/BuildDependencies/scripts/libcec_d.txt +index 065ce3a..3d0265e 100644 +--- a/project/BuildDependencies/scripts/libcec_d.txt ++++ b/project/BuildDependencies/scripts/libcec_d.txt +@@ -1,3 +1,3 @@ + ; filename source of the file + +-libcec-2.1.1.zip http://mirrors.xbmc.org/build-deps/win32/ ++libcec-2.2.0-win32.zip http://mirrors.xbmc.org/build-deps/win32/ +diff --git a/system/peripherals.xml b/system/peripherals.xml +index 68205df..ea0bb17 100644 +--- a/system/peripherals.xml ++++ b/system/peripherals.xml +@@ -28,7 +28,7 @@ + <setting key="device_type" type="int" value="1" configurable="0" /> + <setting key="wake_devices_advanced" type="string" value="" configurable="0" /> + <setting key="standby_devices_advanced" type="string" value="" configurable="0" /> +- <setting key="double_tap_timeout_ms" type="int" min="0" value="2000" configurable="0" /> ++ <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" /> + </peripheral> + + <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec"> +diff --git a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp +index da169c1..f3c8149 100644 +--- a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp ++++ b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp +@@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceScan(PeripheralScanResults &results) + break; + case ADAPTERTYPE_RPI: + result.m_mappedBusType = PERIPHERAL_BUS_RPI; ++ // the Pi's adapter cannot be removed, no need to rescan ++ m_bNeedsPolling = false; + break; + default: + break; +diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +index 056a77e..9823427 100644 +--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp ++++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +@@ -1302,8 +1302,8 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu + + void CPeripheralCecAdapter::SetConfigurationFromSettings(void) + { +- // use the same client version as libCEC version +- m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT; ++ // client version matches the version of libCEC that we originally used the API from ++ m_configuration.clientVersion = CEC_CLIENT_VERSION_2_2_0; + + // device name 'XBMC' + snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str()); +@@ -1378,8 +1378,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) + m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; + m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; + +- // double tap prevention timeout in ms ++#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) ++ // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 ++ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; ++#else ++ // backwards compatibility. will be removed once the next major release of libCEC is out + m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); ++#endif + } + + void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) +-- +2.1.3 + diff --git a/abs/extra/plex-home-theater/plex-lirc-socket.patch b/abs/extra/plex-home-theater/plex-lirc-socket.patch new file mode 100644 index 0000000..7110252 --- /dev/null +++ b/abs/extra/plex-home-theater/plex-lirc-socket.patch @@ -0,0 +1,56 @@ +From c20e1deb62521acaca945fe6af780cdfb477610b Mon Sep 17 00:00:00 2001 +From: Maxime Gauduin <alucryd@gmail.com> +Date: Thu, 30 Oct 2014 09:43:48 +0100 +Subject: [PATCH] Fix lirc socket path + +--- + configure.in | 4 ++-- + plex/CMakeModules/PlatformConfigLINUX.cmake | 2 +- + plex/CMakeModules/PlatformConfigRPI.cmake | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index 002245a..85ad398 100644 +--- a/configure.in ++++ b/configure.in +@@ -452,9 +452,9 @@ AC_ARG_ENABLE([texturepacker], + + AC_ARG_WITH([lirc-device], + [AS_HELP_STRING([--with-lirc-device=file], +- [specify the default LIRC device (default is /dev/lircd)])], ++ [specify the default LIRC device (default is /var/run/lirc/lircd)])], + [lirc_device=$withval], +- [lirc_device=/dev/lircd]) ++ [lirc_device=/var/run/lirc/lircd]) + AC_DEFINE_UNQUOTED([LIRC_DEVICE], ["$lirc_device"], [Default LIRC device]) + + AC_ARG_ENABLE([udev], +diff --git a/plex/CMakeModules/PlatformConfigLINUX.cmake b/plex/CMakeModules/PlatformConfigLINUX.cmake +index 078fafb..3afa5c1 100644 +--- a/plex/CMakeModules/PlatformConfigLINUX.cmake ++++ b/plex/CMakeModules/PlatformConfigLINUX.cmake +@@ -126,7 +126,7 @@ if(DEFINED OPENGL_FOUND) + endif()
+
+ #### default lircdevice
+-set(LIRC_DEVICE "/dev/lircd")
++set(LIRC_DEVICE "/var/run/lirc/lircd")
+
+ #### on linux we want to use a "easy" name
+ set(EXECUTABLE_NAME "plexhometheater")
+diff --git a/plex/CMakeModules/PlatformConfigRPI.cmake b/plex/CMakeModules/PlatformConfigRPI.cmake +index 82aa751..367cdc9 100644 +--- a/plex/CMakeModules/PlatformConfigRPI.cmake ++++ b/plex/CMakeModules/PlatformConfigRPI.cmake +@@ -103,7 +103,7 @@ list(APPEND CONFIG_INTERNAL_LIBS lib_dllsymbols) +
+
+ #### default lircdevice
+-set(LIRC_DEVICE "/dev/lircd")
++set(LIRC_DEVICE "/var/run/lirc/lircd")
+
+ #### on linux we want to use a "easy" name
+ set(EXECUTABLE_NAME "plexhometheater")
+-- +2.1.3 + diff --git a/abs/extra/plex-home-theater/plex_lib.conf b/abs/extra/plex-home-theater/plex_lib.conf new file mode 100644 index 0000000..70db20a --- /dev/null +++ b/abs/extra/plex-home-theater/plex_lib.conf @@ -0,0 +1,9 @@ +<!--#PLEX--> + <button> + <type>MENU_PLEX</type> + <text>Launch Plex</text> + <description>Open Plex Home Theater</description> + <action>EXEC /usr/bin/plexhometheater.sh</action> + </button> +<!--#PLEX--> + diff --git a/abs/extra/plex-home-theater/plexhometheater.sh b/abs/extra/plex-home-theater/plexhometheater.sh new file mode 100755 index 0000000..53276ff --- /dev/null +++ b/abs/extra/plex-home-theater/plexhometheater.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +export XBMC_BIN_HOME='/usr/lib/plexhometheater' +export XBMC_HOME='/usr/share/plexhometheater' +exec plexhometheater diff --git a/abs/extra/polkit/PKGBUILD b/abs/extra/polkit/PKGBUILD index e86dbbc..b120d65 100644 --- a/abs/extra/polkit/PKGBUILD +++ b/abs/extra/polkit/PKGBUILD @@ -1,27 +1,26 @@ -# $Id: PKGBUILD 158972 2012-05-13 21:06:37Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=polkit -pkgver=0.105 -pkgrel=1 +pkgver=0.112 +pkgrel=2 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(i686 x86_64) -license=('LGPL') -url="http://www.freedesktop.org/wiki/Software/PolicyKit" -depends=('glib2' 'pam' 'expat') -makedepends=('intltool' 'gtk-doc' 'gobject-introspection') -replaces=('policykit') -options=('!libtool') +license=(LGPL) +url="http://www.freedesktop.org/wiki/Software/polkit" +depends=(glib2 pam expat systemd js17) +makedepends=(intltool gtk-doc gobject-introspection) +install=polkit.install source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz polkit.pam) -md5sums=('9c29e1b6c214f0bd6f1d4ee303dfaed9' - '6564f95878297b954f0572bc1610dd15') build() { cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ - --disable-static --enable-gtk-doc + --enable-libsystemd-login=no --disable-static \ + --enable-gtk-doc make } @@ -29,5 +28,10 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install + chown 102 "$pkgdir/etc/polkit-1/rules.d" + chown 102 "$pkgdir/usr/share/polkit-1/rules.d" + install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1" } +md5sums=('b0f2fa00a55f47c6a5d88e9b73f80127' + '6564f95878297b954f0572bc1610dd15') diff --git a/abs/extra/polkit/__changelog b/abs/extra/polkit/__changelog new file mode 100644 index 0000000..8a7d752 --- /dev/null +++ b/abs/extra/polkit/__changelog @@ -0,0 +1 @@ +PKGBUILD: change --enable-libsystemd-login=yes to --enable-libsystemd-login=no diff --git a/abs/extra/polkit/polkit.install b/abs/extra/polkit/polkit.install new file mode 100644 index 0000000..fbb9891 --- /dev/null +++ b/abs/extra/polkit/polkit.install @@ -0,0 +1,18 @@ +post_install() { + getent group polkitd >/dev/null || groupadd -g 102 polkitd + getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -d '/' -s /bin/false polkitd + passwd -l polkitd &>/dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + if getent passwd polkitd >/dev/null; then + userdel polkitd + fi + if getent group polkitd >/dev/null; then + groupdel polkitd + fi +} diff --git a/abs/extra/polkit/systemd-fallback.patch b/abs/extra/polkit/systemd-fallback.patch deleted file mode 100644 index f89ce10..0000000 --- a/abs/extra/polkit/systemd-fallback.patch +++ /dev/null @@ -1,1571 +0,0 @@ -diff -u -rN polkit-0.104/configure.ac polkit-0.104-systemd-fallback/configure.ac ---- polkit-0.104/configure.ac 2012-01-03 17:25:49.000000000 +0100 -+++ polkit-0.104-systemd-fallback/configure.ac 2012-03-06 15:45:55.275860194 +0100 -@@ -160,14 +160,14 @@ - [enable_systemd=auto]) - if test "$enable_systemd" != "no"; then - PKG_CHECK_MODULES(SYSTEMD, -- [libsystemd-login], -+ [libsystemd-login libsystemd-daemon], - have_systemd=yes, - have_systemd=no) - if test "$have_systemd" = "yes"; then - SESSION_TRACKING=systemd - else - if test "$enable_systemd" = "yes"; then -- AC_MSG_ERROR([systemd support requested but libsystemd-login1 library not found]) -+ AC_MSG_ERROR([systemd support requested but systemd libraries not found]) - fi - fi - fi -diff -u -rN polkit-0.104/src/polkit/Makefile.am polkit-0.104-systemd-fallback/src/polkit/Makefile.am ---- polkit-0.104/src/polkit/Makefile.am 2012-01-03 16:03:47.000000000 +0100 -+++ polkit-0.104-systemd-fallback/src/polkit/Makefile.am 2012-03-06 15:19:25.108853325 +0100 -@@ -79,15 +79,8 @@ - polkitimplicitauthorization.c polkitimplicitauthorization.h \ - polkittemporaryauthorization.c polkittemporaryauthorization.h \ - polkitpermission.c polkitpermission.h \ -- $(NULL) -- --if HAVE_SYSTEMD --libpolkit_gobject_1_la_SOURCES += \ -- polkitunixsession-systemd.c polkitunixsession.h --else --libpolkit_gobject_1_la_SOURCES += \ - polkitunixsession.c polkitunixsession.h --endif -+ $(NULL) - - libpolkit_gobject_1_la_CFLAGS = \ - -D_POLKIT_COMPILATION \ -diff -u -rN polkit-0.104/src/polkit/polkitunixsession.c polkit-0.104-systemd-fallback/src/polkit/polkitunixsession.c ---- polkit-0.104/src/polkit/polkitunixsession.c 2011-10-18 19:02:27.000000000 +0200 -+++ polkit-0.104-systemd-fallback/src/polkit/polkitunixsession.c 2012-03-06 15:17:29.829788021 +0100 -@@ -23,12 +23,18 @@ - # include "config.h" - #endif - -+#include <stdlib.h> - #include <string.h> - #include "polkitunixsession.h" - #include "polkitsubject.h" - #include "polkiterror.h" - #include "polkitprivate.h" - -+#ifdef HAVE_SYSTEMD -+# include <systemd/sd-daemon.h> -+# include <systemd/sd-login.h> -+#endif -+ - /** - * SECTION:polkitunixsession - * @title: PolkitUnixSession -@@ -364,34 +370,44 @@ - PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject); - GDBusConnection *connection; - GVariant *result; -- gboolean ret; -- -- ret = FALSE; -+ gboolean ret = FALSE; - -- connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); -- if (connection == NULL) -- goto out; -- -- result = g_dbus_connection_call_sync (connection, -- "org.freedesktop.ConsoleKit", /* name */ -- session->session_id, /* object path */ -- "org.freedesktop.ConsoleKit.Session", /* interface name */ -- "GetUser", /* method */ -- NULL, /* parameters */ -- G_VARIANT_TYPE ("(u)"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, -- cancellable, -- error); -- if (result == NULL) -- goto out; -+#ifdef HAVE_SYSTEMD -+ uid_t uid; -+ -+ if (sd_booted () > 0) -+ { -+ if (sd_session_get_uid (session->session_id, &uid) == 0) -+ ret = TRUE; -+ } -+ else -+#endif -+ { -+ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); -+ if (connection == NULL) -+ goto out; -+ -+ result = g_dbus_connection_call_sync (connection, -+ "org.freedesktop.ConsoleKit", /* name */ -+ session->session_id, /* object path */ -+ "org.freedesktop.ConsoleKit.Session", /* interface name */ -+ "GetUser", /* method */ -+ NULL, /* parameters */ -+ G_VARIANT_TYPE ("(u)"), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, -+ cancellable, -+ error); -+ if (result == NULL) -+ goto out; - -- ret = TRUE; -- g_variant_unref (result); -+ ret = TRUE; -+ g_variant_unref (result); - -- out: -- if (connection != NULL) -- g_object_unref (connection); -+ out: -+ if (connection != NULL) -+ g_object_unref (connection); -+ } - return ret; - } - -@@ -470,12 +486,9 @@ - GError **error) - { - PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable); -- GDBusConnection *connection; -+ GDBusConnection *connection = NULL; - GVariant *result; -- gboolean ret; -- -- connection = NULL; -- ret = FALSE; -+ gboolean ret = FALSE; - - if (session->session_id != NULL) - { -@@ -484,33 +497,56 @@ - goto out; - } - -- connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); -- if (connection == NULL) -- goto out; -+#ifdef HAVE_SYSTEMD -+ char *s; -+ -+ if (sd_booted () > 0) -+ { -+ if (sd_pid_get_session (session->pid, &s) == 0) -+ { -+ session->session_id = g_strdup (s); -+ free (s); -+ ret = TRUE; -+ goto out; -+ } -+ -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "No session for pid %d", -+ (gint) session->pid); -+ } -+ else -+#endif -+ { -+ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); -+ if (connection == NULL) -+ goto out; -+ -+ result = g_dbus_connection_call_sync (connection, -+ "org.freedesktop.ConsoleKit", /* name */ -+ "/org/freedesktop/ConsoleKit/Manager", /* object path */ -+ "org.freedesktop.ConsoleKit.Manager", /* interface name */ -+ "GetSessionForUnixProcess", /* method */ -+ g_variant_new ("(u)", session->pid), /* parameters */ -+ G_VARIANT_TYPE ("(o)"), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, -+ cancellable, -+ error); -+ if (result == NULL) -+ goto out; - -- result = g_dbus_connection_call_sync (connection, -- "org.freedesktop.ConsoleKit", /* name */ -- "/org/freedesktop/ConsoleKit/Manager", /* object path */ -- "org.freedesktop.ConsoleKit.Manager", /* interface name */ -- "GetSessionForUnixProcess", /* method */ -- g_variant_new ("(u)", session->pid), /* parameters */ -- G_VARIANT_TYPE ("(o)"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, -- cancellable, -- error); -- if (result == NULL) -- goto out; -+ g_variant_get (result, "(o)", &session->session_id); -+ g_variant_unref (result); - -- g_variant_get (result, "(o)", &session->session_id); -- g_variant_unref (result); -+ ret = TRUE; -+ } - -- ret = TRUE; - - out: - if (connection != NULL) - g_object_unref (connection); -- - return ret; - } - -diff -u -rN polkit-0.104/src/polkit/polkitunixsession-systemd.c polkit-0.104-systemd-fallback/src/polkit/polkitunixsession-systemd.c ---- polkit-0.104/src/polkit/polkitunixsession-systemd.c 2012-01-03 16:03:47.000000000 +0100 -+++ polkit-0.104-systemd-fallback/src/polkit/polkitunixsession-systemd.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,481 +0,0 @@ --/* -- * Copyright (C) 2011 Red Hat, Inc. -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General -- * Public License along with this library; if not, write to the -- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, -- * Boston, MA 02111-1307, USA. -- * -- * Author: Matthias Clasen -- */ -- --#ifdef HAVE_CONFIG_H --# include "config.h" --#endif -- --#include <string.h> --#include "polkitunixsession.h" --#include "polkitsubject.h" --#include "polkiterror.h" --#include "polkitprivate.h" -- --#include <systemd/sd-login.h> -- --/** -- * SECTION:polkitunixsession -- * @title: PolkitUnixSession -- * @short_description: Unix sessions -- * -- * An object that represents an user session. -- * -- * The session id is an opaque string obtained from ConsoleKit. -- */ -- --/** -- * PolkitUnixSession: -- * -- * The #PolkitUnixSession struct should not be accessed directly. -- */ --struct _PolkitUnixSession --{ -- GObject parent_instance; -- -- gchar *session_id; -- -- gint pid; --}; -- --struct _PolkitUnixSessionClass --{ -- GObjectClass parent_class; --}; -- --enum --{ -- PROP_0, -- PROP_SESSION_ID, -- PROP_PID, --}; -- --static void subject_iface_init (PolkitSubjectIface *subject_iface); --static void initable_iface_init (GInitableIface *initable_iface); --static void async_initable_iface_init (GAsyncInitableIface *async_initable_iface); -- --G_DEFINE_TYPE_WITH_CODE (PolkitUnixSession, polkit_unix_session, G_TYPE_OBJECT, -- G_IMPLEMENT_INTERFACE (POLKIT_TYPE_SUBJECT, subject_iface_init) -- G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init) -- G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init) -- ); -- --static void --polkit_unix_session_init (PolkitUnixSession *session) --{ --} -- --static void --polkit_unix_session_finalize (GObject *object) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (object); -- -- g_free (session->session_id); -- -- if (G_OBJECT_CLASS (polkit_unix_session_parent_class)->finalize != NULL) -- G_OBJECT_CLASS (polkit_unix_session_parent_class)->finalize (object); --} -- --static void --polkit_unix_session_get_property (GObject *object, -- guint prop_id, -- GValue *value, -- GParamSpec *pspec) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (object); -- -- switch (prop_id) -- { -- case PROP_SESSION_ID: -- g_value_set_string (value, session->session_id); -- break; -- -- default: -- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -- break; -- } --} -- --static void --polkit_unix_session_set_property (GObject *object, -- guint prop_id, -- const GValue *value, -- GParamSpec *pspec) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (object); -- -- switch (prop_id) -- { -- case PROP_SESSION_ID: -- polkit_unix_session_set_session_id (session, g_value_get_string (value)); -- break; -- -- case PROP_PID: -- session->pid = g_value_get_int (value); -- break; -- -- default: -- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -- break; -- } --} -- --static void --polkit_unix_session_class_init (PolkitUnixSessionClass *klass) --{ -- GObjectClass *gobject_class = G_OBJECT_CLASS (klass); -- -- gobject_class->finalize = polkit_unix_session_finalize; -- gobject_class->get_property = polkit_unix_session_get_property; -- gobject_class->set_property = polkit_unix_session_set_property; -- -- /** -- * PolkitUnixSession:session-id: -- * -- * The UNIX session id. -- */ -- g_object_class_install_property (gobject_class, -- PROP_SESSION_ID, -- g_param_spec_string ("session-id", -- "Session ID", -- "The UNIX session ID", -- NULL, -- G_PARAM_CONSTRUCT | -- G_PARAM_READWRITE | -- G_PARAM_STATIC_NAME | -- G_PARAM_STATIC_BLURB | -- G_PARAM_STATIC_NICK)); -- -- -- /** -- * PolkitUnixSession:pid: -- * -- * The UNIX process id to look up the session. -- */ -- g_object_class_install_property (gobject_class, -- PROP_PID, -- g_param_spec_int ("pid", -- "Process ID", -- "Process ID to use for looking up the session", -- 0, -- G_MAXINT, -- 0, -- G_PARAM_CONSTRUCT_ONLY | -- G_PARAM_WRITABLE | -- G_PARAM_STATIC_NAME | -- G_PARAM_STATIC_BLURB | -- G_PARAM_STATIC_NICK)); -- --} -- --/** -- * polkit_unix_session_get_session_id: -- * @session: A #PolkitUnixSession. -- * -- * Gets the session id for @session. -- * -- * Returns: The session id for @session. Do not free this string, it -- * is owned by @session. -- **/ --const gchar * --polkit_unix_session_get_session_id (PolkitUnixSession *session) --{ -- g_return_val_if_fail (POLKIT_IS_UNIX_SESSION (session), NULL); -- return session->session_id; --} -- --/** -- * polkit_unix_session_set_session_id: -- * @session: A #PolkitUnixSession. -- * @session_id: The session id. -- * -- * Sets the session id for @session to @session_id. -- **/ --void --polkit_unix_session_set_session_id (PolkitUnixSession *session, -- const gchar *session_id) --{ -- g_return_if_fail (POLKIT_IS_UNIX_SESSION (session)); -- /*g_return_if_fail (session_id != NULL);*/ -- g_free (session->session_id); -- session->session_id = g_strdup (session_id); --} -- --/** -- * polkit_unix_session_new: -- * @session_id: The session id. -- * -- * Creates a new #PolkitUnixSession for @session_id. -- * -- * Returns: (transfer full): A #PolkitUnixSession. Free with g_object_unref(). -- **/ --PolkitSubject * --polkit_unix_session_new (const gchar *session_id) --{ -- return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_SESSION, -- "session-id", session_id, -- NULL)); --} -- --/** -- * polkit_unix_session_new_for_process: -- * @pid: The process id of the process to get the session for. -- * @cancellable: (allow-none): A #GCancellable or %NULL. -- * @callback: A #GAsyncReadyCallback to call when the request is satisfied -- * @user_data: The data to pass to @callback. -- * -- * Asynchronously creates a new #PolkitUnixSession object for the -- * process with process id @pid. -- * -- * When the operation is finished, @callback will be invoked in the -- * <link linkend="g-main-context-push-thread-default">thread-default -- * main loop</link> of the thread you are calling this method -- * from. You can then call -- * polkit_unix_session_new_for_process_finish() to get the result of -- * the operation. -- * -- * This method constructs the object asynchronously, for the synchronous and blocking version -- * use polkit_unix_session_new_for_process_sync(). -- **/ --void --polkit_unix_session_new_for_process (gint pid, -- GCancellable *cancellable, -- GAsyncReadyCallback callback, -- gpointer user_data) --{ -- g_async_initable_new_async (POLKIT_TYPE_UNIX_SESSION, -- G_PRIORITY_DEFAULT, -- cancellable, -- callback, -- user_data, -- "pid", pid, -- NULL); --} -- --/** -- * polkit_unix_session_new_for_process_finish: -- * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to polkit_unix_session_new_for_process(). -- * @error: (allow-none): Return location for error. -- * -- * Finishes constructing a #PolkitSubject for a process id. -- * -- * Returns: (transfer full) (allow-none): A #PolkitUnixSession for the @pid passed to -- * polkit_unix_session_new_for_process() or %NULL if @error is -- * set. Free with g_object_unref(). -- **/ --PolkitSubject * --polkit_unix_session_new_for_process_finish (GAsyncResult *res, -- GError **error) --{ -- GObject *object; -- GObject *source_object; -- -- source_object = g_async_result_get_source_object (res); -- g_assert (source_object != NULL); -- -- object = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), -- res, -- error); -- g_object_unref (source_object); -- -- if (object != NULL) -- return POLKIT_SUBJECT (object); -- else -- return NULL; --} -- -- --/** -- * polkit_unix_session_new_for_process_sync: -- * @pid: The process id of the process to get the session for. -- * @cancellable: (allow-none): A #GCancellable or %NULL. -- * @error: (allow-none): Return location for error. -- * -- * Creates a new #PolkitUnixSession for the process with process id @pid. -- * -- * This is a synchronous call - the calling thread is blocked until a -- * reply is received. For the asynchronous version, see -- * polkit_unix_session_new_for_process(). -- * -- * Returns: (allow-none) (transfer full): A #PolkitUnixSession for -- * @pid or %NULL if @error is set. Free with g_object_unref(). -- **/ --PolkitSubject * --polkit_unix_session_new_for_process_sync (gint pid, -- GCancellable *cancellable, -- GError **error) --{ -- return POLKIT_SUBJECT (g_initable_new (POLKIT_TYPE_UNIX_SESSION, -- cancellable, -- error, -- "pid", pid, -- NULL)); --} -- --static guint --polkit_unix_session_hash (PolkitSubject *subject) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject); -- -- return g_str_hash (session->session_id); --} -- --static gboolean --polkit_unix_session_equal (PolkitSubject *a, -- PolkitSubject *b) --{ -- PolkitUnixSession *session_a; -- PolkitUnixSession *session_b; -- -- session_a = POLKIT_UNIX_SESSION (a); -- session_b = POLKIT_UNIX_SESSION (b); -- -- return g_strcmp0 (session_a->session_id, session_b->session_id) == 0; --} -- --static gchar * --polkit_unix_session_to_string (PolkitSubject *subject) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject); -- -- return g_strdup_printf ("unix-session:%s", session->session_id); --} -- --static gboolean --polkit_unix_session_exists_sync (PolkitSubject *subject, -- GCancellable *cancellable, -- GError **error) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject); -- gboolean ret; -- uid_t uid; -- -- ret = FALSE; -- -- if (!sd_session_get_uid (session->session_id, &uid)) -- ret = FALSE; -- -- return ret; --} -- --static void --exists_in_thread_func (GSimpleAsyncResult *res, -- GObject *object, -- GCancellable *cancellable) --{ -- GError *error; -- error = NULL; -- if (!polkit_unix_session_exists_sync (POLKIT_SUBJECT (object), -- cancellable, -- &error)) -- { -- g_simple_async_result_set_from_error (res, error); -- g_error_free (error); -- } --} -- --static void --polkit_unix_session_exists (PolkitSubject *subject, -- GCancellable *cancellable, -- GAsyncReadyCallback callback, -- gpointer user_data) --{ -- GSimpleAsyncResult *simple; -- -- g_return_if_fail (POLKIT_IS_UNIX_SESSION (subject)); -- -- simple = g_simple_async_result_new (G_OBJECT (subject), -- callback, -- user_data, -- polkit_unix_session_exists); -- g_simple_async_result_run_in_thread (simple, -- exists_in_thread_func, -- G_PRIORITY_DEFAULT, -- cancellable); -- g_object_unref (simple); --} -- --static gboolean --polkit_unix_session_exists_finish (PolkitSubject *subject, -- GAsyncResult *res, -- GError **error) --{ -- GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res); -- gboolean ret; -- -- g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == polkit_unix_session_exists); -- -- ret = FALSE; -- -- if (g_simple_async_result_propagate_error (simple, error)) -- goto out; -- -- ret = g_simple_async_result_get_op_res_gboolean (simple); -- -- out: -- return ret; --} -- --static void --subject_iface_init (PolkitSubjectIface *subject_iface) --{ -- subject_iface->hash = polkit_unix_session_hash; -- subject_iface->equal = polkit_unix_session_equal; -- subject_iface->to_string = polkit_unix_session_to_string; -- subject_iface->exists = polkit_unix_session_exists; -- subject_iface->exists_finish = polkit_unix_session_exists_finish; -- subject_iface->exists_sync = polkit_unix_session_exists_sync; --} -- --static gboolean --polkit_unix_session_initable_init (GInitable *initable, -- GCancellable *cancellable, -- GError **error) --{ -- PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable); -- gboolean ret; -- -- ret = FALSE; -- -- if (session->session_id != NULL) -- { -- /* already set, nothing to do */ -- ret = TRUE; -- goto out; -- } -- -- if (!sd_pid_get_session (session->pid, &session->session_id)) -- ret = TRUE; -- --out: -- return ret; --} -- --static void --initable_iface_init (GInitableIface *initable_iface) --{ -- initable_iface->init = polkit_unix_session_initable_init; --} -- --static void --async_initable_iface_init (GAsyncInitableIface *async_initable_iface) --{ -- /* use default implementation to run GInitable code in a thread */ --} -diff -u -rN polkit-0.104/src/polkitbackend/Makefile.am polkit-0.104-systemd-fallback/src/polkitbackend/Makefile.am ---- polkit-0.104/src/polkitbackend/Makefile.am 2012-01-03 16:03:47.000000000 +0100 -+++ polkit-0.104-systemd-fallback/src/polkitbackend/Makefile.am 2012-03-06 15:44:15.380014886 +0100 -@@ -41,15 +41,8 @@ - polkitbackendconfigsource.h polkitbackendconfigsource.c \ - polkitbackendactionlookup.h polkitbackendactionlookup.c \ - polkitbackendlocalauthorizationstore.h polkitbackendlocalauthorizationstore.c \ -- $(NULL) -- --if HAVE_SYSTEMD --libpolkit_backend_1_la_SOURCES += \ -- polkitbackendsessionmonitor.h polkitbackendsessionmonitor-systemd.c --else --libpolkit_backend_1_la_SOURCES += \ - polkitbackendsessionmonitor.h polkitbackendsessionmonitor.c --endif -+ $(NULL) - - libpolkit_backend_1_la_CFLAGS = \ - -D_POLKIT_COMPILATION \ -diff -u -rN polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor.c polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor.c ---- polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor.c 2011-10-18 19:02:27.000000000 +0200 -+++ polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor.c 2012-03-06 15:43:49.353562242 +0100 -@@ -26,6 +26,12 @@ - #include <string.h> - #include <glib/gstdio.h> - -+#ifdef HAVE_SYSTEMD -+# include <systemd/sd-daemon.h> -+# include <systemd/sd-login.h> -+# include <stdlib.h> -+#endif -+ - #include <polkit/polkit.h> - #include "polkitbackendsessionmonitor.h" - -@@ -39,6 +45,88 @@ - * The #PolkitBackendSessionMonitor class is a utility class to track and monitor sessions. - */ - -+#ifdef HAVE_SYSTEMD -+typedef struct -+{ -+ GSource source; -+ GPollFD pollfd; -+ sd_login_monitor *monitor; -+} SdSource; -+ -+static gboolean -+sd_source_prepare (GSource *source, -+ gint *timeout) -+{ -+ *timeout = -1; -+ return FALSE; -+} -+ -+static gboolean -+sd_source_check (GSource *source) -+{ -+ SdSource *sd_source = (SdSource *)source; -+ -+ return sd_source->pollfd.revents != 0; -+} -+ -+static gboolean -+sd_source_dispatch (GSource *source, -+ GSourceFunc callback, -+ gpointer user_data) -+ -+{ -+ SdSource *sd_source = (SdSource *)source; -+ gboolean ret; -+ -+ g_warn_if_fail (callback != NULL); -+ -+ ret = (*callback) (user_data); -+ -+ sd_login_monitor_flush (sd_source->monitor); -+ -+ return ret; -+} -+ -+static void -+sd_source_finalize (GSource *source) -+{ -+ SdSource *sd_source = (SdSource*)source; -+ -+ sd_login_monitor_unref (sd_source->monitor); -+} -+ -+static GSourceFuncs sd_source_funcs = { -+ sd_source_prepare, -+ sd_source_check, -+ sd_source_dispatch, -+ sd_source_finalize -+}; -+ -+static GSource * -+sd_source_new (void) -+{ -+ GSource *source; -+ SdSource *sd_source; -+ int ret; -+ -+ source = g_source_new (&sd_source_funcs, sizeof (SdSource)); -+ sd_source = (SdSource *)source; -+ -+ if ((ret = sd_login_monitor_new (NULL, &sd_source->monitor)) < 0) -+ { -+ g_printerr ("Error getting login monitor: %d", ret); -+ } -+ else -+ { -+ sd_source->pollfd.fd = sd_login_monitor_get_fd (sd_source->monitor); -+ sd_source->pollfd.events = G_IO_IN; -+ g_source_add_poll (source, &sd_source->pollfd); -+ } -+ -+ return source; -+} -+#endif /* HAVE_SYSTEMD */ -+ - struct _PolkitBackendSessionMonitor - { - GObject parent_instance; -@@ -48,6 +136,10 @@ - GKeyFile *database; - GFileMonitor *database_monitor; - time_t database_mtime; -+ -+#ifdef HAVE_SYSTEMD -+ GSource *sd_source; -+#endif - }; - - struct _PolkitBackendSessionMonitorClass -@@ -162,6 +254,18 @@ - g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0); - } - -+#ifdef HAVE_SYSTEMD -+static gboolean -+sessions_changed (gpointer user_data) -+{ -+ PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data); -+ -+ g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0); -+ -+ return TRUE; -+} -+#endif -+ - static void - polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor) - { -@@ -176,31 +280,47 @@ - g_error_free (error); - } - -- error = NULL; -- if (!ensure_database (monitor, &error)) -- { -- g_printerr ("Error loading " CKDB_PATH ": %s", error->message); -- g_error_free (error); -- } -+#ifdef HAVE_SYSTEMD -+ monitor->sd_source = NULL; -+ -+ if (sd_booted () > 0) -+ { -+ monitor->sd_source = sd_source_new (); -+ g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); -+ g_source_attach (monitor->sd_source, NULL); - -- error = NULL; -- file = g_file_new_for_path (CKDB_PATH); -- monitor->database_monitor = g_file_monitor_file (file, -- G_FILE_MONITOR_NONE, -- NULL, -- &error); -- g_object_unref (file); -- if (monitor->database_monitor == NULL) -- { -- g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message); -- g_error_free (error); -+ monitor->database = NULL; -+ monitor->database_monitor = NULL; - } - else -+#endif - { -- g_signal_connect (monitor->database_monitor, -- "changed", -- G_CALLBACK (on_file_monitor_changed), -- monitor); -+ error = NULL; -+ if (!ensure_database (monitor, &error)) -+ { -+ g_printerr ("Error loading " CKDB_PATH ": %s", error->message); -+ g_error_free (error); -+ } -+ -+ error = NULL; -+ file = g_file_new_for_path (CKDB_PATH); -+ monitor->database_monitor = g_file_monitor_file (file, -+ G_FILE_MONITOR_NONE, -+ NULL, -+ &error); -+ g_object_unref (file); -+ if (monitor->database_monitor == NULL) -+ { -+ g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message); -+ g_error_free (error); -+ } -+ else -+ { -+ g_signal_connect (monitor->database_monitor, -+ "changed", -+ G_CALLBACK (on_file_monitor_changed), -+ monitor); -+ } - } - } - -@@ -212,6 +332,14 @@ - if (monitor->system_bus != NULL) - g_object_unref (monitor->system_bus); - -+#ifdef HAVE_SYSTEMD -+ if (monitor->sd_source != NULL) -+ { -+ g_source_destroy (monitor->sd_source); -+ g_source_unref (monitor->sd_source); -+ } -+#endif -+ - if (monitor->database_monitor != NULL) - g_object_unref (monitor->database_monitor); - -@@ -328,22 +456,38 @@ - } - else if (POLKIT_IS_UNIX_SESSION (subject)) - { -- if (!ensure_database (monitor, error)) -+#ifdef HAVE_SYSTEMD -+ if (monitor->sd_source != NULL) - { -- g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": "); -- goto out; -+ if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0) -+ { -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Error getting uid for session"); -+ goto out; -+ } - } -- -- group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject))); -- local_error = NULL; -- uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error); -- if (local_error != NULL) -+ else -+#endif - { -- g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": "); -+ if (!ensure_database (monitor, error)) -+ { -+ g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": "); -+ goto out; -+ } -+ -+ group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject))); -+ local_error = NULL; -+ uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error); -+ if (local_error != NULL) -+ { -+ g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": "); -+ g_free (group); -+ goto out; -+ } - g_free (group); -- goto out; - } -- g_free (group); - - ret = polkit_unix_user_new (uid); - } -@@ -373,29 +517,46 @@ - - if (POLKIT_IS_UNIX_PROCESS (subject)) - { -- const gchar *session_id; -- GVariant *result; -- result = g_dbus_connection_call_sync (monitor->system_bus, -- "org.freedesktop.ConsoleKit", -- "/org/freedesktop/ConsoleKit/Manager", -- "org.freedesktop.ConsoleKit.Manager", -- "GetSessionForUnixProcess", -- g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))), -- G_VARIANT_TYPE ("(o)"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, /* timeout_msec */ -- NULL, /* GCancellable */ -- error); -- if (result == NULL) -- goto out; -- g_variant_get (result, "(&o)", &session_id); -- session = polkit_unix_session_new (session_id); -- g_variant_unref (result); -+#ifdef HAVE_SYSTEMD -+ if (monitor->sd_source != NULL) -+ { -+ gchar *session_id; -+ pid_t pid; -+ -+ pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)); -+ if (sd_pid_get_session (pid, &session_id) < 0) -+ goto out; -+ -+ session = polkit_unix_session_new (session_id); -+ free (session_id); -+ } -+ else -+#endif -+ { -+ const gchar *session_id; -+ GVariant *result; -+ result = g_dbus_connection_call_sync (monitor->system_bus, -+ "org.freedesktop.ConsoleKit", -+ "/org/freedesktop/ConsoleKit/Manager", -+ "org.freedesktop.ConsoleKit.Manager", -+ "GetSessionForUnixProcess", -+ g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))), -+ G_VARIANT_TYPE ("(o)"), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, /* timeout_msec */ -+ NULL, /* GCancellable */ -+ error); -+ if (result == NULL) -+ goto out; -+ g_variant_get (result, "(&o)", &session_id); -+ session = polkit_unix_session_new (session_id); -+ g_variant_unref (result); -+ } - } - else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) - { - guint32 pid; -- const gchar *session_id; -+ gchar *session_id; - GVariant *result; - - result = g_dbus_connection_call_sync (monitor->system_bus, -@@ -414,22 +575,35 @@ - g_variant_get (result, "(u)", &pid); - g_variant_unref (result); - -- result = g_dbus_connection_call_sync (monitor->system_bus, -- "org.freedesktop.ConsoleKit", -- "/org/freedesktop/ConsoleKit/Manager", -- "org.freedesktop.ConsoleKit.Manager", -- "GetSessionForUnixProcess", -- g_variant_new ("(u)", pid), -- G_VARIANT_TYPE ("(o)"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, /* timeout_msec */ -- NULL, /* GCancellable */ -- error); -- if (result == NULL) -- goto out; -- g_variant_get (result, "(&o)", &session_id); -- session = polkit_unix_session_new (session_id); -- g_variant_unref (result); -+#ifdef HAVE_SYSTEMD -+ if (monitor->sd_source != NULL) -+ { -+ if (sd_pid_get_session (pid, &session_id) < 0) -+ goto out; -+ -+ session = polkit_unix_session_new (session_id); -+ free (session_id); -+ } -+ else -+#endif -+ { -+ result = g_dbus_connection_call_sync (monitor->system_bus, -+ "org.freedesktop.ConsoleKit", -+ "/org/freedesktop/ConsoleKit/Manager", -+ "org.freedesktop.ConsoleKit.Manager", -+ "GetSessionForUnixProcess", -+ g_variant_new ("(u)", pid), -+ G_VARIANT_TYPE ("(o)"), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, /* timeout_msec */ -+ NULL, /* GCancellable */ -+ error); -+ if (result == NULL) -+ goto out; -+ g_variant_get (result, "(&o)", &session_id); -+ session = polkit_unix_session_new (session_id); -+ g_variant_unref (result); -+ } - } - else - { -@@ -490,7 +664,22 @@ - polkit_backend_session_monitor_is_session_local (PolkitBackendSessionMonitor *monitor, - PolkitSubject *session) - { -- return get_boolean (monitor, session, "is_local"); -+#ifdef HAVE_SYSTEMD -+ if (monitor->sd_source != NULL) -+ { -+ char *seat; -+ -+ if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat)) -+ { -+ free (seat); -+ return TRUE; -+ } -+ -+ return FALSE; -+ } -+ else -+#endif -+ return get_boolean (monitor, session, "is_local"); - } - - -@@ -498,6 +687,11 @@ - polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor, - PolkitSubject *session) - { -- return get_boolean (monitor, session, "is_active"); -+#ifdef HAVE_SYSTEMD -+ if (monitor->sd_source != NULL) -+ return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session))); -+ else -+#endif -+ return get_boolean (monitor, session, "is_active"); - } - -diff -u -rN polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor-systemd.c polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor-systemd.c ---- polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor-systemd.c 2012-01-03 16:03:47.000000000 +0100 -+++ polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor-systemd.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,414 +0,0 @@ --/* -- * Copyright (C) 2011 Red Hat, Inc. -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General -- * Public License along with this library; if not, write to the -- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, -- * Boston, MA 02111-1307, USA. -- * -- * Author: Matthias Clasen -- */ -- --#include "config.h" --#include <errno.h> --#include <pwd.h> --#include <grp.h> --#include <string.h> --#include <glib/gstdio.h> --#include <systemd/sd-login.h> --#include <stdlib.h> -- --#include <polkit/polkit.h> --#include "polkitbackendsessionmonitor.h" -- --/* <internal> -- * SECTION:polkitbackendsessionmonitor -- * @title: PolkitBackendSessionMonitor -- * @short_description: Monitor sessions -- * -- * The #PolkitBackendSessionMonitor class is a utility class to track and monitor sessions. -- */ -- --typedef struct --{ -- GSource source; -- GPollFD pollfd; -- sd_login_monitor *monitor; --} SdSource; -- --static gboolean --sd_source_prepare (GSource *source, -- gint *timeout) --{ -- *timeout = -1; -- return FALSE; --} -- --static gboolean --sd_source_check (GSource *source) --{ -- SdSource *sd_source = (SdSource *)source; -- -- return sd_source->pollfd.revents != 0; --} -- --static gboolean --sd_source_dispatch (GSource *source, -- GSourceFunc callback, -- gpointer user_data) -- --{ -- SdSource *sd_source = (SdSource *)source; -- gboolean ret; -- -- g_warn_if_fail (callback != NULL); -- -- ret = (*callback) (user_data); -- -- sd_login_monitor_flush (sd_source->monitor); -- -- return ret; --} -- --static void --sd_source_finalize (GSource *source) --{ -- SdSource *sd_source = (SdSource*)source; -- -- sd_login_monitor_unref (sd_source->monitor); --} -- --static GSourceFuncs sd_source_funcs = { -- sd_source_prepare, -- sd_source_check, -- sd_source_dispatch, -- sd_source_finalize --}; -- --static GSource * --sd_source_new (void) --{ -- GSource *source; -- SdSource *sd_source; -- int ret; -- -- source = g_source_new (&sd_source_funcs, sizeof (SdSource)); -- sd_source = (SdSource *)source; -- -- if ((ret = sd_login_monitor_new (NULL, &sd_source->monitor)) < 0) -- { -- g_printerr ("Error getting login monitor: %d", ret); -- } -- else -- { -- sd_source->pollfd.fd = sd_login_monitor_get_fd (sd_source->monitor); -- sd_source->pollfd.events = G_IO_IN; -- g_source_add_poll (source, &sd_source->pollfd); -- } -- -- return source; --} -- --struct _PolkitBackendSessionMonitor --{ -- GObject parent_instance; -- -- GDBusConnection *system_bus; -- -- GSource *sd_source; --}; -- --struct _PolkitBackendSessionMonitorClass --{ -- GObjectClass parent_class; -- -- void (*changed) (PolkitBackendSessionMonitor *monitor); --}; -- -- --enum --{ -- CHANGED_SIGNAL, -- LAST_SIGNAL, --}; -- --static guint signals[LAST_SIGNAL] = {0}; -- --G_DEFINE_TYPE (PolkitBackendSessionMonitor, polkit_backend_session_monitor, G_TYPE_OBJECT); -- --/* ---------------------------------------------------------------------------------------------------- */ -- --static gboolean --sessions_changed (gpointer user_data) --{ -- PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data); -- -- g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0); -- -- return TRUE; --} -- -- --static void --polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor) --{ -- GError *error; -- -- error = NULL; -- monitor->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); -- if (monitor->system_bus == NULL) -- { -- g_printerr ("Error getting system bus: %s", error->message); -- g_error_free (error); -- } -- -- monitor->sd_source = sd_source_new (); -- g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); -- g_source_attach (monitor->sd_source, NULL); --} -- --static void --polkit_backend_session_monitor_finalize (GObject *object) --{ -- PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (object); -- -- if (monitor->system_bus != NULL) -- g_object_unref (monitor->system_bus); -- -- if (monitor->sd_source != NULL) -- { -- g_source_destroy (monitor->sd_source); -- g_source_unref (monitor->sd_source); -- } -- -- if (G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize != NULL) -- G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize (object); --} -- --static void --polkit_backend_session_monitor_class_init (PolkitBackendSessionMonitorClass *klass) --{ -- GObjectClass *gobject_class; -- -- gobject_class = G_OBJECT_CLASS (klass); -- -- gobject_class->finalize = polkit_backend_session_monitor_finalize; -- -- /** -- * PolkitBackendSessionMonitor::changed: -- * @monitor: A #PolkitBackendSessionMonitor -- * -- * Emitted when something changes. -- */ -- signals[CHANGED_SIGNAL] = g_signal_new ("changed", -- POLKIT_BACKEND_TYPE_SESSION_MONITOR, -- G_SIGNAL_RUN_LAST, -- G_STRUCT_OFFSET (PolkitBackendSessionMonitorClass, changed), -- NULL, /* accumulator */ -- NULL, /* accumulator data */ -- g_cclosure_marshal_VOID__VOID, -- G_TYPE_NONE, -- 0); --} -- --PolkitBackendSessionMonitor * --polkit_backend_session_monitor_new (void) --{ -- PolkitBackendSessionMonitor *monitor; -- -- monitor = POLKIT_BACKEND_SESSION_MONITOR (g_object_new (POLKIT_BACKEND_TYPE_SESSION_MONITOR, NULL)); -- -- return monitor; --} -- --/* ---------------------------------------------------------------------------------------------------- */ -- --GList * --polkit_backend_session_monitor_get_sessions (PolkitBackendSessionMonitor *monitor) --{ -- /* TODO */ -- return NULL; --} -- --/* ---------------------------------------------------------------------------------------------------- */ -- --/** -- * polkit_backend_session_monitor_get_user: -- * @monitor: A #PolkitBackendSessionMonitor. -- * @subject: A #PolkitSubject. -- * @error: Return location for error. -- * -- * Gets the user corresponding to @subject or %NULL if no user exists. -- * -- * Returns: %NULL if @error is set otherwise a #PolkitUnixUser that should be freed with g_object_unref(). -- */ --PolkitIdentity * --polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor *monitor, -- PolkitSubject *subject, -- GError **error) --{ -- PolkitIdentity *ret; -- guint32 uid; -- -- ret = NULL; -- -- if (POLKIT_IS_UNIX_PROCESS (subject)) -- { -- uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)); -- if ((gint) uid == -1) -- { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "Unix process subject does not have uid set"); -- goto out; -- } -- ret = polkit_unix_user_new (uid); -- } -- else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) -- { -- GVariant *result; -- -- result = g_dbus_connection_call_sync (monitor->system_bus, -- "org.freedesktop.DBus", -- "/org/freedesktop/DBus", -- "org.freedesktop.DBus", -- "GetConnectionUnixUser", -- g_variant_new ("(s)", polkit_system_bus_name_get_name (POLKIT_SYSTEM_BUS_NAME (subject))), -- G_VARIANT_TYPE ("(u)"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, /* timeout_msec */ -- NULL, /* GCancellable */ -- error); -- if (result == NULL) -- goto out; -- g_variant_get (result, "(u)", &uid); -- g_variant_unref (result); -- -- ret = polkit_unix_user_new (uid); -- } -- else if (POLKIT_IS_UNIX_SESSION (subject)) -- { -- -- if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0) -- { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "Error getting uid for session"); -- goto out; -- } -- -- ret = polkit_unix_user_new (uid); -- } -- -- out: -- return ret; --} -- --/** -- * polkit_backend_session_monitor_get_session_for_subject: -- * @monitor: A #PolkitBackendSessionMonitor. -- * @subject: A #PolkitSubject. -- * @error: Return location for error. -- * -- * Gets the session corresponding to @subject or %NULL if no session exists. -- * -- * Returns: %NULL if @error is set otherwise a #PolkitUnixSession that should be freed with g_object_unref(). -- */ --PolkitSubject * --polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMonitor *monitor, -- PolkitSubject *subject, -- GError **error) --{ -- PolkitSubject *session; -- -- session = NULL; -- -- if (POLKIT_IS_UNIX_PROCESS (subject)) -- { -- gchar *session_id; -- pid_t pid; -- -- pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)); -- if (sd_pid_get_session (pid, &session_id) < 0) -- goto out; -- -- session = polkit_unix_session_new (session_id); -- free (session_id); -- } -- else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) -- { -- guint32 pid; -- gchar *session_id; -- GVariant *result; -- -- result = g_dbus_connection_call_sync (monitor->system_bus, -- "org.freedesktop.DBus", -- "/org/freedesktop/DBus", -- "org.freedesktop.DBus", -- "GetConnectionUnixProcessID", -- g_variant_new ("(s)", polkit_system_bus_name_get_name (POLKIT_SYSTEM_BUS_NAME (subject))), -- G_VARIANT_TYPE ("(u)"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, /* timeout_msec */ -- NULL, /* GCancellable */ -- error); -- if (result == NULL) -- goto out; -- g_variant_get (result, "(u)", &pid); -- g_variant_unref (result); -- -- if (sd_pid_get_session (pid, &session_id) < 0) -- goto out; -- -- session = polkit_unix_session_new (session_id); -- free (session_id); -- } -- else -- { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_NOT_SUPPORTED, -- "Cannot get user for subject of type %s", -- g_type_name (G_TYPE_FROM_INSTANCE (subject))); -- } -- -- out: -- -- return session; --} -- --gboolean --polkit_backend_session_monitor_is_session_local (PolkitBackendSessionMonitor *monitor, -- PolkitSubject *session) --{ -- char *seat; -- -- if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat)) -- { -- free (seat); -- return TRUE; -- } -- -- return FALSE; --} -- -- --gboolean --polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor, -- PolkitSubject *session) --{ -- return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session))); --} -- diff --git a/abs/extra/poppler-data/PKGBUILD b/abs/extra/poppler-data/PKGBUILD index 49db88e..c60a073 100644 --- a/abs/extra/poppler-data/PKGBUILD +++ b/abs/extra/poppler-data/PKGBUILD @@ -1,18 +1,19 @@ # $Id: PKGBUILD 22380 2008-12-26 16:33:15Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=poppler-data -pkgver=0.4.5 +pkgver=0.4.7 pkgrel=1 pkgdesc="Encoding data for the poppler PDF rendering library" -arch=(any) +arch=('any') license=('custom' 'GPL2') conflicts=('poppler<0.10.5') url="http://poppler.freedesktop.org/" source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz) -md5sums=('448dd7c5077570e340340706cef931aa') +md5sums=('636a8f2b9f6df9e7ced8ec0946961eaf') -build() { +package() { cd "${srcdir}/${pkgname}-${pkgver}" make prefix=/usr DESTDIR="${pkgdir}" install diff --git a/abs/extra/powerpanel/PKGBUILD b/abs/extra/powerpanel/PKGBUILD new file mode 100644 index 0000000..22edba7 --- /dev/null +++ b/abs/extra/powerpanel/PKGBUILD @@ -0,0 +1,69 @@ +# Contributor: das-ich <das-ich@yandex.ru> +pkgname=powerpanel +pkgver=1.2.3 +pkgrel=6 +pkgdesc="PowerPanel for Linux software can be used with most CyberPower UPS products." +arch=("x86_64" "i686") +url="http://www.cyberpowersystems.com" +license=("custom:CyberPower") +depends=('libusb') +install=pwrstatd.install +source=(http://www.cyberpowersystems.com/software/powerpanel_123_x86_64.tar.gz pwrstatd.service) +backup=(etc/powerpanel/pwrstatd-{powerfail,lowbatt,email}.sh + etc/pwrstatd.conf) + +if [ "$CARCH" = "x86_64" ]; then + md5sums=('0226b17e9470b93cd1e4fd2f149c5d05' + 'b945ff7c15ef206022c8df29a96338c8') +fi + +if [ "$CARCH" = "i686" ]; then +source=(http://www.cyberpowersystems.com/software/powerpanel_123_i386.tar.gz) + md5sums=('79d1b60f5146b5286c786c93b90e6c87' + 'b945ff7c15ef206022c8df29a96338c8') +fi + +package() { + cd ${srcdir}/$pkgname-$pkgver-0 +# +# copy files +# + +# PowerPanel for Linux client program +install -Dm755 bin/pwrstat ${pkgdir}/usr/bin/pwrstat + +# PowerPanel for Linux daemon program +install -Dm755 bin/pwrstatd ${pkgdir}/usr/bin/pwrstatd + +# PowerPanel for Linux daemon configuration +install -Dm600 conf/pwrstatd.conf ${pkgdir}/etc/pwrstatd.conf +sed -e 's#/etc#/etc/powerpanel#' -i ${pkgdir}/etc/pwrstatd.conf + +# Script command for event of power failure +install -Dm755 script/pwrstatd-powerfail.sh ${pkgdir}/etc/powerpanel/pwrstatd-powerfail.sh + +# Script command for event of battery low +install -Dm755 script/pwrstatd-lowbatt.sh ${pkgdir}/etc/powerpanel/pwrstatd-lowbatt.sh + +# Script command for e-mail notification +install -Dm755 script/pwrstatd-email.sh ${pkgdir}/etc/powerpanel/pwrstatd-email.sh + +# Systemd unit +install -Dm644 ../pwrstatd.service ${pkgdir}/usr/lib/systemd/system/pwrstatd.service + +# PowerPanel for Linux client man-page +install -Dm644 doc/pwrstat.8 ${pkgdir}/usr/share/man/man8/pwrstat.8 + +# PowerPanel for Linux daemon man-page +install -Dm644 doc/pwrstatd.8 ${pkgdir}/usr/share/man/man8/pwrstatd.8 + +# +# compress the man page file +# +gzip -9 ${pkgdir}/usr/share/man/man8/pwrstat.8 +gzip -9 ${pkgdir}/usr/share/man/man8/pwrstatd.8 + +} + +md5sums=('0226b17e9470b93cd1e4fd2f149c5d05' + 'b945ff7c15ef206022c8df29a96338c8') diff --git a/abs/extra/powerpanel/__changelog b/abs/extra/powerpanel/__changelog new file mode 100644 index 0000000..503964f --- /dev/null +++ b/abs/extra/powerpanel/__changelog @@ -0,0 +1,2 @@ +add pwrstatd.install to have runit start the service + diff --git a/abs/extra/powerpanel/pwrstatd.install b/abs/extra/powerpanel/pwrstatd.install new file mode 100644 index 0000000..5fe72ff --- /dev/null +++ b/abs/extra/powerpanel/pwrstatd.install @@ -0,0 +1,14 @@ +post_install() { + add_service.sh pwrstatd + sv start pwrstatd +} + +post_upgrade() { + post_install + sv restart pwrstatd +} + +post_remove() { + sv stop pwrstatd + remove_service.sh pwrstatd +} diff --git a/abs/extra/powerpanel/pwrstatd.service b/abs/extra/powerpanel/pwrstatd.service new file mode 100644 index 0000000..9a1160c --- /dev/null +++ b/abs/extra/powerpanel/pwrstatd.service @@ -0,0 +1,8 @@ +[Unit] +Description=PowerPanel for Linux software can be used with most CyberPower UPS products. + +[Service] +ExecStart=/usr/bin/pwrstatd + +[Install] +WantedBy=multi-user.target diff --git a/abs/extra/r/PKGBUILD b/abs/extra/r/PKGBUILD new file mode 100644 index 0000000..7b4f031 --- /dev/null +++ b/abs/extra/r/PKGBUILD @@ -0,0 +1,90 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> +# Contributor: K. Piche <kpiche@rogers.com> + +pkgname=r +pkgver=3.1.2 +pkgrel=1 +pkgdesc="Language and environment for statistical computing and graphics" +arch=('i686' 'x86_64') +license=('GPL') +url=('http://www.r-project.org/') +depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' + 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' + 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils' 'zip' 'unzip') +makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk') +optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files') +backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories' 'etc/R/javaconf') +options=('!makeflags' '!emptydirs') +install=r.install +source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz" + 'r.desktop' + 'r.png' + 'R.conf') +sha1sums=('93809368e5735a630611633ac1fa99010020c5d6' + 'd7fa521345b230a4187d60d07d06ce4b6d573e3f' + 'a69a07ec363440efc18ce0a7f2af103375dea978' + '43668da6cfd1b4455a99f23e79e2059294dddac9') + +prepare() { + cd R-${pkgver} + # set texmf dir correctly in makefile + sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in + # fix for texinfo 5.X + sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure +} + +build() { + cd R-${pkgver} + ./configure --prefix=/usr \ + --libdir=/usr/lib \ + --sysconfdir=/etc/R \ + --datarootdir=/usr/share \ + rsharedir=/usr/share/R/ \ + rincludedir=/usr/include/R/ \ + rdocdir=/usr/share/doc/R/ \ + --with-x \ + --enable-R-shlib \ + --with-lapack \ + --with-blas \ + F77=gfortran \ + LIBnn=lib + make + +# make libRmath.so + cd src/nmath/standalone + make shared +} + +package() { + cd R-${pkgver} + make DESTDIR="${pkgdir}" install + +# install libRmath.so + cd src/nmath/standalone + make DESTDIR="${pkgdir}" install + + # Fixup R wrapper scripts. + sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R" + rm "${pkgdir}/usr/lib/R/bin/R" + cd "${pkgdir}/usr/lib/R/bin" + ln -s ../../../bin/R + + # install some freedesktop.org compatibility + install -Dm644 "${srcdir}/r.desktop" \ + "${pkgdir}/usr/share/applications/r.desktop" + install -Dm644 "${srcdir}/r.png" \ + "${pkgdir}/usr/share/pixmaps/r.png" + + # move the config directory to /etc and create symlinks + install -d "${pkgdir}/etc/R" + cd "${pkgdir}/usr/lib/R/etc" + for i in *; do + mv -f ${i} "${pkgdir}/etc/R" + ln -s /etc/R/${i} ${i} + done + + # Install ld.so.conf.d file to ensure other applications access the shared lib + install -Dm644 "${srcdir}/R.conf" "${pkgdir}/etc/ld.so.conf.d/R.conf" +} diff --git a/abs/extra/r/R.conf b/abs/extra/r/R.conf new file mode 100644 index 0000000..e360859 --- /dev/null +++ b/abs/extra/r/R.conf @@ -0,0 +1,2 @@ +/usr/lib/R/lib + diff --git a/abs/extra/r/r.desktop b/abs/extra/r/r.desktop new file mode 100644 index 0000000..7732c9b --- /dev/null +++ b/abs/extra/r/r.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=R +GenericName=environment for statistical computing +Comment=language and environment for statistical computing and graphics +Exec=R +Icon=/usr/share/pixmaps/r.png +DocPath=/usr/lib/R/doc/html/index.html +StartupNotify=true +Terminal=true +Type=Application +Categories=Science; diff --git a/abs/extra/r/r.install b/abs/extra/r/r.install new file mode 100644 index 0000000..522ce52 --- /dev/null +++ b/abs/extra/r/r.install @@ -0,0 +1,16 @@ +post_install() { + update-desktop-database -q + if [[ -x /usr/bin/mktexlsr ]]; then + echo ">>> updating the filename database for texlive..." + mktexlsr --quiet usr/share/texmf + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/abs/extra/r/r.png b/abs/extra/r/r.png Binary files differnew file mode 100644 index 0000000..1303ccd --- /dev/null +++ b/abs/extra/r/r.png diff --git a/abs/extra/rest/PKGBUILD b/abs/extra/rest/PKGBUILD new file mode 100644 index 0000000..050f42d --- /dev/null +++ b/abs/extra/rest/PKGBUILD @@ -0,0 +1,29 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=rest +pkgver=0.7.92 +pkgrel=1 +pkgdesc="A helper library for RESTful services." +arch=(i686 x86_64) +url="http://www.gtk.org/" +license=(GPL2) +depends=(glib2 libxml2 'libsoup') +makedepends=(gobject-introspection python2) +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-${pkgver}.tar.xz) +sha256sums=('07548c8785a3e743daf54a82b952ff5f32af94fee68997df4c83b00d52f9c0ec') + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/rrdtool/PKGBUILD b/abs/extra/rrdtool/PKGBUILD index d22d133..fb5a6fe 100644 --- a/abs/extra/rrdtool/PKGBUILD +++ b/abs/extra/rrdtool/PKGBUILD @@ -1,39 +1,48 @@ -# $Id: PKGBUILD 88191 2010-08-21 01:59:03Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Tom K <tom@archlinux.org> +# $Id$ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool -pkgver=1.4.4 -pkgrel=2 +pkgver=1.4.8 +pkgrel=4 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" license=('GPL' 'custom') -depends=('libpng' 'libxml2' 'pango') -makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua') +depends=('libxml2' 'pango' 'ttf-dejavu') +makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua51') optdepends=('tcl: to use corresponding binding' \ 'python2: to use corresponding binding' \ 'ruby: to use corresponding binding' \ - 'lua: to use corresponding binding') -options=('!libtool' '!emptydirs' '!makeflags') -changelog=ChangeLog -source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) -md5sums=('93ad2fc2e9ddcd7d99c611fe30284a54') -sha1sums=('e4715c13f2a6fd077c54911d396eb573788377b0') + 'lua51: to use corresponding binding') +options=('!emptydirs' '!makeflags') +source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz + rrdtool-pangofont.patch rrdtool-systemd.patch) +sha1sums=('56d68857f39e70bfa32360947614d8220702ed02' + '8c600285bdab7776c1d5301df7cf486d69eae048' + '963b600f8056d85305b6ff4554fa1e7b9b5a4ae1') + +prepare() { + cd ${pkgname}-${pkgver} + # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby + sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.am + patch -p1 -i "${srcdir}/rrdtool-pangofont.patch" + patch -p1 -i "${srcdir}/rrdtool-systemd.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --localstatedir=/var --disable-rpath --enable-perl \ - --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ + cd ${pkgname}-${pkgver} + autoreconf + PYTHON=python2 LUA=/usr/bin/lua5.1 \ + LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \ + ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ + --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ --enable-ruby --enable-ruby-site-install --enable-python \ - --enable-lua --enable-lua-site-install \ - --enable-tcl - make + --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap + make LIBS+="-lglib-2.0" } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" LIBRUBYARG_SHARED="-Wl,-L/usr/lib -lruby" \ - LIBPATH="-L. -L/usr/lib -L../../src/.libs" install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" includedir=/usr/include install install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/extra/rrdtool/rrdtool-pangofont.patch b/abs/extra/rrdtool/rrdtool-pangofont.patch new file mode 100644 index 0000000..60936d8 --- /dev/null +++ b/abs/extra/rrdtool/rrdtool-pangofont.patch @@ -0,0 +1,39 @@ +From ba76d4915eb3d379d69205957e48edea4aee27b6 Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker <tobi@oetiker.ch> +Date: Wed, 24 Apr 2013 23:49:28 +0200 +Subject: [PATCH] move to non-deprecated pango_font_map_create_context + +--- + configure.ac | 2 +- + src/rrd_graph.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2f9e395..d6b2722 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -535,7 +535,7 @@ EX_CHECK_ALL(cairo, cairo_font_options_create, cairo.h, + EX_CHECK_ALL(cairo, cairo_svg_surface_create, cairo-svg.h, cairo-svg, 1.10.2, http://cairographics.org/releases/, "") + EX_CHECK_ALL(cairo, cairo_pdf_surface_create, cairo-pdf.h, cairo-pdf, 1.10.2, http://cairographics.org/releases/, "") + EX_CHECK_ALL(cairo, cairo_ps_surface_create, cairo-ps.h, cairo-ps, 1.10.2, http://cairographics.org/releases/, "") +-EX_CHECK_ALL(pangocairo-1.0, pango_cairo_context_set_font_options, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "") ++EX_CHECK_ALL(pangocairo-1.0, pango_font_map_create_context, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "") + + fi + EX_CHECK_ALL(glib-2.0, glib_check_version, glib.h, glib-2.0, 2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "") +diff --git a/src/rrd_graph.c b/src/rrd_graph.c +index 5547aa6..25ae485 100644 +--- a/src/rrd_graph.c ++++ b/src/rrd_graph.c +@@ -4282,7 +4282,7 @@ void rrd_graph_init( + fontmap = pango_cairo_font_map_get_default(); + } + +- context = pango_cairo_font_map_create_context((PangoCairoFontMap*)fontmap); ++ context = pango_font_map_create_context(fontmap); + + pango_cairo_context_set_resolution(context, 100); + +-- +1.8.1.6 + diff --git a/abs/extra/rrdtool/rrdtool-systemd.patch b/abs/extra/rrdtool/rrdtool-systemd.patch new file mode 100644 index 0000000..856f9ef --- /dev/null +++ b/abs/extra/rrdtool/rrdtool-systemd.patch @@ -0,0 +1,140 @@ +From 78b519eb2ffa786d6427bb13277e9151ef7b111e Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker <tobi@oetiker.ch> +Date: Mon, 2 Jul 2012 15:05:32 +0000 +Subject: [PATCH] serviced config etc files for rrdtool + +git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2292 a5681a0c-68f1-0310-ab6d-d61299d08faa +--- + etc/rrdcached.service.in | 19 +++++++++++++++++++ + etc/rrdcached.socket.in | 18 ++++++++++++++++++ + 2 files changed, 37 insertions(+) + create mode 100644 etc/rrdcached.service.in + create mode 100644 etc/rrdcached.socket.in + +diff --git a/etc/rrdcached.service.in b/etc/rrdcached.service.in +new file mode 100644 +index 0000000..3b6f309 +--- /dev/null ++++ b/etc/rrdcached.service.in +@@ -0,0 +1,19 @@ ++# ++# To customize, copy this file to /etc/systemd/system/ ++# and edit there ++# ++ ++[Unit] ++Description=Data caching daemon for rrdtool ++Documentation=man:rrdcached(1) ++ ++[Service] ++# If you enable socket-activable rrdcached.socket, ++# command line socket declarations will be ignored ++ExecStart=@prefix@/bin/rrdcached -g ++#WorkingDirectory= ++#User= ++#Group= ++ ++[Install] ++WantedBy=multi-user.target +diff --git a/etc/rrdcached.socket.in b/etc/rrdcached.socket.in +new file mode 100644 +index 0000000..7a2d63e +--- /dev/null ++++ b/etc/rrdcached.socket.in +@@ -0,0 +1,18 @@ ++# ++# To customize, copy this file to /etc/systemd/system/ ++# and edit there ++# ++ ++[Unit] ++Description=sockets activating rrdcached ++Documentation=man:rrdcached(1) ++ ++[Socket] ++ListenStream=/tmp/rrdcached.sock ++#ListenStream=[::1]:42217 ++#DirectoryMode=0755 ++#SocketMode=0666 ++#BindToDevice= ++ ++[Install] ++WantedBy=sockets.target +-- +1.8.4 + +From 134ed0d33953e7e71c55454591c1078f7ae1db8a Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker <tobi@oetiker.ch> +Date: Mon, 2 Jul 2012 14:01:06 +0000 +Subject: [PATCH] wire up systemd support in autoconf -- tomek@pipebreaker.pl + +git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2291 a5681a0c-68f1-0310-ab6d-d61299d08faa +--- + Makefile.am | 6 ++++++ + configure.ac | 12 ++++++++++++ + doc/rrdcached.pod | 2 ++ + 3 files changed, 20 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 20b2e0a..11d16d3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -29,6 +29,12 @@ ACLOCAL_M4= $(top_srcdir)/aclocal.m4 + + # $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi@ipn.caida.org:/ipn/web/Tools/RRDtool/pub/ + ++if HAVE_SYSTEMD ++systemdsystemunit_DATA = \ ++ etc/rrdcached.socket \ ++ etc/rrdcached.service ++endif ++ + site-perl-inst: site-perl-install + + site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefile +diff --git a/configure.ac b/configure.ac +index 51c3f81..ab210d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -918,6 +918,17 @@ AC_ARG_VAR(RRDDOCDIR, [[DATADIR/doc/PACKAGE-VERSION] Documentation directory]) + if test -z "$RRDDOCDIR"; then + RRDDOCDIR='${datadir}/doc/${PACKAGE}-${VERSION}'; fi + ++# systemd check ++PKG_PROG_PKG_CONFIG ++AC_ARG_WITH([systemdsystemunitdir], ++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), ++ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) ++if test "x$with_systemdsystemunitdir" != xno; then ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ++ AC_OUTPUT([etc/rrdcached.socket etc/rrdcached.service]) ++fi ++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) ++ + + CONFIGURE_PART(Apply Configuration Information) + +@@ -993,6 +1004,7 @@ echo " Build librrd MT: $enable_pthread" + echo " Use gettext: $USE_NLS" + echo " With libDBI: $have_libdbi" + echo " With libwrap: $have_libwrap" ++echo " With systemd dir: $with_systemdsystemunitdir" + echo + echo " Libraries: $ALL_LIBS" + echo +diff --git a/doc/rrdcached.pod b/doc/rrdcached.pod +index 18adcf1..7c0b30c 100644 +--- a/doc/rrdcached.pod ++++ b/doc/rrdcached.pod +@@ -448,6 +448,8 @@ accepted commands to those needed by external clients. If, for example, + external clients want to draw graphs of the cached data, they should only be + allowed to use the C<FLUSH> command. + ++Authorization does not work when rrcached is socket-activated by systemd. ++ + =head2 Encryption + + There is no encryption. +-- +1.8.4 + diff --git a/abs/extra/samba/PKGBUILD b/abs/extra/samba/PKGBUILD index d1b2e44..f813ab6 100644 --- a/abs/extra/samba/PKGBUILD +++ b/abs/extra/samba/PKGBUILD @@ -10,17 +10,17 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=4.1.12 +pkgver=4.1.14 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=4.1.12 +_realver=4.1.14 pkgrel=1 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' - 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.17' 'krb5' 'pam' + 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam' 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus') source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba.logrotate @@ -241,7 +241,7 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('232016d7581a1ba11e991ec2674553c4' +md5sums=('9f7bae123ed39d2aa9ba842d3a138d54' '5697da77590ec092cc8a883bae06093c' '96f82c38f3f540b53f3e5144900acf17' 'ee4763a656cf00d92bfda31b6bb2c5cb' diff --git a/abs/extra/samba/__changelog b/abs/extra/samba/__changelog index b6a8d39..8fcf9eb 100644 --- a/abs/extra/samba/__changelog +++ b/abs/extra/samba/__changelog @@ -1,2 +1,2 @@ -PKGBUILD: removefam/gamin, systemd +PKGBUILD: remove fam/gamin, systemd samba.install: add systemconfig.py -m fileshare diff --git a/abs/extra/sdl2/PKGBUILD b/abs/extra/sdl2/PKGBUILD new file mode 100644 index 0000000..0511e43 --- /dev/null +++ b/abs/extra/sdl2/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +pkgname=sdl2 +pkgver=2.0.3 +pkgrel=1 +pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2)" +arch=('i686' 'x86_64') +url="http://www.libsdl.org" +license=('MIT') +depends=('glibc' 'libxext' 'libxrender' 'libx11' 'libgl' 'libxcursor') +makedepends=('alsa-lib' 'mesa' 'libxrandr' 'libxinerama' 'wayland' 'libxkbcommon') +optdepends=('alsa-lib: ALSA audio driver') +source=("http://www.libsdl.org/release/SDL2-${pkgver}.tar.gz") +md5sums=('fe6c61d2e9df9ef570e7e80c6e822537') + +prepare() { + mkdir build +} + +build() { + cd build + ../SDL2-$pkgver/configure --prefix=/usr \ + --enable-sdl-dlopen \ + --disable-arts --disable-esd --disable-nas \ + --enable-alsa --disable-pulseaudio-shared \ + --enable-video-wayland \ + --disable-rpath + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + install -Dm644 ../SDL2-$pkgver/COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/abs/extra/sdl2/__changelog b/abs/extra/sdl2/__changelog new file mode 100644 index 0000000..8f75429 --- /dev/null +++ b/abs/extra/sdl2/__changelog @@ -0,0 +1,2 @@ +PKGBUILD: remove libpulse dep +PKGBUILD: in configure: --disable-pulseaudio-shared diff --git a/abs/extra/sdl_image/PKGBUILD b/abs/extra/sdl_image/PKGBUILD index 3f5fefb..b34aa05 100644 --- a/abs/extra/sdl_image/PKGBUILD +++ b/abs/extra/sdl_image/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 148924 2012-02-05 11:56:07Z ibiru $ +# $Id$ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sdl_image pkgver=1.2.12 -pkgrel=2 +pkgrel=3 pkgdesc="A simple library to load images of various formats as SDL surfaces" arch=('i686' 'x86_64') license=('custom') depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib') -options=('!libtool') url="http://www.libsdl.org/projects/SDL_image/" source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz) md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb') build() { - cd "$srcdir/SDL_image-$pkgver" + cd SDL_image-$pkgver ./configure --prefix=/usr --disable-static make } package() { - cd "$srcdir/SDL_image-$pkgver" + cd SDL_image-$pkgver make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/abs/extra/sdl_mixer/PKGBUILD b/abs/extra/sdl_mixer/PKGBUILD index 626d401..1ac5bbe 100644 --- a/abs/extra/sdl_mixer/PKGBUILD +++ b/abs/extra/sdl_mixer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 170804 2012-11-12 02:00:36Z heftig $ +# $Id$ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -6,7 +6,7 @@ pkgname=sdl_mixer pkgver=1.2.12 -pkgrel=3 +pkgrel=4 pkgdesc="A simple multi-channel audio mixer" arch=('i686' 'x86_64') url="http://www.libsdl.org/projects/SDL_mixer/" @@ -14,7 +14,6 @@ license=('custom') depends=('sdl>=1.2.12' 'libvorbis' 'libmikmod' 'smpeg') makedepends=('fluidsynth') optdepends=('fluidsynth: MIDI software synth, replaces built-in timidity') -options=('!libtool') source=(http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-$pkgver.tar.gz mikmod1.patch mikmod2.patch fluidsynth-volume.patch double-free-crash.patch) md5sums=('e03ff73d77a55e3572ad0217131dc4a1' diff --git a/abs/extra/shairplay/PKGBUILD b/abs/extra/shairplay/PKGBUILD index e5f4d44..6dcd537 100644 --- a/abs/extra/shairplay/PKGBUILD +++ b/abs/extra/shairplay/PKGBUILD @@ -5,7 +5,7 @@ pkgname=shairplay _gitname=shairplay pkgver=20140422 -pkgrel=1 +pkgrel=2 pkgdesc='Apple airplay and raop protocol server' arch=('i686' 'x86_64') url='https://github.com/juhovh/shairplay' @@ -18,8 +18,6 @@ source=("$_gitname::git://github.com/juhovh/shairplay.git#commit=64d59e3087f8290 sha256sums=('SKIP' 'f0a176539a6c5be46dc832d054be2f18c3256e5fd34c5f1416c9463bd75c82b3') options=(!libtool) -provides=('libshairport') -conflicts=('libshairport') build() { cd $_gitname diff --git a/abs/extra/snes9x/PKGBUILD b/abs/extra/snes9x/PKGBUILD index 68b8032..a38ac44 100644 --- a/abs/extra/snes9x/PKGBUILD +++ b/abs/extra/snes9x/PKGBUILD @@ -1,37 +1,42 @@ -# $Id: PKGBUILD 78959 2012-10-28 04:11:03Z ebelanger $ +# $Id$ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=snes9x pkgname=('snes9x' 'snes9x-gtk') pkgver=1.53 -pkgrel=5 +pkgrel=8 arch=('i686' 'x86_64') url="https://code.google.com/p/snes9x-gtk/" license=('custom') -makedepends=('intltool' 'nasm' 'mesa' 'libpng' 'sdl' 'gtk2' 'libxv' \ - 'desktop-file-utils' ) +makedepends=('intltool' 'nasm' 'mesa' 'libpng' 'sdl' 'gtk2' 'libxv' + 'desktop-file-utils') source=(http://snes9x-gtk.googlecode.com/files/${pkgbase}-${pkgver}-src.tar.bz2 - snes9x-gtk2.24.diff.gz) + snes9x-gtk2.24.diff.gz snes9x-fix-crash.patch) sha1sums=('57be6480369f66b9aaaeb722789ce114f58ed1e2' - '680dbe0a70f1821bc7931539e72f5a1a95e3938c') + '680dbe0a70f1821bc7931539e72f5a1a95e3938c' + '995495c68ffc00d8266d10a7bd8fc74fb6c147b1') -build() { - cd "${srcdir}/${pkgbase}-${pkgver}-src" +prepare() { + cd ${pkgbase}-${pkgver}-src patch -p1 -i "${srcdir}/snes9x-gtk2.24.diff" - cd unix + patch -p1 -i "${srcdir}/snes9x-fix-crash.patch" +} + +build() { + cd ${pkgbase}-${pkgver}-src/unix ./configure --prefix=/usr --with-sdd1-decomp --enable-netplay make - cd "${srcdir}/${pkgbase}-${pkgver}-src/gtk" + cd ../gtk ./configure --prefix=/usr --with-sdd1-decomp --with-netplay --with-opengl make } package_snes9x() { pkgdesc="A portable Emulator for the Super Nintendo Entertainment System" - depends=('gcc-libs' 'libpng' 'libxext' 'libsm') + depends=('libpng' 'libxext' 'libsm') - cd "${srcdir}/${pkgbase}-${pkgver}-src/unix" + cd ${pkgbase}-${pkgver}-src/unix install -D -m755 snes9x "${pkgdir}/usr/bin/snes9x" install -d "${pkgdir}/usr/share/doc/${pkgname}" install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ @@ -43,10 +48,10 @@ package_snes9x() { package_snes9x-gtk() { pkgdesc="A portable Emulator for the Super Nintendo Entertainment System - GTK version" license=('custom' 'LGPL') - depends=('sdl' 'libgl' 'libpulse' 'gtk2' 'libxv' 'desktop-file-utils' 'gnome-icon-theme') + depends=('sdl' 'libpulse' 'gtk2' 'libxv' 'desktop-file-utils' 'gnome-icon-theme') install=snes9x-gtk.install - cd "${srcdir}/${pkgbase}-${pkgver}-src/gtk" + cd ${pkgbase}-${pkgver}-src/gtk make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/doc/${pkgname}" install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ diff --git a/abs/extra/snes9x/snes9x-fix-crash.patch b/abs/extra/snes9x/snes9x-fix-crash.patch new file mode 100644 index 0000000..95ed192 --- /dev/null +++ b/abs/extra/snes9x/snes9x-fix-crash.patch @@ -0,0 +1,30 @@ +From 6d74746342a73cf65db215f4fdecdfb0cae66792 Mon Sep 17 00:00:00 2001 +From: Brandon Wright <bearoso@gmail.com> +Date: Mon, 10 Feb 2014 16:28:05 -0600 +Subject: [PATCH] Fix bug caused by virtual directories. + +--- + gtk/src/gtk_file.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gtk/src/gtk_file.cpp b/gtk/src/gtk_file.cpp +index a0df75d..9c0e000 100644 +--- a/gtk/src/gtk_file.cpp ++++ b/gtk/src/gtk_file.cpp +@@ -465,8 +465,11 @@ S9xOpenROMDialog (void) + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + directory = + gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); +- strncpy (gui_config->last_directory, directory, PATH_MAX); +- g_free (directory); ++ if (directory) ++ { ++ strncpy (gui_config->last_directory, directory, PATH_MAX); ++ g_free (directory); ++ } + } + + else +-- +1.9.3 + diff --git a/abs/extra/soundtouch/PKGBUILD b/abs/extra/soundtouch/PKGBUILD new file mode 100644 index 0000000..0ea927e --- /dev/null +++ b/abs/extra/soundtouch/PKGBUILD @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=soundtouch +pkgver=1.8.0 +pkgrel=1 +pkgdesc="An audio processing library" +arch=('i686' 'x86_64') +url="http://www.surina.net/soundtouch/" +license=('LGPL') +depends=('gcc-libs') +source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz) +sha1sums=('2cee2c63194227b4a58da01a7cd92b8632f139cd') + +prepare() { + cd ${pkgname} + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac +} + +build() { + cd ${pkgname} + [ "${CARCH}" = "x86_64" ] && CONFIGFLAG="--with-pic" + ./bootstrap + ./configure --prefix=/usr --enable-shared ${CONFIGFLAG} + make +} + +package() { + cd ${pkgname} + make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install +} diff --git a/abs/extra/syslinux/PKGBUILD b/abs/extra/syslinux/PKGBUILD index e68cc11..4b81011 100644 --- a/abs/extra/syslinux/PKGBUILD +++ b/abs/extra/syslinux/PKGBUILD @@ -1,18 +1,26 @@ -# Maintainer : Tobias Powalowski <tpowa@archlinux.org> -# Maintainer : Thomas Bächler <thomas@archlinux.org> -# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer: Thomas Bächler <thomas@archlinux.org> +# Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com> +# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -pkgname="syslinux" -pkgver="6.02" -pkgrel="8" -arch=('x86_64' 'i686') -pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE" -url="http://syslinux.zytor.com/" -license=('GPL2') -options=('!makeflags' '!emptydirs') -backup=('boot/syslinux/syslinux.cfg') -makedepends=('python2' 'nasm' 'gnu-efi-libs') -depends=('perl' 'glibc') +pkgname=syslinux +pkgver=6.03 +_tag=syslinux-$pkgver +pkgrel=2 +pkgdesc='Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE' +url='http://www.syslinux.org/' +arch=(i686 x86_64) +backup=(boot/syslinux/syslinux.cfg) +install=syslinux.install +license=(GPL2) +# syslinux build system is a mess of submakes that does not work with -jN +# efi32/com32 do not like Arch cflags/ldflags, though it would be nice to have the flags for userspace tools +options=(!makeflags !buildflags) +makedepends=(git python2 nasm upx asciidoc) +if [[ "$CARCH" == x86_64 ]]; then + # efi32 needs it + makedepends+=(lib32-glibc) +fi optdepends=('perl-passwd-md5: For md5pass' 'perl-digest-sha1: For sha1pass' 'mtools: For mkdiskimage and syslinux support' @@ -20,174 +28,53 @@ optdepends=('perl-passwd-md5: For md5pass' 'util-linux: For isohybrid' 'efibootmgr: For EFI support' 'dosfstools: For EFI support') -install="${pkgname}.install" -source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgver}.tar.xz" - 'syslinux.cfg' - 'syslinux-install_update' - 'syslinux-6.02-fix-chainloading.patch' - 'syslinux-6.02-fix-bios-isolinux.patch' - 'syslinux-6.02-fix-efi-ovmf.patch') -prepare() { - - cd "${srcdir}/${pkgname}-${pkgver}/" - - ## Do not try to build the Windows or DOS installers and DIAG files - sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|dos/syslinux.com||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - - ## Fix FHS manpage path - sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true - - # fix chainloading - # http://bugzilla.syslinux.org/show_bug.cgi?id=31 - # http://www.syslinux.org/archives/2013-October/020971.html - patch -Np1 -i "${srcdir}/syslinux-6.02-fix-chainloading.patch" - - # fix bios booting from isohybrid - # http://www.syslinux.org/archives/2013-November/021189.html - patch -Np1 -i "${srcdir}/syslinux-6.02-fix-bios-isolinux.patch" - # fix efi booting in qemu/ovmf - # http://bugzilla.syslinux.org/show_bug.cgi?id=23 - patch -Np1 -i "${srcdir}/syslinux-6.02-fix-efi-ovmf.patch" - -} +# The syslinux-install_update script is maintained at https://gist.github.com/pyther/772138 +# Script not yet updated for syslinux-efi +source=(git://git.kernel.org/pub/scm/boot/syslinux/syslinux.git#tag=$_tag + syslinux.cfg + syslinux-install_update) +sha1sums=('SKIP' + '1145f454bd297d373ad123425f93620c3e92f585' + 'd22e7e3fc544cf8a49f27ae9a25f17e65f575ea1') -_build_syslinux_bios() { - - rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true - cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-bios" - cd "${srcdir}/${pkgname}-${pkgver}-bios/" - - ## Do not try to build syslinux with our default LDFLAGS, it will fail - unset LDFLAGS - make PYTHON="python2" bios - make PYTHON="python2" bios installer - -} +_targets='bios efi32' +case "$CARCH" in + x86_64) _targets+=' efi64' ;; +esac -_build_syslinux_efi64() { - - rm -rf "${srcdir}/${pkgname}-${pkgver}-efi64/" || true - cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi64" - cd "${srcdir}/${pkgname}-${pkgver}-efi64/" - - ## Unset all compiler FLAGS for efi64 build - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - make PYTHON="python2" efi64 - make PYTHON="python2" efi64 installer - -} +prepare() { + cd syslinux -_build_syslinux_efi32() { - - rm -rf "${srcdir}/${pkgname}-${pkgver}-efi32/" || true - cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi32" - cd "${srcdir}/${pkgname}-${pkgver}-efi32/" - - ## Unset all compiler FLAGS for efi32 build - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - make PYTHON="python2" efi32 - make PYTHON="python2" efi32 installer - -} + # do not swallow efi compilation output to make debugging easier + sed 's|> /dev/null 2>&1||' -i efi/check-gnu-efi.sh -build() { - - cd "${srcdir}/${pkgname}-${pkgver}/" - - ## Build syslinux-efi - if [[ "${CARCH}" == "x86_64" ]]; then - _build_syslinux_efi64 - fi - - if [[ "${CARCH}" == "i686" ]]; then - _build_syslinux_efi32 - fi - - ## Build syslinux-bios - _build_syslinux_bios - + # disable debug and development flags to reduce bootloader size + truncate --size 0 mk/devel.mk } -_package_syslinux_bios() { - - cd "${srcdir}/${pkgname}-${pkgver}-bios/" - - ## Install Syslinux bios - make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/bios/" bios install - - ## Remove syslinux.exe,syslinux64.exe,syslinux.com and dosutil dir - rm "${pkgdir}/usr/lib/syslinux/bios"/syslinux.{com,exe} || true - rm "${pkgdir}/usr/lib/syslinux/bios/syslinux64.exe" || true - rm -rf "${pkgdir}/usr/lib/syslinux/bios/dosutil/" || true - - ## Remove com32 and diag dirs - rm -rf "${pkgdir}/usr/lib/syslinux/bios/diag/" || true - rm -rf "${pkgdir}/usr/lib/syslinux/bios/com32/" || true - - ## Move extlinux binary to /usr/bin - install -d "${pkgdir}/usr/bin" - mv "${pkgdir}/sbin/extlinux" "${pkgdir}/usr/bin/extlinux" - rm -rf "${pkgdir}/sbin/" - - ## Install docs - install -d "${pkgdir}/usr/share/doc" - cp -ar "${srcdir}/${pkgname}-${pkgver}/doc" "${pkgdir}/usr/share/doc/syslinux" - - ## Install the default configuration - install -D -m0644 "${srcdir}/syslinux.cfg" "${pkgdir}/boot/syslinux/syslinux.cfg" - - ## Install the installation and update script - ## This script is maintained at git://gist.github.com/772138.git - ## Script not yet updated for syslinux-efi - install -D -m0755 "${srcdir}/syslinux-install_update" "${pkgdir}/usr/bin/syslinux-install_update" - +build() { + cd syslinux + make PYTHON=python2 $_targets } -_package_syslinux_efi() { - - cd "${srcdir}/${pkgname}-${pkgver}/" - - if [[ "${CARCH}" == "x86_64" ]]; then - cd "${srcdir}/${pkgname}-${pkgver}-efi64/" - make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi64 install - fi - - if [[ "${CARCH}" == "i686" ]]; then - cd "${srcdir}/${pkgname}-${pkgver}-efi32/" - make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi32 install - fi - +check() { + cd syslinux + make unittest } package() { - - cd "${srcdir}/${pkgname}-${pkgver}/" - - _package_syslinux_efi - - _package_syslinux_bios - -} + cd syslinux + make $_targets install INSTALLROOT="$pkgdir" SBINDIR=/usr/bin MANDIR=/usr/share/man AUXDIR=/usr/lib/syslinux -md5sums=('6f275813a1b08cf852e55c0a3f8fbc78' - '46ca150f53322ff8f1597d9a342f7e40' - '9376f18fa3e42fc36cffa4cff0a84c09' - '9dbede6b71a4de9e46aac4aad65334d7' - 'adf71eceb4fccecd9a7efe1ab3d54918' - '62d22b101ef2ef53e25b4f86d9f41cb5') + rm -r "$pkgdir"/usr/lib/syslinux/{com32,dosutil,syslinux.com} + install -D -m644 COPYING "$pkgdir"/usr/share/licenses/syslinux/COPYING + install -d "$pkgdir"/usr/share/doc + cp -ar doc "$pkgdir"/usr/share/doc/syslinux + + install -d "$pkgdir"/usr/lib/syslinux/bios + mv "$pkgdir"/usr/lib/syslinux/{*.bin,*.c32,*.0,memdisk} "$pkgdir"/usr/lib/syslinux/bios + + install -D -m0644 ../syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg + install -D -m0755 ../syslinux-install_update "$pkgdir"/usr/bin/syslinux-install_update +} diff --git a/abs/extra/syslinux/syslinux-6.02-fix-bios-isolinux.patch b/abs/extra/syslinux/syslinux-6.02-fix-bios-isolinux.patch deleted file mode 100644 index 48df46f..0000000 --- a/abs/extra/syslinux/syslinux-6.02-fix-bios-isolinux.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/core/isolinux.asm b/core/isolinux.asm -index bd4e9556922d..c4db4133e274 100644 ---- a/core/isolinux.asm -+++ b/core/isolinux.asm -@@ -420,7 +420,7 @@ MaxLMA equ 384*1024 ; Reasonable limit (384K) - call getlinsec - pop eax - pop cx -- mov dx,cx -+ movzx edx,cx - pop bp - pop bx diff --git a/abs/extra/syslinux/syslinux-6.02-fix-chainloading.patch b/abs/extra/syslinux/syslinux-6.02-fix-chainloading.patch deleted file mode 100644 index 6fd7ef4..0000000 --- a/abs/extra/syslinux/syslinux-6.02-fix-chainloading.patch +++ /dev/null @@ -1,47 +0,0 @@ -Reported-by: Dark Raven <drdarkraven at gmail.com> -Signed-off-by: Raphael S. Carvalho <raphael.scarv at gmail.com> ---- - com32/lib/syslinux/disk.c | 22 ++++++++++++++-------- - 1 files changed, 14 insertions(+), 8 deletions(-) - -diff --git a/com32/lib/syslinux/disk.c b/com32/lib/syslinux/disk.c -index 0b0c737..47ecb52 100644 ---- a/com32/lib/syslinux/disk.c -+++ b/com32/lib/syslinux/disk.c -@@ -171,22 +171,28 @@ out: - static void *ebios_setup(const struct disk_info *const diskinfo, com32sys_t *inreg, - uint64_t lba, uint8_t count, uint8_t op_code) - { -- static __lowmem struct disk_ebios_dapa dapa; -+ static struct disk_ebios_dapa *dapa = NULL; - void *buf; - -+ if (!dapa) { -+ dapa = lmalloc(sizeof *dapa); -+ if (!dapa) -+ return NULL; -+ } -+ - buf = lmalloc(count * diskinfo->bps); - if (!buf) - return NULL; - -- dapa.len = sizeof(dapa); -- dapa.count = count; -- dapa.off = OFFS(buf); -- dapa.seg = SEG(buf); -- dapa.lba = lba; -+ dapa->len = sizeof(*dapa); -+ dapa->count = count; -+ dapa->off = OFFS(buf); -+ dapa->seg = SEG(buf); -+ dapa->lba = lba; - - inreg->eax.b[1] = op_code; -- inreg->esi.w[0] = OFFS(&dapa); -- inreg->ds = SEG(&dapa); -+ inreg->esi.w[0] = OFFS(dapa); -+ inreg->ds = SEG(dapa); - inreg->edx.b[0] = diskinfo->disk; - - return buf; diff --git a/abs/extra/syslinux/syslinux-6.02-fix-efi-ovmf.patch b/abs/extra/syslinux/syslinux-6.02-fix-efi-ovmf.patch deleted file mode 100644 index f33f4c1..0000000 --- a/abs/extra/syslinux/syslinux-6.02-fix-efi-ovmf.patch +++ /dev/null @@ -1,621 +0,0 @@ -The value of the field rva_and_sizes_nr is used by OVMF to check the -consistency of the PE file with respect to the field optional_hdr_sz. It -now have the right value. - -Signed-off-by: Celelibi <celelibi at gmail.com> ---- - efi/wrapper.c | 6 +++--- - efi/wrapper.h | 28 ++++++++++++++++------------ - 2 files changed, 19 insertions(+), 15 deletions(-) - -diff --git a/efi/wrapper.c b/efi/wrapper.c -index 04c895f..ec77271 100644 ---- a/efi/wrapper.c -+++ b/efi/wrapper.c -@@ -102,7 +102,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - e_hdr.image_sz = total_sz; - e_hdr.headers_sz = 512; - e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION; -- e_hdr.rva_and_sizes_nr = 1; -+ e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t); - fwrite(&e_hdr, sizeof(e_hdr), 1, f); - } - else if (class == ELFCLASS64) { -@@ -130,7 +130,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - e_hdr_pe32p.image_sz = total_sz; - e_hdr_pe32p.headers_sz = 512; - e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION; -- e_hdr_pe32p.rva_and_sizes_nr = 1; -+ e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t); - fwrite(&e_hdr_pe32p, sizeof(e_hdr_pe32p), 1, f); - } - -@@ -237,7 +237,7 @@ int main(int argc, char **argv) - fprintf(stderr, "Unsupported architecture\n"); - exit(EXIT_FAILURE); - } -- -+ - if (id[EI_MAG0] != ELFMAG0 || - id[EI_MAG1] != ELFMAG1 || - id[EI_MAG2] != ELFMAG2 || -diff --git a/efi/wrapper.h b/efi/wrapper.h -index 4f76991..0e6b38e 100644 ---- a/efi/wrapper.h -+++ b/efi/wrapper.h -@@ -102,12 +102,14 @@ struct extra_hdr { - __uint32_t heap_commit_sz; - __uint32_t loader_flags; - __uint32_t rva_and_sizes_nr; -- __uint64_t export_table; -- __uint64_t import_table; -- __uint64_t resource_table; -- __uint64_t exception_table; -- __uint64_t certification_table; -- __uint64_t base_relocation_table; -+ struct { -+ __uint64_t export_table; -+ __uint64_t import_table; -+ __uint64_t resource_table; -+ __uint64_t exception_table; -+ __uint64_t certification_table; -+ __uint64_t base_relocation_table; -+ } data_directory; - } __packed; - - /* Extra header for PE32+ format -@@ -136,12 +138,14 @@ struct extra_hdr_pe32p { - __uint64_t heap_commit_sz; - __uint32_t loader_flags; - __uint32_t rva_and_sizes_nr; -- __uint64_t export_table; -- __uint64_t import_table; -- __uint64_t resource_table; -- __uint64_t exception_table; -- __uint64_t certification_table; -- __uint64_t base_relocation_table; -+ struct { -+ __uint64_t export_table; -+ __uint64_t import_table; -+ __uint64_t resource_table; -+ __uint64_t exception_table; -+ __uint64_t certification_table; -+ __uint64_t base_relocation_table; -+ } data_directory; - } __packed; - - struct section { -In the generated PE file, the section header for the .text section used -to address more than the whole file. Starting at offset 0 (before the -end of the headers) is illegal and is rejected by OVMF. Giving a size -greater than the actual file size is also illegal and rejected. - -Moreover, the actual data inside the PE file have to be aligned to at -least 512 bytes. Hence, .text need to be aligned as well. - -Signed-off-by: Celelibi <celelibi at gmail.com> ---- - efi/wrapper.c | 44 +++++++++++++++++++++++++------------------- - 1 file changed, 25 insertions(+), 19 deletions(-) - -diff --git a/efi/wrapper.c b/efi/wrapper.c -index ec77271..bd2c175 100644 ---- a/efi/wrapper.c -+++ b/efi/wrapper.c -@@ -54,11 +54,15 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - struct coff_hdr c_hdr; - struct header hdr; - struct coff_reloc c_rel; -- __uint32_t total_sz = so_size; -+ __uint32_t total_sz = data_size; - __uint32_t dummy = 0; - __uint32_t hdr_sz; - __uint32_t reloc_start, reloc_end; - -+ hdr_sz = 512; -+ total_sz += hdr_sz; -+ entry += hdr_sz; -+ - memset(&hdr, 0, sizeof(hdr)); - hdr.msdos_signature = MSDOS_SIGNATURE; - -@@ -77,11 +81,6 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - c_hdr.nr_sections = 2; - c_hdr.nr_syms = 1; - if (class == ELFCLASS32) { -- hdr_sz = sizeof(o_hdr) + sizeof(t_sec) + sizeof(e_hdr) + -- sizeof(r_sec) + sizeof(c_hdr) + sizeof(hdr) + sizeof(c_rel) -- + sizeof(dummy); -- total_sz += hdr_sz; -- entry += hdr_sz; - c_hdr.arch = IMAGE_FILE_MACHINE_I386; - c_hdr.characteristics = IMAGE_FILE_32BIT_MACHINE | - IMAGE_FILE_DEBUG_STRIPPED | IMAGE_FILE_EXECUTABLE_IMAGE | -@@ -92,25 +91,20 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - o_hdr.format = PE32_FORMAT; - o_hdr.major_linker_version = 0x02; - o_hdr.minor_linker_version = 0x14; -- o_hdr.code_sz = total_sz; -+ o_hdr.code_sz = data_size; - o_hdr.entry_point = entry; - o_hdr.initialized_data_sz = data_size; - fwrite(&o_hdr, sizeof(o_hdr), 1, f); - memset(&e_hdr, 0, sizeof(e_hdr)); - e_hdr.section_align = 4096; - e_hdr.file_align = 512; -- e_hdr.image_sz = total_sz; -- e_hdr.headers_sz = 512; -+ e_hdr.image_sz = hdr_sz + so_size; -+ e_hdr.headers_sz = hdr_sz; - e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION; - e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t); - fwrite(&e_hdr, sizeof(e_hdr), 1, f); - } - else if (class == ELFCLASS64) { -- hdr_sz = sizeof(o_hdr_pe32p) + sizeof(t_sec) + sizeof(e_hdr_pe32p) + -- sizeof(r_sec) + sizeof(c_hdr) + sizeof(hdr) + sizeof(c_rel) -- + sizeof(dummy); -- total_sz += hdr_sz; -- entry += hdr_sz; - c_hdr.arch = IMAGE_FILE_MACHINE_X86_64; - c_hdr.characteristics = IMAGE_FILE_DEBUG_STRIPPED | IMAGE_FILE_EXECUTABLE_IMAGE | - IMAGE_FILE_LINE_NUMBERS_STRIPPED; -@@ -120,15 +114,15 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - o_hdr_pe32p.format = PE32P_FORMAT; - o_hdr_pe32p.major_linker_version = 0x02; - o_hdr_pe32p.minor_linker_version = 0x14; -- o_hdr_pe32p.code_sz = total_sz; -+ o_hdr_pe32p.code_sz = data_size; - o_hdr_pe32p.entry_point = entry; - o_hdr.initialized_data_sz = data_size; - fwrite(&o_hdr_pe32p, sizeof(o_hdr_pe32p), 1, f); - memset(&e_hdr_pe32p, 0, sizeof(e_hdr)); - e_hdr_pe32p.section_align = 4096; - e_hdr_pe32p.file_align = 512; -- e_hdr_pe32p.image_sz = total_sz; -- e_hdr_pe32p.headers_sz = 512; -+ e_hdr_pe32p.image_sz = hdr_sz + so_size; -+ e_hdr_pe32p.headers_sz = hdr_sz; - e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION; - e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t); - fwrite(&e_hdr_pe32p, sizeof(e_hdr_pe32p), 1, f); -@@ -136,8 +130,10 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - - memset(&t_sec, 0, sizeof(t_sec)); - strcpy((char *)t_sec.name, ".text"); -- t_sec.virtual_sz = total_sz; -- t_sec.raw_data_sz = total_sz; -+ t_sec.virtual_sz = data_size; -+ t_sec.virtual_address = hdr_sz; -+ t_sec.raw_data_sz = t_sec.virtual_sz; -+ t_sec.raw_data = t_sec.virtual_address; - t_sec.characteristics = IMAGE_SCN_CNT_CODE | - IMAGE_SCN_ALIGN_16BYTES | IMAGE_SCN_MEM_EXECUTE | - IMAGE_SCN_MEM_READ; -@@ -163,6 +159,16 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - fwrite(&c_rel, sizeof(c_rel), 1, f); - fwrite(&dummy, sizeof(dummy), 1, f); - -+ /* -+ * Add some padding to align the ELF as needed -+ */ -+ if (ftell(f) > t_sec.virtual_address) { -+ // A fseek that rewind would be a bug hard to track -+ fprintf(stderr, "PE+ headers are too large.\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ fseek(f, t_sec.virtual_address, SEEK_SET); - } - - static void usage(char *progname) -There is no need to have a relocation section that nothing points at. -The image is still seen as relocatable as long as the Characteristics of -the FileHeader do not say otherwise. - -Moreover, the field base_relocation_table wasn't initialized properly -leading to unpredictable bugs. - -Signed-off-by: Celelibi <celelibi at gmail.com> ---- - -I'm not 100% positive about the uselessness of the relocation section. However: -1) it works on my real hardware; -2) OVMF doesn't check the section headers at all; -3) all the docs I could find say that the section names are arbitrary; -4) the only way to make the relocation actually happen is by setting the -base_relocation_table field of the extra headers to point to this section; -5) The right way to indicate the image is not relocatable would be by setting -the characteristics IMAGE_FILE_RELOCS_STRIPPED in the coff header. - -Moreover, the relocation entry cannot be inserted before the end of the headers -(512 bytes), this mean we would have to push everything a few bytes further. -And I think it's better if it can be avoided. :) - - efi/wrapper.c | 28 +++------------------------- - 1 file changed, 3 insertions(+), 25 deletions(-) - -diff --git a/efi/wrapper.c b/efi/wrapper.c -index bd2c175..9652368 100644 ---- a/efi/wrapper.c -+++ b/efi/wrapper.c -@@ -48,14 +48,12 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - { - struct optional_hdr o_hdr; - struct optional_hdr_pe32p o_hdr_pe32p; -- struct section t_sec, r_sec; -+ struct section t_sec; - struct extra_hdr e_hdr; - struct extra_hdr_pe32p e_hdr_pe32p; - struct coff_hdr c_hdr; - struct header hdr; -- struct coff_reloc c_rel; - __uint32_t total_sz = data_size; -- __uint32_t dummy = 0; - __uint32_t hdr_sz; - __uint32_t reloc_start, reloc_end; - -@@ -78,7 +76,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - fwrite(&hdr, sizeof(hdr), 1, f); - - memset(&c_hdr, 0, sizeof(c_hdr)); -- c_hdr.nr_sections = 2; -+ c_hdr.nr_sections = 1; - c_hdr.nr_syms = 1; - if (class == ELFCLASS32) { - c_hdr.arch = IMAGE_FILE_MACHINE_I386; -@@ -118,7 +116,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - o_hdr_pe32p.entry_point = entry; - o_hdr.initialized_data_sz = data_size; - fwrite(&o_hdr_pe32p, sizeof(o_hdr_pe32p), 1, f); -- memset(&e_hdr_pe32p, 0, sizeof(e_hdr)); -+ memset(&e_hdr_pe32p, 0, sizeof(e_hdr_pe32p)); - e_hdr_pe32p.section_align = 4096; - e_hdr_pe32p.file_align = 512; - e_hdr_pe32p.image_sz = hdr_sz + so_size; -@@ -140,26 +138,6 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - fwrite(&t_sec, sizeof(t_sec), 1, f); - - /* -- * Write our dummy relocation and reloc section. -- */ -- memset(&r_sec, 0, sizeof(r_sec)); -- strcpy((char *)r_sec.name, ".reloc"); -- r_sec.virtual_sz = sizeof(c_rel); -- r_sec.virtual_address = ftell(f) + sizeof(r_sec); -- r_sec.raw_data_sz = r_sec.virtual_sz; -- r_sec.raw_data = r_sec.virtual_address; -- r_sec.characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | -- IMAGE_SCN_ALIGN_1BYTES | IMAGE_SCN_MEM_DISCARDABLE | -- IMAGE_SCN_MEM_READ; -- fwrite(&r_sec, sizeof(r_sec), 1, f); -- -- memset(&c_rel, 0, sizeof(c_rel)); -- c_rel.virtual_address = ftell(f) + sizeof(c_rel); -- c_rel.symtab_index = 10; -- fwrite(&c_rel, sizeof(c_rel), 1, f); -- fwrite(&dummy, sizeof(dummy), 1, f); -- -- /* - * Add some padding to align the ELF as needed - */ - if (ftell(f) > t_sec.virtual_address) { -PE headers code_sz and image_sz indicate more or less, the size of the -file and the size of the in-memory image. They are now given the right -value. - -In the ELF format, only the program headers are reliable to determine -the actually needed part of the file and the in-memory size. - -The .bss section should always be marked as NOLOAD for ld since its -content shouldn't be included into the binary file. - -Signed-off-by: Celelibi <celelibi at gmail.com> ---- - -Again, I'm not 100% positive about the semantics of NOLOAD in a linker script. -However I found this make things work better. -Actually the file core/fs/fs.o have a .bss16 section that is not empty. If I -understood correctly, only .bss can be empty in a .o. Thus ld generates the -zeros that belong to that section in the .o. Then, when merging the section -.bss16 into the .bss of syslinux.so, ld is forced to generate ALL the zeros -that belong to the .bss section. Marking this section as NOLOAD make ld to -ignore its content but still produce a PT_LOAD program header with the right -memory size, as needed for the bss. - - efi/i386/syslinux.ld | 4 +- - efi/wrapper.c | 138 +++++++++++++++---------------------------------- - efi/x86_64/syslinux.ld | 4 +- - 3 files changed, 45 insertions(+), 101 deletions(-) - -diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld -index 523a9b9..bab3fc7 100644 ---- a/efi/i386/syslinux.ld -+++ b/efi/i386/syslinux.ld -@@ -136,7 +136,7 @@ SECTIONS - *(.strtab) - } - -- .bss : { -+ .bss (NOLOAD) : { - /* the EFI loader doesn't seem to like a .bss section, - so we stick it all into .data: */ - __bss_start = .; -@@ -153,7 +153,7 @@ SECTIONS - __bss_dwords = (__bss_len + 3) >> 2; - - . = ALIGN(128); -- -+ - /* Very large objects which don't need to be zeroed */ - - .hugebss : { -diff --git a/efi/wrapper.c b/efi/wrapper.c -index 9652368..a5247ae 100644 ---- a/efi/wrapper.c -+++ b/efi/wrapper.c -@@ -35,7 +35,7 @@ typedef Elf64_Addr Elf_Addr; - #endif - - /* -- * 'so_size' is the file size of the ELF shared object. -+ * 'so_memsz' is the size of the ELF shared object once loaded. - * 'data_size' is the size of initialised data in the shared object. - * 'class' dictates how the header is written - * For 32bit machines (class == ELFCLASS32), the optional -@@ -44,7 +44,7 @@ typedef Elf64_Addr Elf_Addr; - * header includes PE32+header fields - */ - static void write_header(FILE *f, __uint32_t entry, size_t data_size, -- __uint32_t so_size, __uint8_t class) -+ __uint32_t so_memsz, __uint8_t class) - { - struct optional_hdr o_hdr; - struct optional_hdr_pe32p o_hdr_pe32p; -@@ -96,7 +96,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - memset(&e_hdr, 0, sizeof(e_hdr)); - e_hdr.section_align = 4096; - e_hdr.file_align = 512; -- e_hdr.image_sz = hdr_sz + so_size; -+ e_hdr.image_sz = hdr_sz + so_memsz; - e_hdr.headers_sz = hdr_sz; - e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION; - e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t); -@@ -119,7 +119,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size, - memset(&e_hdr_pe32p, 0, sizeof(e_hdr_pe32p)); - e_hdr_pe32p.section_align = 4096; - e_hdr_pe32p.file_align = 512; -- e_hdr_pe32p.image_sz = hdr_sz + so_size; -+ e_hdr_pe32p.image_sz = hdr_sz + so_memsz; - e_hdr_pe32p.headers_sz = hdr_sz; - e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION; - e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t); -@@ -157,17 +157,16 @@ static void usage(char *progname) - - int main(int argc, char **argv) - { -- struct stat st; - Elf32_Ehdr e32_hdr; - Elf64_Ehdr e64_hdr; - __uint32_t entry; - __uint8_t class; -- __uint64_t shoff; -- __uint16_t shnum, shentsize, shstrndx; -+ __uint64_t phoff = 0; -+ __uint16_t phnum = 0, phentsize = 0; - unsigned char *id; - FILE *f_in, *f_out; - void *buf; -- size_t datasz, rv; -+ size_t datasz, memsz, rv; - - if (argc < 3) { - usage(argv[0]); -@@ -180,11 +179,6 @@ int main(int argc, char **argv) - exit(EXIT_FAILURE); - } - -- if (stat(argv[1], &st) != 0) { -- perror("stat"); -- exit(EXIT_FAILURE); -- } -- - f_out = fopen(argv[2], "w"); - if (!f_out) { - perror("fopen"); -@@ -194,15 +188,14 @@ int main(int argc, char **argv) - /* - * Parse the ELF header and find the entry point. - */ -- fread((void *)&e32_hdr, sizeof(e32_hdr), 1, f_in); -+ fread((void *)&e32_hdr, sizeof(e32_hdr), 1, f_in); - if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS32) { - id = e32_hdr.e_ident; - class = ELFCLASS32; - entry = e32_hdr.e_entry; -- shoff = e32_hdr.e_shoff; -- shnum = e32_hdr.e_shnum; -- shstrndx = e32_hdr.e_shstrndx; -- shentsize = e32_hdr.e_shentsize; -+ phoff = e32_hdr.e_phoff; -+ phnum = e32_hdr.e_phnum; -+ phentsize = e32_hdr.e_phentsize; - } - else if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS64) { - /* read the header again for x86_64 -@@ -213,10 +206,9 @@ int main(int argc, char **argv) - fread((void *)&e64_hdr, sizeof(e64_hdr), 1, f_in); - id = e64_hdr.e_ident; - entry = e64_hdr.e_entry; -- shoff = e64_hdr.e_shoff; -- shnum = e64_hdr.e_shnum; -- shstrndx = e64_hdr.e_shstrndx; -- shentsize = e64_hdr.e_shentsize; -+ phoff = e64_hdr.e_phoff; -+ phnum = e64_hdr.e_phnum; -+ phentsize = e64_hdr.e_phentsize; - } else { - fprintf(stderr, "Unsupported architecture\n"); - exit(EXIT_FAILURE); -@@ -230,98 +222,47 @@ int main(int argc, char **argv) - exit(EXIT_FAILURE); - } - -- if (!shoff || !shnum || (shstrndx == SHN_UNDEF)) { -- fprintf(stderr, "Cannot find section table\n"); -+ if (!phoff || !phnum) { -+ fprintf(stderr, "Cannot find segment table\n"); - exit(EXIT_FAILURE); - } - - /* -- * Find the beginning of the .bss section. Everything preceding -- * it is copied verbatim to the output file. -+ * Find the LOAD program header. Everything in this segment -+ * is copied verbatim to the output file. -+ * Although there may be several LOAD program headers, only -+ * one is currently copied. - */ - if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS32) { -- const char *shstrtab, *name; -- Elf32_Shdr shdr; -+ Elf32_Phdr phdr; - int i; -- void *strtab; -- -- fseek(f_in, shoff, SEEK_SET); -- -- /* First find the strtab section */ -- fseek(f_in, shstrndx * shentsize, SEEK_CUR); -- fread(&shdr, sizeof(shdr), 1, f_in); - -- strtab = malloc(shdr.sh_size); -- if (!strtab) { -- fprintf(stderr, "Failed to malloc strtab\n"); -- exit(EXIT_FAILURE); -- } -- -- fseek(f_in, shdr.sh_offset, SEEK_SET); -- fread(strtab, shdr.sh_size, 1, f_in); -- -- /* Now search for the .bss section */ -- fseek(f_in, shoff, SEEK_SET); -- for (i = 0; i < shnum; i++) { -- rv = fread(&shdr, sizeof(shdr), 1, f_in); -- if (!rv) { -- fprintf(stderr, "Failed to read section table\n"); -- exit(EXIT_FAILURE); -- } -+ /* Find the first LOAD program header */ -+ for (i = 0; i < phnum; i++) { -+ fseek(f_in, phoff + i * phentsize, SEEK_SET); -+ fread(&phdr, sizeof(phdr), 1, f_in); - -- name = strtab + shdr.sh_name; -- if (!strcmp(name, ".bss")) -+ if (phdr.p_type == PT_LOAD) - break; - } - -- if (i == shnum) { -- fprintf(stderr, "Failed to find .bss section\n"); -- exit(EXIT_FAILURE); -- } -- -- datasz = shdr.sh_offset; -- } -- else if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS64) { -- const char *shstrtab, *name; -- Elf64_Shdr shdr; -+ datasz = phdr.p_filesz; -+ memsz = phdr.p_memsz; -+ } else if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS64) { -+ Elf64_Phdr phdr; - int i; -- void *strtab; -- -- fseek(f_in, shoff, SEEK_SET); - -- /* First find the strtab section */ -- fseek(f_in, shstrndx * shentsize, SEEK_CUR); -- fread(&shdr, sizeof(shdr), 1, f_in); -- -- strtab = malloc(shdr.sh_size); -- if (!strtab) { -- fprintf(stderr, "Failed to malloc strtab\n"); -- exit(EXIT_FAILURE); -- } -+ /* Find the first LOAD program header */ -+ for (i = 0; i < phnum; i++) { -+ fseek(f_in, phoff + i * phentsize, SEEK_SET); -+ fread(&phdr, sizeof(phdr), 1, f_in); - -- fseek(f_in, shdr.sh_offset, SEEK_SET); -- fread(strtab, shdr.sh_size, 1, f_in); -- -- /* Now search for the .bss section */ -- fseek(f_in, shoff, SEEK_SET); -- for (i = 0; i < shnum; i++) { -- rv = fread(&shdr, sizeof(shdr), 1, f_in); -- if (!rv) { -- fprintf(stderr, "Failed to read section table\n"); -- exit(EXIT_FAILURE); -- } -- -- name = strtab + shdr.sh_name; -- if (!strcmp(name, ".bss")) -+ if (phdr.p_type == PT_LOAD) - break; - } - -- if (i == shnum) { -- fprintf(stderr, "Failed to find .bss section\n"); -- exit(EXIT_FAILURE); -- } -- -- datasz = shdr.sh_offset; -+ datasz = phdr.p_filesz; -+ memsz = phdr.p_memsz; - } - - buf = malloc(datasz); -@@ -330,7 +271,7 @@ int main(int argc, char **argv) - exit(EXIT_FAILURE); - } - -- write_header(f_out, entry, datasz, st.st_size, class); -+ write_header(f_out, entry, datasz, memsz, class); - - /* Write out the entire ELF shared object */ - rewind(f_in); -@@ -341,5 +282,8 @@ int main(int argc, char **argv) - } - - fwrite(buf, datasz, rv, f_out); -+ free(buf); -+ fclose(f_out); -+ fclose(f_in); - return 0; - } -diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld -index 95160bd..450641c 100644 ---- a/efi/x86_64/syslinux.ld -+++ b/efi/x86_64/syslinux.ld -@@ -136,7 +136,7 @@ SECTIONS - *(.strtab) - } - -- .bss : { -+ .bss (NOLOAD) : { - /* the EFI loader doesn't seem to like a .bss section, - so we stick it all into .data: */ - __bss_start = .; -@@ -153,7 +153,7 @@ SECTIONS - __bss_dwords = (__bss_len + 3) >> 2; - - . = ALIGN(128); -- -+ - /* Very large objects which don't need to be zeroed */ - - .hugebss : { diff --git a/abs/extra/syslinux/syslinux-install_update b/abs/extra/syslinux/syslinux-install_update index 3843b5f..513d06b 100644 --- a/abs/extra/syslinux/syslinux-install_update +++ b/abs/extra/syslinux/syslinux-install_update @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash # # Syslinux Installer / Updater Script (for BIOS only) # Copyright (C) 2011-2013 Matthew Gyurgyik <pyther@pyther.net> @@ -449,5 +449,3 @@ if [[ $SET_ACTIVE ]] || [[ $MBR ]]; then fi exit 0 - -# vim: set et sw=4: diff --git a/abs/extra/syslinux/syslinux.cfg b/abs/extra/syslinux/syslinux.cfg index 2b77038..d7f69c2 100644 --- a/abs/extra/syslinux/syslinux.cfg +++ b/abs/extra/syslinux/syslinux.cfg @@ -19,13 +19,13 @@ # The wiki provides further configuration examples DEFAULT arch -PROMPT 0 # Set to 1 if you always want to display the boot: prompt +PROMPT 0 # Set to 1 if you always want to display the boot: prompt TIMEOUT 50 # You can create syslinux keymaps with the keytab-lilo tool #KBDMAP de.ktl # Menu Configuration -# Either menu.c32 or vesamenu32.c32 must be copied to /boot/syslinux +# Either menu.c32 or vesamenu32.c32 must be copied to /boot/syslinux UI menu.c32 #UI vesamenu.c32 diff --git a/abs/extra/syslinux/syslinux.install b/abs/extra/syslinux/syslinux.install index 4bb7f85..cbc4e9e 100644 --- a/abs/extra/syslinux/syslinux.install +++ b/abs/extra/syslinux/syslinux.install @@ -1,43 +1,32 @@ -post_install() { - +show_efi_msg() { cat << EOF -==> For setting up Syslinux BIOS using the syslinux-install_update script follow - https://wiki.archlinux.org/index.php/Syslinux#Automatic_Install -EOF - - ## Message specific to Syslinux 4.xx (or 5.xx) to 6.xx upgrade - if [ "$(vercmp $2 6.00)" -lt 0 ]; then - - cat << EOF +==> For setting up Syslinux EFI follow + https://wiki.archlinux.org/index.php/Syslinux#UEFI_Systems -==> If you are upgrading from Syslinux 4.xx or 5.xx, please re-install - (not update) Syslinux BIOS manually (not using the install script) once - by following https://wiki.archlinux.org/index.php/Syslinux#Manual_install +==> The syslinux-install_update script does not currently support EFI install -==> The install script may not properly upgrade Syslinux to 6.xx version EOF - - fi - +} + +show_bios_autoupdate_msg() { cat << EOF -==> For setting up Syslinux EFI follow - https://wiki.archlinux.org/index.php/Syslinux#UEFI_Systems +==> For setting up Syslinux BIOS using the syslinux-install_update script follow + https://wiki.archlinux.org/index.php/Syslinux#Automatic_Install +EOF +} -==> The syslinux-install_update script does not currently support EFI install +post_install() { + [ -f /boot/syslinux/SYSLINUX_AUTOUPDATE ] || show_bios_autoupdate_msg + [ -d /sys/firmware/efi ] && show_efi_msg -EOF - + true } post_upgrade() { - ## auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists /usr/bin/syslinux-install_update -s - + post_install - } - -# vim:set ts=2 sw=2 et: diff --git a/abs/extra/ucl/PKGBUILD b/abs/extra/ucl/PKGBUILD new file mode 100644 index 0000000..e58af96 --- /dev/null +++ b/abs/extra/ucl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id$ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> +# Contributor: arjan <arjan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=ucl +pkgver=1.03 +pkgrel=7 +pkgdesc="Portable lossless data compression library written in ANSI C" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.oberhumer.com/opensource/ucl/" +source=("http://www.oberhumer.com/opensource/$pkgname/download/$pkgname-$pkgver.tar.gz") +md5sums=('852bd691d8abc75b52053465846fba34') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --enable-shared --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/abs/extra/unrar/PKGBUILD b/abs/extra/unrar/PKGBUILD index f4ef1a1..68bd852 100644 --- a/abs/extra/unrar/PKGBUILD +++ b/abs/extra/unrar/PKGBUILD @@ -1,35 +1,37 @@ -# $Id: PKGBUILD 161802 2012-06-14 17:00:58Z giovanni $ +# $Id$ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: dorphell <dorphell@gmx.net> pkgbase=unrar pkgname=('unrar' 'libunrar') -pkgver=4.2.4 +pkgver=5.2.2 pkgrel=1 +epoch=1 arch=('i686' 'x86_64') url="http://www.rarlab.com/rar_add.htm" license=('custom') makedepends=('gcc-libs') source=("http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz" - 'unrar-4.2.1-soname.patch') -md5sums=('8ea9d1b4139474b282d76e627a2de3e4' - 'b9ec767da9a36f5ac38034c974e77758') + 'unrar-5.2.2-soname.patch') +md5sums=('69ef5af8442cbb7dfdebe298bfb9c61a' + 'cd9a5291db0379d73148872cf6e6d3ce') -build() { +prepare() { cd "${srcdir}/${pkgbase}" + patch -Np1 -i "${srcdir}/unrar-5.2.2-soname.patch" +} - patch -Np0 -i "${srcdir}/unrar-4.2.1-soname.patch" - +build() { + cd "${srcdir}/${pkgbase}" cp -a ${srcdir}/unrar ${srcdir}/libunrar - make -C "${srcdir}"/libunrar -f makefile.unix lib libversion=${pkgver} CXXFLAGS="-fPIC ${CXXFLAGS}" - make -f makefile.unix CXXFLAGS="-fPIC ${CXXFLAGS}" STRIP="true" + make -C "${srcdir}"/libunrar lib libversion=${pkgver} CXXFLAGS="-fPIC ${CXXFLAGS}" + make CXXFLAGS="-fPIC ${CXXFLAGS}" STRIP="true" } package_unrar() { pkgdesc="The RAR uncompression program" depends=('gcc-libs') cd "${srcdir}/${pkgbase}" - install -Dm755 unrar "${pkgdir}/usr/bin/unrar" # install license install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" @@ -39,10 +41,9 @@ package_libunrar() { pkgdesc="Library and header file for applications that use libunrar" depends=('gcc-libs') cd "${srcdir}/libunrar" - install -Dm755 libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.${pkgver}" install -Dm644 dll.hpp "${pkgdir}/usr/include/unrar/dll.hpp" - ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.4" + ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.5" ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so" # install license install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/abs/extra/unrar/unrar-4.2.1-soname.patch b/abs/extra/unrar/unrar-5.2.2-soname.patch index 83ebe96..24d250a 100644 --- a/abs/extra/unrar/unrar-4.2.1-soname.patch +++ b/abs/extra/unrar/unrar-5.2.2-soname.patch @@ -1,6 +1,6 @@ ---- makefile.unix 2012-02-23 10:23:14.000000000 +0100 -+++ makefile.unix 2012-05-05 12:58:13.000000000 +0200 -@@ -131,7 +131,7 @@ +--- a/makefile 2013-04-29 16:27:05.000000000 +0200 ++++ b/makefile 2013-10-01 22:07:29.611485989 +0200 +@@ -133,7 +133,7 @@ lib: CXXFLAGS+=$(LIBFLAGS) lib: clean $(OBJECTS) $(LIB_OBJ) @rm -f libunrar.so diff --git a/abs/extra/upx/PKGBUILD b/abs/extra/upx/PKGBUILD new file mode 100644 index 0000000..712920f --- /dev/null +++ b/abs/extra/upx/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: bekks <eduard.warkentin@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=upx +pkgver=3.91 +pkgrel=1 +pkgdesc='Ultimate executable compressor.' +arch=('i686' 'x86_64') +url='http://upx.sourceforge.net/' +license=('GPL') +depends=('zlib') +makedepends=('ucl') +source=("http://upx.sourceforge.net/download/${pkgname}-${pkgver}-src.tar.bz2" + 'http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2') +md5sums=('c6d0b3ea2ecb28cb8031d59a4b087a43' + '29d5ffd03a5a3e51aef6a74e9eafb759') + +build() { + cd "${pkgname}-${pkgver}-src" + make UPX_LZMA_VERSION=0x465 UPX_LZMADIR="${srcdir}" all +} + +package() { + cd "${pkgname}-${pkgver}-src" + + install -Dm0755 src/upx.out "${pkgdir}/usr/bin/upx" + install -Dm0644 doc/upx.1 "${pkgdir}/usr/share/man/man1/upx.1" +} diff --git a/abs/extra/vala/PKGBUILD b/abs/extra/vala/PKGBUILD index 3d0681d..ed48bef 100644 --- a/abs/extra/vala/PKGBUILD +++ b/abs/extra/vala/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162223 2012-06-23 20:04:12Z ibiru $ +# $Id$ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> pkgname=vala -pkgver=0.16.1 +pkgver=0.26.1 pkgrel=1 pkgdesc="Compiler for the GObject type system" arch=('i686' 'x86_64') @@ -11,9 +11,8 @@ url="http://live.gnome.org/Vala" license=('LGPL') depends=('glib2') makedepends=('libxslt') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8be28ff6347feecb391220ceb4e2209d32b697278e87ed7fc6c9fb1e9345e0d8') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b') build() { cd $pkgname-$pkgver diff --git a/abs/extra/valgrind/PKGBUILD b/abs/extra/valgrind/PKGBUILD index 1e65355..61c9997 100644 --- a/abs/extra/valgrind/PKGBUILD +++ b/abs/extra/valgrind/PKGBUILD @@ -3,32 +3,33 @@ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=valgrind -pkgver=3.9.0 +pkgver=3.10.0 pkgrel=1 -pkgdesc="A tool to help find memory-management problems in programs" -arch=('i686' 'x86_64') -license=('GPL') -url="http://valgrind.org/" -depends=('glibc>=2.18' 'glibc<2.19' 'perl') -makedepends=('gdb') +pkgdesc='A tool to help find memory-management problems in programs' +arch=(i686 x86_64) +license=(GPL) +url='http://valgrind.org/' +depends=('glibc>=2.20' 'glibc<2.21' 'perl') +makedepends=('gdb' 'openmpi') +optdepends=('openmpi: MPI support') options=('staticlibs' '!emptydirs') -source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0947de8112f946b9ce64764af7be6df2') +source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2 + valgrind-3.9.0-glibc-2.20.patch) +sha1sums=('aec0b8cd042ec36c8cce4f6027b98627ab202f26' + '2080c3d44de20857f18b03a93404a8f3d3721f7e') +prepare() { + cd $pkgname-$pkgver + patch -p1 -i "$srcdir"/valgrind-3.9.0-glibc-2.20.patch +} build() { - cd ${srcdir}/${pkgname}-${pkgver} - - if [[ ${CARCH} = "x86_64" ]]; then - ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit - else - ./configure --prefix=/usr --mandir=/usr/share/man - fi - + cd $pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man --with-mpicc=mpicc make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/abs/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch b/abs/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch deleted file mode 100644 index 9f471ad..0000000 --- a/abs/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur valgrind-3.8.1-orig/configure.in valgrind-3.8.1/configure.in ---- valgrind-3.8.1-orig/configure.in 2013-08-13 22:36:20.201676976 +1000 -+++ valgrind-3.8.1/configure.in 2013-08-13 22:38:18.402750093 +1000 -@@ -906,6 +906,20 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.17) -+ AC_MSG_RESULT(2.17 family) -+ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; -+ 2.18) -+ AC_MSG_RESULT(2.18 family) -+ AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - AC_MSG_RESULT(Darwin) - AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) -@@ -919,7 +933,7 @@ - - *) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.18]) - AC_MSG_ERROR([or Darwin libc]) - ;; - esac diff --git a/abs/extra/valgrind/valgrind-3.8.1-ptrace-build-fix.patch b/abs/extra/valgrind/valgrind-3.8.1-ptrace-build-fix.patch deleted file mode 100644 index 89af000..0000000 --- a/abs/extra/valgrind/valgrind-3.8.1-ptrace-build-fix.patch +++ /dev/null @@ -1,78 +0,0 @@ -Index: coregrind/vgdb.c -=================================================================== ---- coregrind/vgdb.c (revision 13470) -+++ coregrind/vgdb.c (revision 13471) -@@ -100,11 +100,10 @@ - - #if defined(PTRACEINVOKER) - #include <sys/user.h> - #if defined(VGO_linux) - # include <sys/prctl.h> --# include <linux/ptrace.h> - #endif - #endif - - - // Outputs information for the user about ptrace not working. - -Index: coregrind/vgdb.c -=================================================================== ---- coregrind/vgdb.c (revision 13481) -+++ coregrind/vgdb.c (revision 13482) -@@ -691,7 +691,7 @@ - // runtime check not yet done. - // 0 : PTRACE_GETREGS runtime check has failed. - // 1 : PTRACE_GETREGS defined and runtime check ok. --#ifdef PTRACE_GETREGS -+#ifdef HAVE_PTRACE_GETREGS - static int has_working_ptrace_getregs = -1; - #endif - -@@ -702,7 +702,7 @@ - Bool getregs (int pid, void *regs, long regs_bsz) - { - DEBUG(1, "getregs regs_bsz %ld\n", regs_bsz); --# ifdef PTRACE_GETREGS -+# ifdef HAVE_PTRACE_GETREGS - if (has_working_ptrace_getregs) { - // Platforms having GETREGS - long res; -@@ -773,7 +773,7 @@ - DEBUG(1, "setregs regs_bsz %ld\n", regs_bsz); - // Note : the below is checking for GETREGS, not SETREGS - // as if one is defined and working, the other one should also work. --# ifdef PTRACE_GETREGS -+# ifdef HAVE_PTRACE_GETREGS - if (has_working_ptrace_getregs) { - // Platforms having SETREGS - long res; -Index: configure.in -=================================================================== ---- configure.in (revision 13481) -+++ configure.in (revision 13482) -@@ -1040,6 +1040,25 @@ - - AM_CONDITIONAL([HAVE_GNU_STPNCPY], [test x$ac_have_gnu_stpncpy = xyes]) - -+# Check for PTRACE_GETREGS -+ -+AC_MSG_CHECKING([for PTRACE_GETREGS]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+#include <stddef.h> -+#include <sys/ptrace.h> -+#include <sys/user.h> -+]], [[ -+ void *p; -+ long res = ptrace (PTRACE_GETREGS, 0, p, p); -+]])], [ -+AC_MSG_RESULT([yes]) -+AC_DEFINE([HAVE_PTRACE_GETREGS], 1, -+ [Define to 1 if you have the `PTRACE_GETREGS' ptrace request.]) -+], [ -+AC_MSG_RESULT([no]) -+]) -+ -+ - # Check for CLOCK_MONOTONIC - - AC_MSG_CHECKING([for CLOCK_MONOTONIC]) diff --git a/abs/extra/valgrind/valgrind-3.8.1-xaddb.patch b/abs/extra/valgrind/valgrind-3.8.1-xaddb.patch deleted file mode 100644 index ca5a597..0000000 --- a/abs/extra/valgrind/valgrind-3.8.1-xaddb.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: priv/guest_amd64_toIR.c -=================================================================== ---- VEX/priv/guest_amd64_toIR.c (revision 2580) -+++ VEX/priv/guest_amd64_toIR.c (revision 2581) -@@ -20268,6 +20268,14 @@ - delta = dis_movx_E_G ( vbi, pfx, delta, 2, sz, True ); - return delta; - -+ case 0xC0: { /* XADD Gb,Eb */ -+ Bool decode_OK = False; -+ delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, 1, delta ); -+ if (!decode_OK) -+ goto decode_failure; -+ return delta; -+ } -+ - case 0xC1: { /* XADD Gv,Ev */ - Bool decode_OK = False; - delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, sz, delta ); -@@ -27143,14 +27151,6 @@ - - /* =-=-=-=-=-=-=-=-=- XADD -=-=-=-=-=-=-=-=-=-= */ - -- case 0xC0: { /* XADD Gb,Eb */ -- Bool decode_OK = False; -- delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, 1, delta ); -- if (!decode_OK) -- goto decode_failure; -- break; -- } -- - /* =-=-=-=-=-=-=-=-=- SGDT and SIDT =-=-=-=-=-=-=-=-=-=-= */ - - /* =-=-=-=-=-=-=-=-=- unimp2 =-=-=-=-=-=-=-=-=-=-= */ diff --git a/abs/extra/valgrind/valgrind-3.9.0-glibc-2.20.patch b/abs/extra/valgrind/valgrind-3.9.0-glibc-2.20.patch new file mode 100644 index 0000000..d9c622e --- /dev/null +++ b/abs/extra/valgrind/valgrind-3.9.0-glibc-2.20.patch @@ -0,0 +1,37 @@ +diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure +--- valgrind-3.9.0-orig/configure 2013-11-01 09:33:32.000000000 +1000 ++++ valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000 +@@ -6689,6 +6689,16 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.20) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.20 family" >&5 ++$as_echo "2.20 family" >&6; } ++ ++$as_echo "#define GLIBC_2_20 1" >>confdefs.h ++ ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + darwin) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 + $as_echo "Darwin" >&6; } +diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac +--- valgrind-3.9.0-orig/configure.ac 2013-11-01 09:28:16.000000000 +1000 ++++ valgrind-3.9.0/configure.ac 2014-02-08 09:27:38.870385366 +1000 +@@ -918,6 +918,13 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.20) ++ AC_MSG_RESULT(2.20 family) ++ AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + darwin) + AC_MSG_RESULT(Darwin) + AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) diff --git a/abs/extra/wayland/PKGBUILD b/abs/extra/wayland/PKGBUILD index 65d50f3..63bef97 100644 --- a/abs/extra/wayland/PKGBUILD +++ b/abs/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ # $Id$ # Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Sébastien Luttringer +# Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=wayland -pkgver=1.4.0 +pkgver=1.6.0 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('MIT') depends=('libffi' 'expat') makedepends=('doxygen') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('bc91befb8386ec5c1ff4f24ad8464c24a7496ae2') +sha1sums=('6183108a3bffb204c05b7f37b763b6278760572d') build() { cd $pkgname-$pkgver diff --git a/abs/extra/web-on-linhes/PKGBUILD b/abs/extra/web-on-linhes/PKGBUILD index 64afe1e..0d916bf 100644 --- a/abs/extra/web-on-linhes/PKGBUILD +++ b/abs/extra/web-on-linhes/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Cecil Watson<knoppmyth@gmail.com> pkgname=web-on-linhes -pkgver=1.00.0 -pkgrel=7 +pkgver=1.01.0 +pkgrel=1 pkgdesc="Added multiple websites with 10' UIs to Play Online Streams." arch=('i686' 'x86_64') license=('GPL2') @@ -19,5 +19,5 @@ package() { #add in file for gen_is.xml install -D -m0744 ${srcdir}/web-on-linhes_is.conf ${pkgdir}/etc/gen_is_xml.d/web-on-linhes_is.conf } -md5sums=('bf15498dcbdc3852aca9cccb0aacd913' - 'c342f02c88728b227f02018658d6ee53') +md5sums=('b04992d48e45411bdeed23e6aa9f95f7' + '926982798d1c1a8bfd45da8eef8a56f3') diff --git a/abs/extra/web-on-linhes/web-on-linhes.sh b/abs/extra/web-on-linhes/web-on-linhes.sh index 11098ba..7d9b99b 100644 --- a/abs/extra/web-on-linhes/web-on-linhes.sh +++ b/abs/extra/web-on-linhes/web-on-linhes.sh @@ -1,11 +1,13 @@ #!/bin/sh #Script to facilitate Web On LinHES #Runs irxevent -irxevent /home/mythtv/.mythtv/wol-lircrc & -#Stops xscreensaver from running. +irxevent /etc/wol-lircrc & +irxPID=$! +#Stops xscreensaver from running. stop_xss.sh & -#Launches chromium in full screen -chromium $@ +xssPID=$! +#Launches chrome in full screen +google-chrome --no-first-run --user-data-dir=/home/mythtv/.cache/google-chrome/Default/ --kiosk $@ #Once done, stops irxevent and stop_xss.sh -killall irxevent -killall stop_xss.sh +kill $irxPID +kill $xssPID diff --git a/abs/extra/web-on-linhes/web-on-linhes_is.conf b/abs/extra/web-on-linhes/web-on-linhes_is.conf index 0e9ff60..ec895be 100755 --- a/abs/extra/web-on-linhes/web-on-linhes_is.conf +++ b/abs/extra/web-on-linhes/web-on-linhes_is.conf @@ -1,48 +1,16 @@ <!--#WebOnTV--> <button> <type>STREAM</type> - <text>Google Spotlight</text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://www.google.com/tv/spotlight-gallery.html</action> - </button> - <!--#WebOnTV--> - - <!--#WebOnTV--> - <button> - <type>STREAM</type> - <text>Blip tv</text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://blip.tv/?skin=googletv</action> - </button> - <!--#WebOnTV--> - - <!--#WebOnTV--> - <button> - <type>STREAM</type> - <text>Chow</text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://www.chow.com/tv</action> - </button> - <!--#WebOnTV--> - - <!--#WebOnTV--> - <button> - <type>STREAM</type> - <text>Clicker TV</text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://tv.clicker.com/</action> - </button> - <!--#WebOnTV--> - - <!--#WebOnTV--> - <button> - <type>STREAM</type> - <text>Crackle</text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://www.crackle.com/gtv/</action> + <text>NetFlix</text> + <action>EXEC /usr/LH/bin/web-on-linhes.sh http://netflix.com/WiHome</action> </button> <!--#WebOnTV--> <!--#WebOnTV--> <button> <type>STREAM</type> - <text>Dailymotion</text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://iptv-app.dailymotion.com/dm-front-googletv/dojoroot/app/pages/webkit/index.jsp?&qlang=us</action> + <text>Google Spotlight</text> + <action>EXEC /usr/LH/bin/web-on-linhes.sh http://www.google.com/tv/spotlight-gallery.html</action> </button> <!--#WebOnTV--> @@ -50,39 +18,39 @@ <button> <type>STREAM</type> <text>Flixster</text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://www.flixster.com/tv/google</action> + <action>EXEC /usr/LH/bin/web-on-linhes.sh http://admin.flixster.com/googletv</action> </button> <!--#WebOnTV--> <!--#WebOnTV--> <button> <type>STREAM</type> - <text>Fraboom</text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://fraboom.com/google/tv/ </action> + <text>The Onion</text> + <action>EXEC /usr/LH/bin/web-on-linhes.sh http://www.theonion.com/video/googletv/</action> </button> <!--#WebOnTV--> <!--#WebOnTV--> <button> <type>STREAM</type> - <text>KQED</text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://kqed.tv/</action> + <text>The New York Times</text> + <action>EXEC /usr/LH/bin/web-on-linhes.sh http://www.nytimes.com/gtv/</action> </button> <!--#WebOnTV--> <!--#WebOnTV--> <button> <type>STREAM</type> - <text>Revision 3</text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://tv.revision3.com</action> + <text>NPR</text> + <action>EXEC /usr/LH/bin/web-on-linhes.sh http://www.npr.org/googletv/</action> </button> <!--#WebOnTV--> <!--#WebOnTV--> <button> <type>STREAM</type> - <text>The Onion</text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://www.theonion.com/video/googletv/</action> + <text>PBS Kids</text> + <action>EXEC /usr/LH/bin/web-on-linhes.sh http://pbskids.org/video/</action> </button> <!--#WebOnTV--> @@ -90,7 +58,7 @@ <button> <type>STREAM</type> <text>TuneIn </text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://tv.tunein.com/</action> + <action>EXEC /usr/LH/bin/web-on-linhes.sh http://tv.tunein.com/</action> </button> <!--#WebOnTV--> @@ -98,7 +66,7 @@ <button> <type>STREAM</type> <text>Vimeo</text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://www.vimeo.com/couchmode</action> + <action>EXEC /usr/LH/bin/web-on-linhes.sh http://www.vimeo.com/couchmode</action> </button> <!--#WebOnTV--> @@ -106,6 +74,6 @@ <button> <type>STREAM</type> <text>YouTube</text> - <action>EXEC /usr/LH/bin/web-on-linhes.sh --no-first-run --kiosk http://www.youtube.com/leanback</action> + <action>EXEC /usr/LH/bin/web-on-linhes.sh http://www.youtube.com/tv</action> </button> <!--#WebOnTV--> diff --git a/abs/extra/webkitgtk/PKGBUILD b/abs/extra/webkitgtk/PKGBUILD new file mode 100644 index 0000000..c0e836f --- /dev/null +++ b/abs/extra/webkitgtk/PKGBUILD @@ -0,0 +1,79 @@ +# $Id$ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgbase=webkitgtk +pkgname=(webkitgtk webkitgtk2) +pkgver=2.4.7 +pkgrel=1 +pkgdesc="GTK+ Web content engine library" +arch=(i686 x86_64) +url="http://webkitgtk.org/" +license=(custom) +depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gst-plugins-base-libs + libsecret libwebp harfbuzz-icu) +makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby) +optdepends=('gst-plugins-base: free media decoding' + 'gst-plugins-good: media decoding' + 'gst-libav: nonfree media decoding') +options=(!emptydirs) +source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz + fix-pretty-quotes.patch) +sha256sums=('f5cf26e39abf1d6b2d25f1398348fef6bbe6c03fb4f99e11c569091c05197d38' + '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') + +prepare() { + mkdir build-gtk{,2} path + + ln -s /usr/bin/python2 path/python + + cd $pkgbase-$pkgver + patch -Np0 -i ../fix-pretty-quotes.patch +} + +_build() ( + _ver="$1"; shift + cd build-${_ver} + + ../$pkgbase-$pkgver/configure --prefix=/usr \ + --libexecdir=/usr/lib/webkit${_ver} \ + --enable-introspection \ + --disable-webkit2 \ + --disable-gtk-doc \ + "$@" + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make all stamp-po +) + +build() { + PATH="$srcdir/path:$PATH" + + _build gtk + _build gtk2 --with-gtk=2.0 +} + +package_webkitgtk() { + depends+=(gtk3) + optdepends+=('gtk2: Netscape plugin support') + provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}") + conflicts=(webkitgtk3 libwebkit3) + replaces=(webkitgtk3 libwebkit3) + + make -C build-gtk -j1 DESTDIR="$pkgdir" install + install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \ + "$pkgdir/usr/share/licenses/webkitgtk/LICENSE" +} + +package_webkitgtk2() { + pkgdesc+=" for GTK2" + depends+=(gtk2) + provides=("libwebkit=${pkgver}") + conflicts=(libwebkit) + replaces=(libwebkit) + + make -C build-gtk2 -j1 DESTDIR="$pkgdir" install + install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \ + "$pkgdir/usr/share/licenses/webkitgtk2/LICENSE" +} diff --git a/abs/extra/webkitgtk/__changelog b/abs/extra/webkitgtk/__changelog new file mode 100644 index 0000000..fc5f669 --- /dev/null +++ b/abs/extra/webkitgtk/__changelog @@ -0,0 +1 @@ +PKGBUILD: change geoclue2 to geoclue diff --git a/abs/extra/webkitgtk/fix-pretty-quotes.patch b/abs/extra/webkitgtk/fix-pretty-quotes.patch new file mode 100644 index 0000000..fce4a8e --- /dev/null +++ b/abs/extra/webkitgtk/fix-pretty-quotes.patch @@ -0,0 +1,26 @@ +Pretty quotes in licence break Python stdin. + +https://bugs.webkit.org/show_bug.cgi?id=128971 + +--- Source/WebCore/xml/XMLViewer.css.orig 2014-01-23 16:49:58.000000000 +0000 ++++ Source/WebCore/xml/XMLViewer.css +@@ -14,7 +14,7 @@ + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS +- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. + * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +--- Source/WebCore/xml/XMLViewer.js.orig 2014-01-23 16:49:58.000000000 +0000 ++++ Source/WebCore/xml/XMLViewer.js +@@ -15,7 +15,7 @@ + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS +- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. + * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, diff --git a/abs/extra/webmin/PKGBUILD b/abs/extra/webmin/PKGBUILD index 5e0da7e..edce250 100644 --- a/abs/extra/webmin/PKGBUILD +++ b/abs/extra/webmin/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin -pkgver=1.700 +pkgver=1.730 pkgrel=1 pkgdesc="a web-based interface for system administration" arch=(i686 x86_64) @@ -196,6 +196,15 @@ package() { # make it only accessible by localhost echo 'allow=127.0.0.1 192.168. 172.16. 10.' >> "$pkgdir"/etc/webmin/miniserv.conf + # add don't fork so runit can manage it + echo 'nofork=1' >> "$pkgdir"/etc/webmin/miniserv.conf + + # change mysql start stop cmds + sed -i -e 's:start_cmd=/etc/rc.d/mysqld start:start_cmd=/usr/bin/sv start mysql:g' \ + -e 's:pass=foo:pass=mythtv:g' -e 's:login=root:login=mythtv:g' \ + -e 's:stop_cmd=/etc/rc.d/mysqld stop:stop_cmd=/usr/bin/sv stop mysql:g' \ + "$pkgdir"/etc/webmin/mysql/config + # install pacman menu cd "$srcdir"/webmin-pacman/config cp -rfp * "$pkgdir"/etc/webmin/pacman @@ -210,7 +219,7 @@ package() { # install license install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE } -md5sums=('e5261114a6a6ed10caf570d3239ed5b7' +md5sums=('a54d11c32372b8361da1ad363a2d3ad9' 'b0b3e3fb231a12e60165b6b4d604dcfa' 'bfebb75bb94029b48c46b7f1ba1aa811' 'fc29ecb6a5cd8c278abe054e60381095') diff --git a/abs/extra/webmin/__changelog b/abs/extra/webmin/__changelog index 9f14075..741481a 100644 --- a/abs/extra/webmin/__changelog +++ b/abs/extra/webmin/__changelog @@ -1,2 +1,4 @@ -PKGBUILD: Added private networks +PKGBUILD: Added private networks to miniserv.conf +PKGBUILD: Added nofork=1 to miniserv.conf PKGBUILD: Change OS name to LinHES +PKGBUILD: Change mysql start and stop and login and pass in mysql/config diff --git a/abs/extra/webmin/webmin.install b/abs/extra/webmin/webmin.install index efdd929..fc9fd44 100644 --- a/abs/extra/webmin/webmin.install +++ b/abs/extra/webmin/webmin.install @@ -10,7 +10,6 @@ Note: ==> It is not allowed to install 3rd party modules, or delete existing modules. ==> Please write your own PKGBUILDS for 3rd party modules and additional themes. Setup: -==> To make webmin start at boot time, add webmin to rc.conf daemons ==> Point your web browser to http://localhost:10000 to use webmin. ==> The access is restricted to localhost, if you want to connect from other locations ==> change /etc/webmin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip> diff --git a/abs/extra/wxgtk/PKGBUILD b/abs/extra/wxgtk/PKGBUILD index 62dfb90..da0cdab 100644 --- a/abs/extra/wxgtk/PKGBUILD +++ b/abs/extra/wxgtk/PKGBUILD @@ -1,37 +1,32 @@ -# $Id: PKGBUILD 148966 2012-02-05 11:58:12Z ibiru $ +# $Id$ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxgtk -pkgver=2.8.12.1 -pkgrel=3 +pkgver=3.0.2 +pkgrel=2 pkgdesc="GTK+ implementation of wxWidgets API for GUI" arch=('i686' 'x86_64') url="http://wxwidgets.org" license=('custom:wxWindows') -depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm') -makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa') -#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2) -source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) -sha1sums=('05688dc03d61631750f5904273122bb40a2115f5') +depends=('gtk2' 'gstreamer0.10-base' 'libsm') +makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu') +optdepends=('webkitgtk2: for webview support') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2) +sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800') build() { - cd "${srcdir}/wxPython-src-${pkgver}" -# cd "${srcdir}/wxGTK-${pkgver}" + cd wxWidgets-${pkgver} ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --disable-optimize --enable-mediactrl --with-regex=builtin \ + --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ --disable-precomp-headers make make -C locale allmo - cd contrib/src - make } package() { - cd "${srcdir}/wxPython-src-${pkgver}" -# cd "${srcdir}/wxGTK-${pkgver}" - make DESTDIR="${pkgdir}" install - cd contrib/src + cd wxWidgets-${pkgver} make DESTDIR="${pkgdir}" install - install -D -m644 ../../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/extra/xbmc/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch b/abs/extra/xbmc/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch new file mode 100644 index 0000000..f2fc11b --- /dev/null +++ b/abs/extra/xbmc/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch @@ -0,0 +1,41 @@ +From 4037c9fd07fbec1873549e71e0b1c2833a5a87db Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp <lars@opdenkamp.eu> +Date: Mon, 27 Oct 2014 14:42:30 +0100 +Subject: [PATCH 1/8] [CEC] fixed: don't try to stick a value > 255 in a byte + +--- + system/peripherals.xml | 2 +- + xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/system/peripherals.xml b/system/peripherals.xml +index 57af5d1..5fcff7c 100644 +--- a/system/peripherals.xml ++++ b/system/peripherals.xml +@@ -30,7 +30,7 @@ + <setting key="device_type" type="int" value="1" configurable="0" /> + <setting key="wake_devices_advanced" type="string" value="" configurable="0" /> + <setting key="standby_devices_advanced" type="string" value="" configurable="0" /> +- <setting key="double_tap_timeout_ms" type="int" min="0" value="2000" configurable="0" /> ++ <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" /> + </peripheral> + + <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec"> +diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +index 9907ba2..1d068dc 100644 +--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp ++++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +@@ -1347,8 +1347,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) + m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; + m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; + +- // double tap prevention timeout in ms +- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); ++ // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 ++ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50; + } + + void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) +-- +2.1.2 + diff --git a/abs/extra/xbmc/0002-CEC-bump-libCEC-to-2.2.0.patch b/abs/extra/xbmc/0002-CEC-bump-libCEC-to-2.2.0.patch new file mode 100644 index 0000000..e7aecd7 --- /dev/null +++ b/abs/extra/xbmc/0002-CEC-bump-libCEC-to-2.2.0.patch @@ -0,0 +1,39 @@ +From 6cd70921650dda8864a844033e36f1bea55d034b Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp <lars@opdenkamp.eu> +Date: Mon, 27 Oct 2014 12:29:09 +0100 +Subject: [PATCH 2/8] [CEC] bump libCEC to 2.2.0 + +--- + project/BuildDependencies/scripts/libcec_d.txt | 2 +- + tools/depends/target/libcec/Makefile | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/project/BuildDependencies/scripts/libcec_d.txt b/project/BuildDependencies/scripts/libcec_d.txt +index a126c74..3d0265e 100644 +--- a/project/BuildDependencies/scripts/libcec_d.txt ++++ b/project/BuildDependencies/scripts/libcec_d.txt +@@ -1,3 +1,3 @@ + ; filename source of the file + +-libcec-2.1.4.zip http://mirrors.xbmc.org/build-deps/win32/ ++libcec-2.2.0-win32.zip http://mirrors.xbmc.org/build-deps/win32/ +diff --git a/tools/depends/target/libcec/Makefile b/tools/depends/target/libcec/Makefile +index 16fec1b..6c72240 100644 +--- a/tools/depends/target/libcec/Makefile ++++ b/tools/depends/target/libcec/Makefile +@@ -3,9 +3,9 @@ DEPS= ../../Makefile.include Makefile + + # lib name, version + LIBNAME=libcec +-VERSION=2.1.4 +-SOURCE=$(LIBNAME)-$(VERSION)-2 +-ARCHIVE=$(SOURCE).tar.gz ++VERSION=2.2.0 ++SOURCE=$(LIBNAME)-$(VERSION) ++ARCHIVE=$(SOURCE)-3.tar.gz + + # configuration settings + CONFIGURE=./configure --prefix=$(PREFIX) --disable-rpi \ +-- +2.1.2 + diff --git a/abs/extra/xbmc/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch b/abs/extra/xbmc/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch new file mode 100644 index 0000000..e8f5837 --- /dev/null +++ b/abs/extra/xbmc/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch @@ -0,0 +1,26 @@ +From e59d7e028288464e6890141a830e4a83d4b9d065 Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp <lars@opdenkamp.eu> +Date: Mon, 27 Oct 2014 15:32:36 +0100 +Subject: [PATCH 3/8] [CEC] prevent bus rescan on a Pi, since the adapter + cannot be removed + +--- + xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp +index b02535a..4941ae6 100644 +--- a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp ++++ b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp +@@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceScan(PeripheralScanResults &results) + break; + case ADAPTERTYPE_RPI: + result.m_mappedBusType = PERIPHERAL_BUS_RPI; ++ /** the Pi's adapter cannot be removed, no need to rescan */ ++ m_bNeedsPolling = false; + break; + default: + break; +-- +2.1.2 + diff --git a/abs/extra/xbmc/0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch b/abs/extra/xbmc/0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch new file mode 100644 index 0000000..d4556ae --- /dev/null +++ b/abs/extra/xbmc/0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch @@ -0,0 +1,112 @@ +From 6544830d1a0b9810c2feb2fcb34df3f90b010d2f Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp <lars@opdenkamp.eu> +Date: Mon, 27 Oct 2014 21:01:00 +0100 +Subject: [PATCH 4/8] [CEC] fixed: don't return garbage from CEC related app + messenger methods see + https://github.com/xbmc/xbmc/commit/19d37944ca2a2ac2f3e71a40a94e9ea289d8f2db#commitcomment-8248480 + +--- + xbmc/Application.cpp | 14 ++++++++------ + xbmc/ApplicationMessenger.cpp | 20 +++++--------------- + xbmc/ApplicationMessenger.h | 4 ++-- + 3 files changed, 15 insertions(+), 23 deletions(-) + +diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp +index d5604dc..4d26183 100644 +--- a/xbmc/Application.cpp ++++ b/xbmc/Application.cpp +@@ -2351,16 +2351,18 @@ + + if (StringUtils::StartsWithNoCase(action.GetName(),"CECToggleState") || StringUtils::StartsWithNoCase(action.GetName(),"CECStandby")) + { +- bool ret = true; +- +- CLog::Log(LOGDEBUG, "%s: action %s [%d], toggling state of playing device", __FUNCTION__, action.GetName().c_str(), action.GetID()); + // do not wake up the screensaver right after switching off the playing device + if (StringUtils::StartsWithNoCase(action.GetName(),"CECToggleState")) +- ret = CApplicationMessenger::Get().CECToggleState(); ++ { ++ CLog::Log(LOGDEBUG, "%s: action %s [%d], toggling state of playing device", __FUNCTION__, action.GetName().c_str(), action.GetID()); ++ if (!CApplicationMessenger::Get().CECToggleState()) ++ return true; ++ } + else +- ret = CApplicationMessenger::Get().CECStandby(); +- if (!ret) /* display is switched off */ ++ { ++ CApplicationMessenger::Get().CECStandby(); + return true; ++ } + } + + ResetScreenSaver(); +diff --git a/xbmc/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp +index 1a59c5c..d228273 100644 +--- a/xbmc/ApplicationMessenger.cpp ++++ b/xbmc/ApplicationMessenger.cpp +@@ -843,12 +843,12 @@ void CApplicationMessenger::ProcessMessage(ThreadMessage *pMsg) + } + case TMSG_CECACTIVATESOURCE: + { +- *((bool*)pMsg->lpVoid) = g_peripherals.ToggleDeviceState(STATE_ACTIVATE_SOURCE); ++ g_peripherals.ToggleDeviceState(STATE_ACTIVATE_SOURCE); + break; + } + case TMSG_CECSTANDBY: + { +- *((bool*)pMsg->lpVoid) = g_peripherals.ToggleDeviceState(STATE_STANDBY); ++ g_peripherals.ToggleDeviceState(STATE_STANDBY); + break; + } + case TMSG_START_ANDROID_ACTIVITY: +@@ -1396,29 +1396,19 @@ bool CApplicationMessenger::CECToggleState() + + ThreadMessage tMsg = {TMSG_CECTOGGLESTATE}; + tMsg.lpVoid = (void*)&result; +- SendMessage(tMsg, false); ++ SendMessage(tMsg, true); + + return result; + } + +-bool CApplicationMessenger::CECActivateSource() ++void CApplicationMessenger::CECActivateSource() + { +- bool result; +- + ThreadMessage tMsg = {TMSG_CECACTIVATESOURCE}; +- tMsg.lpVoid = (void*)&result; + SendMessage(tMsg, false); +- +- return result; + } + +-bool CApplicationMessenger::CECStandby() ++void CApplicationMessenger::CECStandby() + { +- bool result; +- + ThreadMessage tMsg = {TMSG_CECSTANDBY}; +- tMsg.lpVoid = (void*)&result; + SendMessage(tMsg, false); +- +- return result; + } +diff --git a/xbmc/ApplicationMessenger.h b/xbmc/ApplicationMessenger.h +index 9013567..543e065 100644 +--- a/xbmc/ApplicationMessenger.h ++++ b/xbmc/ApplicationMessenger.h +@@ -219,8 +219,8 @@ public: + + void LoadProfile(unsigned int idx); + bool CECToggleState(); +- bool CECActivateSource(); +- bool CECStandby(); ++ void CECActivateSource(); ++ void CECStandby(); + + CStdString GetResponse(); + int SetResponse(CStdString response); +-- +2.1.2 + diff --git a/abs/extra/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch b/abs/extra/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch new file mode 100644 index 0000000..023257c --- /dev/null +++ b/abs/extra/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch @@ -0,0 +1,32 @@ +From 9f1e45a10860dd23239de35673643e9e0e4a74f8 Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp <lars@opdenkamp.eu> +Date: Tue, 28 Oct 2014 14:52:16 +0100 +Subject: [PATCH 5/8] [CEC] renamed the iDoubleTapTimeoutMs in the new libCEC + for clarity. does not change binary compatibility + +--- + xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +index 1d068dc..ad123d9 100644 +--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp ++++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +@@ -1347,8 +1347,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) + m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; + m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; + ++#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) + // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 +- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50; ++ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; ++#else ++ // backwards compatibility. will be removed once the next major release of libCEC is out ++ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); ++#endif + } + + void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) +-- +2.1.2 + diff --git a/abs/extra/xbmc/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch b/abs/extra/xbmc/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch new file mode 100644 index 0000000..cd53396 --- /dev/null +++ b/abs/extra/xbmc/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch @@ -0,0 +1,29 @@ +From fa01c108b60f74abb16992c1376bcca896093eac Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp <lars@opdenkamp.eu> +Date: Tue, 28 Oct 2014 16:08:00 +0100 +Subject: [PATCH 6/8] [CEC] fixed - don't use CEC_CLIENT_VERSION_CURRENT for + the client version, because it will lead to issues when XBMC is rebuilt after + a libCEC bump that changes something + +--- + xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +index ad123d9..015daef 100644 +--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp ++++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +@@ -1268,8 +1268,8 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu + + void CPeripheralCecAdapter::SetConfigurationFromSettings(void) + { +- // use the same client version as libCEC version +- m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT; ++ // client version matches the version of libCEC that we originally used the API from ++ m_configuration.clientVersion = CEC_CLIENT_VERSION_2_2_0; + + // device name 'XBMC' + snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str()); +-- +2.1.2 + diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD index ab30af1..1737aff 100644 --- a/abs/extra/xbmc/PKGBUILD +++ b/abs/extra/xbmc/PKGBUILD @@ -1,3 +1,4 @@ +# vim:set ts=2 sw=2 et: # $Id$ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -12,13 +13,13 @@ _prefix=/usr pkgname=xbmc pkgver=13.2 _codename=Gotham -pkgrel=6 +pkgrel=8 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" license=('GPL2') depends=( -'avahi' 'glu' 'hicolor-icon-theme' 'lame' 'libass' 'libbluray' 'libcdio' 'libmad' +'avahi' 'hicolor-icon-theme' 'glu' 'lame' 'libass' 'libbluray' 'libcdio' 'libmad' 'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libmysqlclient' 'libsamplerate' 'libssh' 'libva' 'libvdpau' 'libvorbis' 'libxrandr' 'libxslt' 'lzo' 'mesa' 'mesa-demos' 'python2' 'python2-pillow' 'rtmpdump' 'sdl_image' @@ -36,7 +37,6 @@ optdepends=( 'shairplay: AirPlay support' 'libcec: Pulse-Eight USB-CEC adapter support' 'polkit: power management' -'pulseaudio: for pulseaudio support' 'lirc: remote controller support' 'unrar: access compressed files without unpacking them' 'udisks: automount external drives' @@ -45,16 +45,26 @@ optdepends=( install="${pkgname}.install" source=( "xbmc-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" - "xbmc.sh" - "xbmc_lib.conf" + '0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch' + '0002-CEC-bump-libCEC-to-2.2.0.patch' + '0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch' + '0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch' + '0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch' + '0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch' + 'xbmc.sh' + 'xbmc_lib.conf' ) -#sha256sums=( -# 'acbf5dffa3034a3406240ee3cf81e721386cd383d23d056ddde1f769e050e585' -#) prepare() { cd "$srcdir/xbmc-$pkgver-$_codename" + patch -Np1 -i "$srcdir/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch" + patch -Np1 -i "$srcdir/0002-CEC-bump-libCEC-to-2.2.0.patch" + patch -Np1 -i "$srcdir/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch" + patch -Np1 -i "$srcdir/0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch" + patch -Np1 -i "$srcdir/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch" + patch -Np1 -i "$srcdir/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch" + find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" + sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl sed 's/python/python2/' -i tools/Linux/xbmc.sh.in @@ -126,7 +136,12 @@ package() { #add in xbmc_lib.conf install -D -m0744 ${srcdir}/xbmc_lib.conf ${pkgdir}/etc/gen_lib_xml.d/xbmc_lib.conf } -# vim:set ts=2 sw=2 et: md5sums=('d80153b2cc78b88966458ab136e9494f' + 'd00af955c000f285a230568004209117' + '6ee855d2cd6ada08b2c72b5c15d5ae76' + '3e810f451e58d5704cdd15b83552aa53' + '693869eb72d696c3457e795722e707c6' + 'b6346f66286195189e41839e9a23ef87' + '47b765e1d4299fac32bf92f108548d06' 'e48a3d87984669ef206e902bc8290ff9' '71176cb0e5aaa230d7c9634c37245bfb') diff --git a/abs/extra/xmltoman/PKGBUILD b/abs/extra/xmltoman/PKGBUILD new file mode 100644 index 0000000..030c79c --- /dev/null +++ b/abs/extra/xmltoman/PKGBUILD @@ -0,0 +1,23 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=xmltoman +pkgver=0.4 +pkgrel=2 +pkgdesc='Convert xml to man pages in groff format or html' +url='http://xmltoman.sourceforge.net/' +license=('GPL') +arch=('any') +depends=('perl-xml-parser') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}.tar.gz/${pkgname}-${pkgver}.tar.gz") +sha1sums=('151f75d78d1fa53bca25b94dc00e46a27fabfee8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make install PREFIX=/usr DESTDIR="${pkgdir}" +} diff --git a/abs/extra/xscreensaver/ChangeLog b/abs/extra/xscreensaver/ChangeLog deleted file mode 100644 index ea08818..0000000 --- a/abs/extra/xscreensaver/ChangeLog +++ /dev/null @@ -1,46 +0,0 @@ -2010-09-26 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.12-1 - * Upstream update - * Added libxxf86vm depends - -2010-05-17 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.11-1 - * Upstream update - -2009-10-17 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.10-2 - * Added support for electricsheep (close FS#16400) - -2009-09-09 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.10-1 - * Upstream update - -2009-09-03 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.09-1 - * Upstream update - -2009-01-02 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.08-1 - * Upstream update - -2008-08-11 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.07-1 - * Upstream update - -2008-07-18 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.06-1 - * Upstream update - -2008-03-02 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.05-1 - * Upstream update - * FHS man pages diff --git a/abs/extra/xscreensaver/LICENSE b/abs/extra/xscreensaver/LICENSE index 4f587b5..406467c 100644 --- a/abs/extra/xscreensaver/LICENSE +++ b/abs/extra/xscreensaver/LICENSE @@ -1,4 +1,5 @@ -/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski <jwz@jwz.org> +/* xscreensaver, Copyright (c) 1991-2013 Jamie Zawinski <jwz@jwz.org> + * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that diff --git a/abs/extra/xscreensaver/PKGBUILD b/abs/extra/xscreensaver/PKGBUILD index 9393774..abdddd0 100644 --- a/abs/extra/xscreensaver/PKGBUILD +++ b/abs/extra/xscreensaver/PKGBUILD @@ -1,31 +1,30 @@ -# $Id: PKGBUILD 163563 2012-07-16 01:29:27Z eric $ +# $Id$ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xscreensaver -pkgver=5.18 -pkgrel=3 +pkgver=5.32 +pkgrel=1 pkgdesc="Screen saver and locker for the X Window System" arch=('i686' 'x86_64') url="http://www.jwz.org/xscreensaver/" license=('BSD') -depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \ - 'perl-libwww' 'perl-http-message') -makedepends=('bc' 'libxpm' ) -optdepends=('gdm: for login manager support') +depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww') +makedepends=('bc' 'intltool' 'libxpm') +#optdepends=('gdm: for login manager support') backup=('etc/pam.d/xscreensaver') -source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \ - add-electricsheep.diff xscreensaver.pam LICENSE - xscreensaver-5.18-sonar-compile.patch) -sha1sums=('a9f66d3f5094d2c1ef46c1209730e7cb653f33a7' - '677496218b81a42d90bee400026e94dd87fb8ffb' - '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' - '4209ea586b204fd1d81c382a0522c654f9fd9134' - '95e1d74e0e5ff1a6600c8a9cd0a12d392b24a7b1') +source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz + xscreensaver-add-electricsheep.diff LICENSE) +sha1sums=('3131d45295b9a18a2901737c9b95f1c5434f53a6' + 'e8dc57b6471fb3867ee099304ac6bf628351cb98' + '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i "${srcdir}/add-electricsheep.diff" - patch -p1 -i "${srcdir}/xscreensaver-5.18-sonar-compile.patch" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \ --with-pam --with-login-manager --with-gtk --with-gl \ @@ -34,11 +33,11 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + install -d "${pkgdir}/etc/pam.d" make install_prefix="${pkgdir}" install install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver" chmod 755 "${pkgdir}/usr/bin/xscreensaver" echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop" - ls $pkgdir/usr/lib/xscreensaver > $startdir/xscreensavers + ls $pkgdir/usr/lib/xscreensaver > $startdir/xscreensavers } diff --git a/abs/extra/xscreensaver/__changelog b/abs/extra/xscreensaver/__changelog index ca14a40..317fa78 100644 --- a/abs/extra/xscreensaver/__changelog +++ b/abs/extra/xscreensaver/__changelog @@ -1,3 +1,3 @@ -print out list of screensavers to xscreensaver - ls $pkgdir/usr/lib/xscreensaver > $startdir/xscreensavers +PKGBUILD: print out list of screensavers to xscreensavers + ls $pkgdir/usr/lib/xscreensaver > $startdir/xscreensavers diff --git a/abs/extra/xscreensaver/add-electricsheep.diff b/abs/extra/xscreensaver/add-electricsheep.diff deleted file mode 100644 index 18b4dea..0000000 --- a/abs/extra/xscreensaver/add-electricsheep.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- driver/XScreenSaver.ad.in-orig 2009-10-17 02:19:06.000000000 -0400 -+++ driver/XScreenSaver.ad.in 2009-10-17 02:21:16.000000000 -0400 -@@ -347,7 +347,8 @@ - @GL_KLUDGE@ GL: rubikblocks -root \n\ - @GL_KLUDGE@ GL: companioncube -root \n\ - @GL_KLUDGE@ GL: hilbert -root \n\ --@GL_KLUDGE@ GL: tronbit -root \n -+@GL_KLUDGE@ GL: tronbit -root \n\ -+ electricsheep --root 1 \n - - - diff --git a/abs/extra/xscreensaver/xscreensaver-5.18-sonar-compile.patch b/abs/extra/xscreensaver/xscreensaver-5.18-sonar-compile.patch deleted file mode 100644 index e0adde0..0000000 --- a/abs/extra/xscreensaver/xscreensaver-5.18-sonar-compile.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xscreensaver-5.18/hacks/glx/sonar-icmp.c.compile 2012-07-03 04:18:53.000000000 +0900 -+++ xscreensaver-5.18/hacks/glx/sonar-icmp.c 2012-07-04 09:17:12.580996448 +0900 -@@ -591,7 +591,9 @@ - fprintf (stderr, "%s: if: %4s: %s\n", progname, - ifa->ifa_name, - (ifa->ifa_addr->sa_family == AF_UNIX ? "local" : -+#ifdef AF_LINK - ifa->ifa_addr->sa_family == AF_LINK ? "link" : -+#endif - ifa->ifa_addr->sa_family == AF_INET6 ? "ipv6" : - "other")); - continue; diff --git a/abs/extra/xscreensaver/xscreensaver-add-electricsheep.diff b/abs/extra/xscreensaver/xscreensaver-add-electricsheep.diff new file mode 100644 index 0000000..0c5c3ff --- /dev/null +++ b/abs/extra/xscreensaver/xscreensaver-add-electricsheep.diff @@ -0,0 +1,10 @@ +--- driver/XScreenSaver.ad.in-orig 2013-07-16 16:47:10.183068023 -0400 ++++ driver/XScreenSaver.ad.in 2013-07-16 16:48:23.293473297 -0400 +@@ -157,6 +157,7 @@ + ! + *programs: \ + maze -root \n\ ++ electricsheep --root 1 \n\ + @GL_KLUDGE@ GL: superquadrics -root \n\ + attraction -root \n\ + blitspin -root \n\ diff --git a/abs/extra/xscreensaver/xscreensaver.pam b/abs/extra/xscreensaver/xscreensaver.pam deleted file mode 100644 index b4d80c2..0000000 --- a/abs/extra/xscreensaver/xscreensaver.pam +++ /dev/null @@ -1 +0,0 @@ -auth required pam_unix_auth.so diff --git a/abs/extra/xscreensaver/xscreensavers b/abs/extra/xscreensaver/xscreensavers index b3d17e0..46e7c93 100644 --- a/abs/extra/xscreensaver/xscreensavers +++ b/abs/extra/xscreensaver/xscreensavers @@ -10,6 +10,7 @@ atlantis attraction atunnel barcode +binaryring blaster blinkbox blitspin @@ -28,6 +29,7 @@ carousel ccurve celtic circuit +cityflow cloudlife companioncube compass @@ -68,6 +70,8 @@ fontglide fuzzyflakes galaxy gears +geodesic +geodesicgears gflux glblur glcells @@ -86,6 +90,7 @@ greynetic halftone halo helix +hexadrop hilbert hopalong hypertorus @@ -100,6 +105,7 @@ jigsaw juggler3d julia kaleidescope +kaleidocycle klein kumppa lament @@ -140,10 +146,12 @@ polyominoes polytopes pong popsquares +projectiveplane providence pulsar pyro qix +quasicrystal queens rd-bomb ripples @@ -175,6 +183,7 @@ superquadrics surfaces swirl tangram +tessellimage thornbird timetunnel topblock @@ -182,6 +191,7 @@ triangle tronbit truchet twang +unknownpleasures vermiculate vidwhacker voronoi @@ -189,6 +199,7 @@ wander webcollage webcollage-helper whirlwindwarp +winduprobot wormhole xanalogtv xflame diff --git a/abs/extra/zip/PKGBUILD b/abs/extra/zip/PKGBUILD index dca1103..2182077 100644 --- a/abs/extra/zip/PKGBUILD +++ b/abs/extra/zip/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 149604 2012-02-08 19:38:19Z pierre $ -# Maintainer: +# $Id$ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=zip pkgver=3.0 -_pkgver=30 -pkgrel=3 -pkgdesc="Creates PKZIP-compatible .zip files" +_pkgver=${pkgver/./} +pkgrel=4 +pkgdesc='Compressor/archiver for creating and modifying zipfiles' +url='http://www.info-zip.org/Zip.html' arch=('i686' 'x86_64') -url="http://www.info-zip.org/Zip.html" -license=('BSD') +license=('custom') depends=('bzip2') +source=("http://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz") +sha1sums=('c9f4099ecf2772b53c2dd4a8e508064ce015d182') + options=('!makeflags') -source=("ftp://ftp.info-zip.org/pub/infozip/src/${pkgname}${_pkgver}.zip") -md5sums=('e88492c8abd68fa9cfba72bc08757dba') build() { - cd "${srcdir}/${pkgname}${_pkgver}" - make -f unix/Makefile LOCAL_ZIP="$CFLAGS" prefix=/usr generic_gcc + cd "${srcdir}/${pkgname}${_pkgver}" + make -f unix/Makefile prefix=/usr \ + LOCAL_ZIP="$CFLAGS $CPPFLAGS $LDFLAGS" \ + generic_gcc } package() { - cd "${srcdir}/${pkgname}${_pkgver}" - make -f unix/Makefile INSTALL=/bin/install prefix=${pkgdir}/usr \ - MANDIR=${pkgdir}/usr/share/man/man1 install - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + cd "${srcdir}/${pkgname}${_pkgver}" + make -f unix/Makefile prefix="${pkgdir}"/usr \ + MANDIR=${pkgdir}/usr/share/man/man1 \ + install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/not_built/core/perl_modules/perl-proc-processtable/PKGBUILD b/abs/not_built/core/perl_modules/perl-proc-processtable/PKGBUILD deleted file mode 100644 index 51ee46b..0000000 --- a/abs/not_built/core/perl_modules/perl-proc-processtable/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: yugrotavele <yugrotavele at archlinux dot us> - -pkgname=perl-proc-processtable -pkgver=0.45 -pkgrel=2 -pkgdesc="Provides a consistent interface to process table information." -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Proc-ProcessTable/" -license=('PerlArtistic') -depends=('perl') -provides=('perl-proc-killall=1.0.0' 'perl-proc-killfam=1.0.0' 'perl-proc-processtable-process=0.20.0') -options=(!emptydirs) -source=("http://search.cpan.org/CPAN/authors/id/D/DU/DURIST/Proc-ProcessTable-$pkgver.tar.gz") -md5sums=('4481495d639c314f57e6d9d25f23c88e') - -build() { - cd $srcdir/Proc-ProcessTable-$pkgver - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd $srcdir/Proc-ProcessTable-$pkgver - - make install DESTDIR="${pkgdir}" - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete -} - diff --git a/abs/not_built/extra/icon-naming-utils/PKGBUILD b/abs/not_built/extra/icon-naming-utils/PKGBUILD deleted file mode 100644 index 5496c29..0000000 --- a/abs/not_built/extra/icon-naming-utils/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 33029 2009-04-03 21:35:27Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=icon-naming-utils -pkgver=0.8.90 -pkgrel=2 -pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops." -arch=('i686' 'x86_64') -license=('GPL') -url="http://tango.freedesktop.org/" -depends=('perl-xml-simple') -source=(http://tango.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2) -md5sums=('dd8108b56130b9eedc4042df634efa66') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/icon-naming-utils \ - --localstatedir=/var || return 1 - make || return 1 -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - mv "${pkgdir}/usr/share/pkgconfig" "${pkgdir}/usr/lib/pkgconfig" || return 1 -} - |
