Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Next round of X.org libraries: libICE libSM libXext libXfixes libXi #2265

Merged
merged 5 commits into from
Jan 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions recipes/xorg-libice/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
:: Trailing semicolon in this variable as set by current (2017/01)
:: conda-build breaks us. Manual fix:
set "MSYS2_ARG_CONV_EXCL=/AI;/AL;/OUT;/out"
:: Delegate to the Unixy script. We need to translate the key path variables
:: to be Unix-y rather than Windows-y, though.
set "saved_recipe_dir=%RECIPE_DIR%"
FOR /F "delims=" %%i IN ('cygpath.exe -u -p "%PATH%"') DO set "PATH_OVERRIDE=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%PREFIX%"') DO set "PREFIX=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%PYTHON%"') DO set "PYTHON=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%RECIPE_DIR%"') DO set "RECIPE_DIR=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%SP_DIR%"') DO set "SP_DIR=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%SRC_DIR%"') DO set "SRC_DIR=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%STDLIB_DIR%"') DO set "STDLIB_DIR=%%i"
bash -x %saved_recipe_dir%\build.sh
if errorlevel 1 exit 1
32 changes: 32 additions & 0 deletions recipes/xorg-libice/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#! /bin/bash

set -e
IFS=$' \t\n' # workaround for conda 4.2.13+toolchain bug

# Adopt a Unix-friendly path if we're on Windows (see bld.bat).
[ -n "$PATH_OVERRIDE" ] && export PATH="$PATH_OVERRIDE"

# Fresh OS-guessing scripts from xorg-util-macros for win64
for f in config.guess config.sub ; do
cp -p $PREFIX/share/util-macros/$f .
done

export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig:$PREFIX/share/pkgconfig
configure_args=(
--prefix=$PREFIX
--disable-dependency-tracking
--disable-selective-werror
--disable-silent-rules
)

# Unix domain sockets aren't gonna work on Windows
if [ -n "$VS_MAJOR" ] ; then
configure_args+=(--disable-unix-transport)
fi

./configure "${configure_args[@]}"
make -j$CPU_COUNT
make install
make check
rm -rf $PREFIX/share/doc/${PKG_NAME#xorg-}
rm -f $PREFIX/lib/libICE.a $PREFIX/lib/libICE.la
61 changes: 61 additions & 0 deletions recipes/xorg-libice/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{% set xorg_name = "libICE" %}
{% set xorg_category = "lib" %}
{% set name = "xorg-" ~ xorg_name %}
{% set version = "1.0.9" %}
{% set sha256 = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202" %}

package:
name: {{ name|lower }}
version: {{ version }}

source:
fn: {{ name }}-{{ version }}.tar.bz2
url: https://www.x.org/releases/individual/{{ xorg_category }}/{{ xorg_name }}-{{ version }}.tar.bz2
sha256: {{ sha256 }}
patches:
- time.patch

build:
number: 0
detect_binary_files_with_prefix: true
features:
- vc9 # [win and py27]
- vc10 # [win and py34]
- vc14 # [win and py35]

requirements:
build:
- m2w64-pkg-config # [win]
- m2w64-toolchain # [win]
- pkg-config # [not win]
- posix # [win]
- python # [win]
- toolchain
- vc 9 # [win and py27]
- vc 10 # [win and py34]
- vc 14 # [win and py35]
- xorg-kbproto # [win]
- xorg-libx11 # [win]
- xorg-util-macros
- xorg-xproto
- xorg-xtrans
run:
- vc 9 # [win and py27]
- vc 10 # [win and py34]
- vc 14 # [win and py35]

test:
commands:
- conda inspect linkages -p $PREFIX $PKG_NAME # [not win]
- conda inspect objects -p $PREFIX $PKG_NAME # [osx]

about:
home: https://www.x.org/
license: MIT
license_family: MIT
license_file: COPYING
summary: 'The X.org Inter-Client Exchange library.'

extra:
recipe-maintainers:
- pkgw
12 changes: 12 additions & 0 deletions recipes/xorg-libice/time.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- src/iceauth.c.orig 2017-01-24 12:13:27.623168870 -0500
+++ src/iceauth.c 2017-01-24 12:13:57.329261401 -0500
@@ -76,8 +76,7 @@
}
#else
{
- long time ();
- ldata[0] = time ((long *) 0);
+ ldata[0] = time (NULL);
ldata[1] = getpid ();
}
#endif
15 changes: 15 additions & 0 deletions recipes/xorg-libsm/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
:: Trailing semicolon in this variable as set by current (2017/01)
:: conda-build breaks us. Manual fix:
set "MSYS2_ARG_CONV_EXCL=/AI;/AL;/OUT;/out"
:: Delegate to the Unixy script. We need to translate the key path variables
:: to be Unix-y rather than Windows-y, though.
set "saved_recipe_dir=%RECIPE_DIR%"
FOR /F "delims=" %%i IN ('cygpath.exe -u -p "%PATH%"') DO set "PATH_OVERRIDE=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%PREFIX%"') DO set "PREFIX=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%PYTHON%"') DO set "PYTHON=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%RECIPE_DIR%"') DO set "RECIPE_DIR=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%SP_DIR%"') DO set "SP_DIR=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%SRC_DIR%"') DO set "SRC_DIR=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%STDLIB_DIR%"') DO set "STDLIB_DIR=%%i"
bash -x %saved_recipe_dir%\build.sh
if errorlevel 1 exit 1
32 changes: 32 additions & 0 deletions recipes/xorg-libsm/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#! /bin/bash

set -e
IFS=$' \t\n' # workaround for conda 4.2.13+toolchain bug

# Adopt a Unix-friendly path if we're on Windows (see bld.bat).
[ -n "$PATH_OVERRIDE" ] && export PATH="$PATH_OVERRIDE"

# Fresh OS-guessing scripts from xorg-util-macros for win64
for f in config.guess config.sub ; do
cp -p $PREFIX/share/util-macros/$f .
done

export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig:$PREFIX/share/pkgconfig
configure_args=(
--prefix=$PREFIX
--disable-dependency-tracking
--disable-selective-werror
--disable-silent-rules
)

# Unix domain sockets aren't gonna work on Windows
if [ -n "$VS_MAJOR" ] ; then
configure_args+=(--disable-unix-transport)
fi

./configure "${configure_args[@]}"
make -j$CPU_COUNT
make install
make check
rm -rf $PREFIX/share/doc/${PKG_NAME#xorg-}
rm -f $PREFIX/lib/libSM.a $PREFIX/lib/libSM.la
61 changes: 61 additions & 0 deletions recipes/xorg-libsm/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{% set xorg_name = "libSM" %}
{% set xorg_category = "lib" %}
{% set name = "xorg-" ~ xorg_name %}
{% set version = "1.2.2" %}
{% set sha256 = "0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd" %}

package:
name: {{ name|lower }}
version: {{ version }}

source:
fn: {{ name }}-{{ version }}.tar.bz2
url: https://www.x.org/releases/individual/{{ xorg_category }}/{{ xorg_name }}-{{ version }}.tar.bz2
sha256: {{ sha256 }}

build:
number: 0
detect_binary_files_with_prefix: true
features:
- vc9 # [win and py27]
- vc10 # [win and py34]
- vc14 # [win and py35]

requirements:
build:
- libuuid 1.0.* # [not win]
- m2w64-pkg-config # [win]
- m2w64-toolchain # [win]
- pkg-config # [not win]
- posix # [win]
- python # [win]
- toolchain
- vc 9 # [win and py27]
- vc 10 # [win and py34]
- vc 14 # [win and py35]
- xorg-util-macros
- xorg-xproto
- xorg-xtrans
- xorg-libice 1.0.*
run:
- libuuid 1.0.* # [not win]
- vc 9 # [win and py27]
- vc 10 # [win and py34]
- vc 14 # [win and py35]
- xorg-libice 1.0.*

test:
commands:
- conda inspect linkages -p $PREFIX $PKG_NAME # [not win]
- conda inspect objects -p $PREFIX $PKG_NAME # [osx]

about:
home: https://www.x.org/
license: MIT
license_family: MIT
license_file: COPYING
summary: 'The X.org core session management library.'

extra:
recipe-maintainers:
- pkgw
15 changes: 15 additions & 0 deletions recipes/xorg-libxext/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
:: Trailing semicolon in this variable as set by current (2017/01)
:: conda-build breaks us. Manual fix:
set "MSYS2_ARG_CONV_EXCL=/AI;/AL;/OUT;/out"
:: Delegate to the Unixy script. We need to translate the key path variables
:: to be Unix-y rather than Windows-y, though.
set "saved_recipe_dir=%RECIPE_DIR%"
FOR /F "delims=" %%i IN ('cygpath.exe -u -p "%PATH%"') DO set "PATH_OVERRIDE=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%PREFIX%"') DO set "PREFIX=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%PYTHON%"') DO set "PYTHON=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%RECIPE_DIR%"') DO set "RECIPE_DIR=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%SP_DIR%"') DO set "SP_DIR=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%SRC_DIR%"') DO set "SRC_DIR=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%STDLIB_DIR%"') DO set "STDLIB_DIR=%%i"
bash -x %saved_recipe_dir%\build.sh
if errorlevel 1 exit 1
27 changes: 27 additions & 0 deletions recipes/xorg-libxext/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#! /bin/bash

set -e
IFS=$' \t\n' # workaround for conda 4.2.13+toolchain bug

# Adopt a Unix-friendly path if we're on Windows (see bld.bat).
[ -n "$PATH_OVERRIDE" ] && export PATH="$PATH_OVERRIDE"

# Fresh OS-guessing scripts from xorg-util-macros for win64
for f in config.guess config.sub ; do
cp -p $PREFIX/share/util-macros/$f .
done

export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig:$PREFIX/share/pkgconfig
configure_args=(
--prefix=$PREFIX
--disable-dependency-tracking
--disable-selective-werror
--disable-silent-rules
)

./configure "${configure_args[@]}"
make -j$CPU_COUNT
make install
make check
rm -rf $PREFIX/share/doc/${PKG_NAME#xorg-}
rm -f $PREFIX/lib/libXext.a $PREFIX/lib/libXext.la
61 changes: 61 additions & 0 deletions recipes/xorg-libxext/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{% set xorg_name = "libXext" %}
{% set xorg_category = "lib" %}
{% set name = "xorg-" ~ xorg_name %}
{% set version = "1.3.3" %}
{% set sha256 = "b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35" %}

package:
name: {{ name|lower }}
version: {{ version }}

source:
fn: {{ name }}-{{ version }}.tar.bz2
url: https://www.x.org/releases/individual/{{ xorg_category }}/{{ xorg_name }}-{{ version }}.tar.bz2
sha256: {{ sha256 }}

build:
number: 0
detect_binary_files_with_prefix: true
features:
- vc9 # [win and py27]
- vc10 # [win and py34]
- vc14 # [win and py35]

requirements:
build:
- m2w64-pkg-config # [win]
- m2w64-toolchain # [win]
- pkg-config # [not win]
- posix # [win]
- python # [win]
- toolchain
- vc 9 # [win and py27]
- vc 10 # [win and py34]
- vc 14 # [win and py35]
- xorg-kbproto
- xorg-libx11 1.6.*
- xorg-util-macros
- xorg-xextproto
- xorg-xproto
run:
- vc 9 # [win and py27]
- vc 10 # [win and py34]
- vc 14 # [win and py35]
- xorg-libx11 1.6.*
- xorg-xextproto

test:
commands:
- conda inspect linkages -p $PREFIX $PKG_NAME # [not win]
- conda inspect objects -p $PREFIX $PKG_NAME # [osx]

about:
home: https://www.x.org/
license: MIT
license_family: MIT
license_file: COPYING
summary: 'The X.org extensions library.'

extra:
recipe-maintainers:
- pkgw
15 changes: 15 additions & 0 deletions recipes/xorg-libxfixes/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
:: Trailing semicolon in this variable as set by current (2017/01)
:: conda-build breaks us. Manual fix:
set "MSYS2_ARG_CONV_EXCL=/AI;/AL;/OUT;/out"
:: Delegate to the Unixy script. We need to translate the key path variables
:: to be Unix-y rather than Windows-y, though.
set "saved_recipe_dir=%RECIPE_DIR%"
FOR /F "delims=" %%i IN ('cygpath.exe -u -p "%PATH%"') DO set "PATH_OVERRIDE=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%PREFIX%"') DO set "PREFIX=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%PYTHON%"') DO set "PYTHON=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%RECIPE_DIR%"') DO set "RECIPE_DIR=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%SP_DIR%"') DO set "SP_DIR=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%SRC_DIR%"') DO set "SRC_DIR=%%i"
FOR /F "delims=" %%i IN ('cygpath.exe -u "%STDLIB_DIR%"') DO set "STDLIB_DIR=%%i"
bash -x %saved_recipe_dir%\build.sh
if errorlevel 1 exit 1
27 changes: 27 additions & 0 deletions recipes/xorg-libxfixes/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#! /bin/bash

set -e
IFS=$' \t\n' # workaround for conda 4.2.13+toolchain bug

# Adopt a Unix-friendly path if we're on Windows (see bld.bat).
[ -n "$PATH_OVERRIDE" ] && export PATH="$PATH_OVERRIDE"

# Fresh OS-guessing scripts from xorg-util-macros for win64
for f in config.guess config.sub ; do
cp -p $PREFIX/share/util-macros/$f .
done

export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig:$PREFIX/share/pkgconfig
configure_args=(
--prefix=$PREFIX
--disable-dependency-tracking
--disable-selective-werror
--disable-silent-rules
)

./configure "${configure_args[@]}"
make -j$CPU_COUNT
make install
make check
rm -rf $PREFIX/share/doc/${PKG_NAME#xorg-}
rm -f $PREFIX/lib/libXfixes.a $PREFIX/lib/libXfixes.la
Loading