diff --git a/config.h.win32.in b/config.h.win32.in index dec0d03092..23f0156685 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -276,12 +276,6 @@ /* Whether to load modules via .la files rather than directly */ /* #undef USE_LA_MODULES */ -/* Define to 1 if medialib is available and should be used */ -/* #undef USE_MEDIALIB */ - -/* Define to 1 if medialib 2.5 is available */ -/* #undef USE_MEDIALIB25 */ - /* Define to 1 if XXM is available and should be used */ #ifndef _MSC_VER # define USE_MMX 1 diff --git a/configure.ac b/configure.ac index d5ef2b7bb2..477aa7cda8 100644 --- a/configure.ac +++ b/configure.ac @@ -858,28 +858,6 @@ AC_CHECK_HEADER(sys/sysinfo.h, AC_DEFINE(HAVE_SYS_SYSINFO_H, 1, [Define to 1 if sys/sysinfo.h is available])) -AC_MSG_CHECKING(for mediaLib 2.3) -use_mlib25=no -# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib -# patch requires. -AC_CHECK_LIB(mlib, mlib_ImageSetStruct, use_mlib=yes, use_mlib=no) -if test $use_mlib = yes; then - AC_DEFINE(USE_MEDIALIB, 1, - [Define to 1 if medialib is available and should be used]) - MEDIA_LIB=-lmlib - - AC_MSG_CHECKING(for mediaLib 2.5) - # Check for a mediaLib 2.5 function since that is what is needed for - # gdk_rgb_convert integration. - AC_CHECK_LIB(mlib, mlib_VideoColorRGBint_to_BGRAint, use_mlib25=yes, use_mlib25=no) - if test $use_mlib25 = yes; then - AC_DEFINE(USE_MEDIALIB25, 1, - [Define to 1 if medialib 2.5 is available]) - fi -fi -AM_CONDITIONAL(USE_MEDIALIB, test $use_mlib = yes) -AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes) - dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) diff --git a/gdk/Makefile.am b/gdk/Makefile.am index f4606b94cf..2b2ae6be27 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -21,7 +21,6 @@ EXTRA_DIST += \ gdkkeysyms-update.pl \ gdk.def \ gdkmarshalers.list \ - gdkmedialib.h \ gdkwindowimpl.h \ makeenums.pl \ makefile.msc \ @@ -55,13 +54,6 @@ LDADD = \ $(no_undefined) \ $(LIBTOOL_EXPORT_OPTIONS) -if USE_MEDIALIB -medialib_sources = \ - gdkmedialib.c -else -medialib_sources = -endif - # # setup source file variables # @@ -111,7 +103,6 @@ gdk_private_headers = \ gdkpoly-generic.h gdk_c_sources = \ - $(medialib_sources) \ gdk.c \ gdkapplaunchcontext.c \ gdkcairo.c \ diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index 445c255bfb..e1150196c8 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -33,9 +33,6 @@ #include #include #include -#ifdef USE_MEDIALIB -#include -#endif G_BEGIN_DECLS diff --git a/gdk/gdkmedialib.c b/gdk/gdkmedialib.c deleted file mode 100644 index 597726824b..0000000000 --- a/gdk/gdkmedialib.c +++ /dev/null @@ -1,120 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * Copyright (C) 2001-2007 Sun Microsystems, Inc. All rights reserved. - * (Brian Cameron, Dmitriy Demin, James Cheng, Padraig O'Briain) - * - * 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. - */ - -/* - * Modified by the GTK+ Team and others 1997-2007. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#include "gdkmedialib.h" - -#include -#include - -#ifdef HAVE_STRINGS_H -#include -#endif - -#ifdef HAVE_STRING_H -#include -#endif - -#if defined(HAVE_SYS_SYSTEMINFO_H) -#include -#elif defined(HAVE_SYS_SYSINFO_H) -#include -#endif - -typedef char * (*ml_version) (void); - -static ml_version medialib_version = mlib_version; - -gboolean -_gdk_use_medialib (void) -{ - char *mlib_version_string; - char sys_info[257]; - long count; - - /* - * Sun mediaLib(tm) support. - * - * http://www.sun.com/processors/vis/mlib.html - * - */ - if (getenv ("GDK_DISABLE_MEDIALIB")) - return FALSE; - - /* - * The imaging functions we want to use were added in mediaLib version 2. - * So turn off mediaLib support if the user has an older version. - * mlib_version returns a string in this format: - * - * mediaLib:0210:20011101:v8plusa - * ^^^^^^^^ ^^^^ ^^^^^^^^ ^^^^^^^ - * libname vers build ISALIST identifier - * date (in this case sparcv8plus+vis) - * - * The first 2 digits of the version are the major version. The 3rd digit - * is the minor version, and the 4th digit is the micro version. So the - * above string corresponds to version 2.1.0.In the following test we only - * care about the major version. - */ - mlib_version_string = medialib_version (); - - count = sysinfo (SI_ARCHITECTURE, &sys_info[0], 257); - - if (count != -1) - { - if (strcmp (sys_info, "i386") == 0) - { - char *mlib_target_isa = &mlib_version_string[23]; - - /* - * For x86 processors mediaLib generic C implementation - * does not give any performance advantage so disable it. - */ - if (strncmp (mlib_target_isa, "sse", 3) != 0) - { - return FALSE; - } - - /* - * For x86 processors use of libumem conflicts with - * mediaLib, so avoid using it. - */ - if (dlsym (RTLD_PROBE, "umem_alloc") != NULL) - { - return FALSE; - } - } - } - else - { - /* Failed to get system architecture, disable mediaLib */ - return FALSE; - } - - return TRUE; -} diff --git a/gdk/gdkmedialib.h b/gdk/gdkmedialib.h deleted file mode 100644 index 1912e9d70d..0000000000 --- a/gdk/gdkmedialib.h +++ /dev/null @@ -1,45 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * Copyright (C) 2001-2007 Sun Microsystems, Inc. All rights reserved. - * (Brian Cameron, Dmitriy Demin, James Cheng, Padraig O'Briain) - * - * 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. - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GDK_MEDIALIB_H__ -#define __GDK_MEDIALIB_H__ - -#ifdef USE_MEDIALIB -#include -#include - -#include - -G_BEGIN_DECLS - -gboolean _gdk_use_medialib (void); - -G_END_DECLS - -#endif /* USE_MEDIALIB */ -#endif /* __GDK_MEDIALIB_H__ */ -