diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
| commit | aec9ffe68488d34c02bceb4942b87779f5c460d5 (patch) | |
| tree | 5aaa0d61510bf94c4dd5bd751b53f61d39817e96 /testing/libvisual-plugins/02_64-bit_JESS_fix.patch | |
| parent | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (diff) | |
| parent | 9598f5141ea75ffa72a3c7c85639c6f296020ef1 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/projectm/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/qtcreator/PKGBUILD
community-testing/qtcreator/qtcreator.desktop
community/galculator/PKGBUILD
community/ristretto/PKGBUILD
core/systemd/PKGBUILD
extra/llvm/PKGBUILD
extra/pyqt/PKGBUILD
extra/python-lxml/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/glew/PKGBUILD
staging/xine-lib/PKGBUILD
testing/calligra/PKGBUILD
testing/gdk-pixbuf2/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/fix_external_program_directories.patch
testing/glib2/PKGBUILD
testing/gnome-color-manager/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtk3/PKGBUILD
testing/gvfs/PKGBUILD
testing/inkscape/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/networkmanager/PKGBUILD
testing/polkit/PKGBUILD
testing/poppler/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-xdm/PKGBUILD
Diffstat (limited to 'testing/libvisual-plugins/02_64-bit_JESS_fix.patch')
| -rw-r--r-- | testing/libvisual-plugins/02_64-bit_JESS_fix.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/testing/libvisual-plugins/02_64-bit_JESS_fix.patch b/testing/libvisual-plugins/02_64-bit_JESS_fix.patch deleted file mode 100644 index 1d7f99e56..000000000 --- a/testing/libvisual-plugins/02_64-bit_JESS_fix.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c ---- libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c 2006-02-06 05:47:26.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c 2007-07-04 18:12:58.000000000 +1000 -@@ -282,7 +282,7 @@ - - void render_deformation(JessPrivate *priv, int defmode) - { -- uint32_t bmax; -+ intptr_t bmax; - uint32_t *tab1 = NULL, *tab2, *tab3, *tab4, i; - uint8_t *pix = priv->pixel, *buf = priv->buffer, *aux; - -@@ -294,7 +294,7 @@ - tab2 = priv->table2; - tab3 = priv->table3; - tab4 = priv->table4; -- bmax = priv->resx * priv->resy + (uint32_t) priv->pixel; -+ bmax = priv->resx * priv->resy + (intptr_t) priv->pixel; - - switch(defmode) - { -@@ -352,7 +352,7 @@ - } - for (i = 0; i < priv->resy * priv->resx; i++) - { -- aux = (uint8_t *) ((*(tab1) << 2 ) + (uint32_t) priv->buffer); -+ aux = (uint8_t *) ((*(tab1) << 2 ) + (intptr_t) priv->buffer); - *(pix++) = *(aux++) ; - *(pix++) = *(aux++); - *(pix++) = *(aux); -@@ -373,7 +373,8 @@ - /* j'ai mis pixel par defaut... */ - - uint8_t *pix = priv->pixel; -- uint32_t bmax,pitch_4; -+ intptr_t bmax; -+ uint32_t pitch_4; - - pix = priv->pixel; - if (priv->pixel == NULL) -@@ -387,7 +388,7 @@ - if (priv->video == 8) - { - if (visual_cpu_get_mmx ()) { -- bmax = priv->resx * (priv->resy-1) + (uint32_t) priv->pixel; -+ bmax = priv->resx * (priv->resy-1) + (intptr_t) priv->pixel; - #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) - __asm __volatile - ("\n\t pxor %%mm6, %%mm6" -@@ -423,7 +424,7 @@ - else - { - pitch_4 = priv->pitch+4; -- bmax = priv->pitch*(priv->resy-1) + (uint32_t) priv->pixel; -+ bmax = priv->pitch*(priv->resy-1) + (intptr_t) priv->pixel; - - if (visual_cpu_get_mmx ()) { - #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) |