public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-libs/yiff/files: yiff-2.14.5-build-2.patch
@ 2008-12-21 11:44 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2008-12-21 11:44 UTC (permalink / raw
  To: gentoo-commits

ssuominen    08/12/21 11:44:41

  Added:                yiff-2.14.5-build-2.patch
  Log:
  Don't install yiffconfig which is GTK+-1.2. Don't install support for KDE 3, kmid. Respect CC, CXX, CFLAGS and CXXFLAGS. Remove unnecessary RESTRICT for strip from ebuild. Install default yiffrc so yiff server can be started out of box.
  (Portage version: 2.1.6.1/cvs/Linux 2.6.27.7 i686)

Revision  Changes    Path
1.1                  media-libs/yiff/files/yiff-2.14.5-build-2.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/yiff/files/yiff-2.14.5-build-2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/yiff/files/yiff-2.14.5-build-2.patch?rev=1.1&content-type=text/plain

Index: yiff-2.14.5-build-2.patch
===================================================================
diff -ur yiff-2.14.5.orig/libY2/Makefile yiff-2.14.5/libY2/Makefile
--- yiff-2.14.5.orig/libY2/Makefile	2005-09-26 11:41:57.000000000 +0300
+++ yiff-2.14.5/libY2/Makefile	2008-12-21 13:17:41.000000000 +0200
@@ -57,11 +57,11 @@
 #	-shared			Compile this program as a shared library.
 #
 
-CFLAGS = -Wall -O2 -g
+CFLAGS += -Wall
 #CFLAGS = -Wall -O6 -fomit-frame-pointer -funroll-loops \
 #         -finline-functions -ffast-math -march=i586
 
-CPPFLAGS = -D__cplusplus -Dc_plusplus
+CXXFLAGS += -D__cplusplus -Dc_plusplus
 
 
 # ########################################################################
@@ -103,8 +103,8 @@
 #
 include Makefile.srclist
 
-CC = cc
-CPP = c++
+CC ?= gcc
+CXX ?= g++
 
 # ########################################################################
 # Utilities:
@@ -124,9 +124,6 @@
 LINK      = ln
 LINKFLAGS = -sf
 
-LDCONFIG = ldconfig
-
-
 # ########################################################################
 # Build Rules:
 #
@@ -134,12 +131,12 @@
 OBJ_C   = $(SRC_C:.c=.o)
 OBJ_CPP = $(SRC_CPP:.cpp=.o)
 .c.o:
-	+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
+	+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) -fPIC
 .cpp.o:
-	+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
+	+$(CXX) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) -fPIC
 
 $(LIB): $(OBJ_C) $(OBJ_CPP)
-	$(CC) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
+	$(CXX) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
 	$(LINK) $(LINKFLAGS) $(LIB) $(LIBPFX).so
 
 all: $(LIB)
@@ -149,9 +146,9 @@
 #
 
 INSTALL      = install
-INSTBINFLAGS = -m 0755 -s
+INSTBINFLAGS = -m 0755
 INSTUIDFLAGS = -m 4755
-INSTLIBFLAGS = -m 0755 -s
+INSTLIBFLAGS = -m 0755
 INSTINCFLAGS = -m 0644
 INSTMANFLAGS = -m 0644
 INSTCFGFLAGS = -m 0644
@@ -159,7 +156,7 @@
 
 YLIB_DIR = $(PREFIX)/lib
 YINC_DIR = $(PREFIX)/include/Y2
-YMAN_DIR = $(PREFIX)/man/man3
+YMAN_DIR = $(PREFIX)/share/man/man3
 
 
 install_lib:
@@ -237,8 +234,6 @@
 	$(MKDIR) $(MKDIRFLAGS) $(YMAN_DIR)
 	$(INSTALL) $(INSTMANFLAGS) man/* $(YMAN_DIR)
 
-	-$(LDCONFIG)
-
 	@echo "-------------------------------------------------------------------------"
 	@echo "Library $(LIB) installed in:"
 	@echo " "
diff -ur yiff-2.14.5.orig/libY2/Makefile.Linux yiff-2.14.5/libY2/Makefile.Linux
--- yiff-2.14.5.orig/libY2/Makefile.Linux	2005-09-26 11:41:57.000000000 +0300
+++ yiff-2.14.5/libY2/Makefile.Linux	2008-12-21 13:18:06.000000000 +0200
@@ -57,11 +57,11 @@
 #	-shared			Compile this program as a shared library.
 #
 
-CFLAGS = -Wall -O2 -g
+CFLAGS += -Wall
 #CFLAGS = -Wall -O6 -fomit-frame-pointer -funroll-loops \
 #         -finline-functions -ffast-math -march=i586
 
-CPPFLAGS = -D__cplusplus -Dc_plusplus
+CXXFLAGS += -D__cplusplus -Dc_plusplus
 
 
 # ########################################################################
@@ -103,8 +103,8 @@
 #
 include Makefile.srclist
 
-CC = cc
-CPP = c++
+CC ?= gcc
+CXX ?= g++
 
 # ########################################################################
 # Utilities:
@@ -124,9 +124,6 @@
 LINK      = ln
 LINKFLAGS = -sf
 
-LDCONFIG = ldconfig
-
-
 # ########################################################################
 # Build Rules:
 #
@@ -134,12 +131,12 @@
 OBJ_C   = $(SRC_C:.c=.o)
 OBJ_CPP = $(SRC_CPP:.cpp=.o)
 .c.o:
-	+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
+	+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) -fPIC
 .cpp.o:
-	+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
+	+$(CXX) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) -fPIC
 
 $(LIB): $(OBJ_C) $(OBJ_CPP)
-	$(CC) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
+	$(CXX) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
 	$(LINK) $(LINKFLAGS) $(LIB) $(LIBPFX).so
 
 all: $(LIB)
@@ -149,9 +146,9 @@
 #
 
 INSTALL      = install
-INSTBINFLAGS = -m 0755 -s
+INSTBINFLAGS = -m 0755
 INSTUIDFLAGS = -m 4755
-INSTLIBFLAGS = -m 0755 -s
+INSTLIBFLAGS = -m 0755
 INSTINCFLAGS = -m 0644
 INSTMANFLAGS = -m 0644
 INSTCFGFLAGS = -m 0644
@@ -159,7 +156,7 @@
 
 YLIB_DIR = $(PREFIX)/lib
 YINC_DIR = $(PREFIX)/include/Y2
-YMAN_DIR = $(PREFIX)/man/man3
+YMAN_DIR = $(PREFIX)/share/man/man3
 
 
 install_lib:
@@ -237,8 +234,6 @@
 	$(MKDIR) $(MKDIRFLAGS) $(YMAN_DIR)
 	$(INSTALL) $(INSTMANFLAGS) man/* $(YMAN_DIR)
 
-	-$(LDCONFIG)
-
 	@echo "-------------------------------------------------------------------------"
 	@echo "Library $(LIB) installed in:"
 	@echo " "
diff -ur yiff-2.14.5.orig/Makefile yiff-2.14.5/Makefile
--- yiff-2.14.5.orig/Makefile	2003-07-21 00:19:39.000000000 +0300
+++ yiff-2.14.5/Makefile	2008-12-21 13:25:00.000000000 +0200
@@ -3,8 +3,8 @@
 #                           Toplevel Makefile
 #
 
-ALL_DIRS=stuff libY2 yiff yiffconfig yiffutils
-LINUX_DIRS=libY2 yiff yiffconfig yiffutils
+ALL_DIRS=stuff libY2 yiff yiffutils
+LINUX_DIRS=libY2 yiff yiffutils
 LINUX_NOSERVER_DIRS=libY2 yiffutils
 
 #
@@ -13,13 +13,13 @@
 linux:
 	for subdir in $(LINUX_DIRS); do					\
 	  LIB_DIR=-L../libY2;						\
-	  $(MAKE) -C $$subdir -f Makefile.Linux all; 			\
+	  $(MAKE) -C $$subdir -f Makefile.Linux all || exit 1;		\
 	done
 
 linux_noserver:
 	for subdir in $(LINUX_NOSERVER_DIRS); do			\
 	  LIB_DIR=-L../libY2;						\
-	  $(MAKE) -C $$subdir -f Makefile.Linux all;			\
+	  $(MAKE) -C $$subdir -f Makefile.Linux all || exit 1;		\
 	done
 
 #
diff -ur yiff-2.14.5.orig/stuff/Makefile yiff-2.14.5/stuff/Makefile
--- yiff-2.14.5.orig/stuff/Makefile	2003-07-21 00:46:35.000000000 +0300
+++ yiff-2.14.5/stuff/Makefile	2008-12-21 13:29:03.000000000 +0200
@@ -34,10 +34,11 @@
 INSTCFGFLAGS = -m 0644
 INSTDATFLAGS = -m 0644
 
-ICONS_DIR  = share/icons
-SOUNDS_DIR = share/sounds
+ICONS_DIR  = share/pixmaps
+SOUNDS_DIR = share/yiff/sounds
 
 install:
+	$(INSTALL) -m 755 -d $(PREFIX)/$(ICONS_DIR) $(PREFIX)/$(SOUNDS_DIR)
 	$(INSTALL) $(INSTDATFLAGS) Y.xpm $(PREFIX)/$(ICONS_DIR)
 	$(INSTALL) $(INSTDATFLAGS) yiff.xpm $(PREFIX)/$(ICONS_DIR)
 	$(INSTALL) $(INSTDATFLAGS) yiff.wav $(PREFIX)/$(SOUNDS_DIR)
diff -ur yiff-2.14.5.orig/yiff/config.h yiff-2.14.5/yiff/config.h
--- yiff-2.14.5.orig/yiff/config.h	2005-09-26 11:41:59.000000000 +0300
+++ yiff-2.14.5/yiff/config.h	2008-12-21 13:37:28.000000000 +0200
@@ -14,7 +14,7 @@
  *	Full path to the YIFF Sound Server configuration file, it
  *	can also be specified from the command line at run time
  */
-#define DEF_RCFILE_NAME		"/usr/etc/yiffrc"
+#define DEF_RCFILE_NAME		"/etc/yiffrc"
 /* #define DEF_RCFILE_NAME	"/etc/yiff.conf" */
 /* #define DEF_RCFILE_NAME	"/usr/etc/YIFFConfig" */
 
diff -ur yiff-2.14.5.orig/yiff/Makefile yiff-2.14.5/yiff/Makefile
--- yiff-2.14.5.orig/yiff/Makefile	2005-09-26 11:41:59.000000000 +0300
+++ yiff-2.14.5/yiff/Makefile	2008-12-21 13:20:10.000000000 +0200
@@ -85,10 +85,8 @@
 #         -D__USE_BSD -Wall -O6 \
 #         -fomit-frame-pointer -funroll-loops -finline-functions \
 #         -ffast-math
-CFLAGS = -DALSA_RUN_CONFORM -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
-         -D__USE_BSD -Wall -O6 \
-         -fomit-frame-pointer -funroll-loops -finline-functions \
-         -ffast-math
+CFLAGS += -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
+         -D__USE_BSD
 #CFLAGS = -DALSA_RUN_CONFORM -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
 #        -D__USE_BSD -Wall -O -g
 #CFLAGS = -DALSA_RUN_CONFORM -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
@@ -96,7 +94,7 @@
 #         -fomit-frame-pointer -funroll-loops -finline-functions \
 #         -ffast-math -march=i586
 
-CPPFLAGS = -Dc_plusplus -D__cplusplus
+CXXFLAGS += -Dc_plusplus -D__cplusplus
 
 
 # ########################################################################
@@ -138,15 +136,15 @@
 # Program Source and Header Files:
 #
 include Makefile.srclist
-CC  = cc
-CPP = c++
+CC  ?= gcc
+CXX ?= g++
 BIN = yiff
 OBJ_C = $(SRC_C:.c=.o)
 OBJ_CPP = $(SRC_CPP:.cpp=.o)
 .c.o:
 	$(CC) -c $*.c $(INC) $(CFLAGS)
 .cpp.o:
-	$(CPP) -c $*.cpp $(INC) $(CFLAGS) $(CPPFLAGS)
+	$(CXX) -c $*.cpp $(INC) $(CFLAGS) $(CPPFLAGS)
 
 RM      = rm
 RMFLAGS = -f
@@ -158,7 +156,7 @@
 # Build Rules:
 #
 $(BIN): $(OBJ_C) $(OBJ_CPP)
-	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
+	$(CXX) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
 
 all: $(BIN)
 
diff -ur yiff-2.14.5.orig/yiff/Makefile.install.UNIX yiff-2.14.5/yiff/Makefile.install.UNIX
--- yiff-2.14.5.orig/yiff/Makefile.install.UNIX	2005-09-26 11:41:59.000000000 +0300
+++ yiff-2.14.5/yiff/Makefile.install.UNIX	2008-12-21 13:20:40.000000000 +0200
@@ -10,9 +10,9 @@
 #       PREFIX
 #
 INSTALL      = install
-INSTBINFLAGS = -m 0755 -s
+INSTBINFLAGS = -m 0755
 INSTUIDFLAGS = -m 4755
-INSTLIBFLAGS = -m 0755 -s
+INSTLIBFLAGS = -m 0755
 INSTINCFLAGS = -m 0644
 INSTMANFLAGS = -m 0644
 INSTCFGFLAGS = -m 0644
@@ -25,7 +25,7 @@
 MKDIRFLAGS = -p
 
 ETC_DIR = $(PREFIX)/etc
-MAN_DIR = $(PREFIX)/man/man8
+MAN_DIR = $(PREFIX)/share/man/man8
 SBIN_DIR = $(PREFIX)/sbin
 
 CONFIG_FILE = yiffrc
diff -ur yiff-2.14.5.orig/yiff/Makefile.Linux yiff-2.14.5/yiff/Makefile.Linux
--- yiff-2.14.5.orig/yiff/Makefile.Linux	2005-09-26 11:41:59.000000000 +0300
+++ yiff-2.14.5/yiff/Makefile.Linux	2008-12-21 13:21:50.000000000 +0200
@@ -85,10 +85,7 @@
 #         -D__USE_BSD -Wall -O6 \
 #         -fomit-frame-pointer -funroll-loops -finline-functions \
 #         -ffast-math
-CFLAGS = -DALSA_RUN_CONFORM -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
-         -D__USE_BSD -Wall -O6 \
-         -fomit-frame-pointer -funroll-loops -finline-functions \
-         -ffast-math
+CFLAGS += -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT -D__USE_BSD
 #CFLAGS = -DALSA_RUN_CONFORM -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
 #        -D__USE_BSD -Wall -O -g
 #CFLAGS = -DALSA_RUN_CONFORM -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
@@ -96,7 +93,7 @@
 #         -fomit-frame-pointer -funroll-loops -finline-functions \
 #         -ffast-math -march=i586
 
-CPPFLAGS = -Dc_plusplus -D__cplusplus
+CXXFLAGS += -Dc_plusplus -D__cplusplus
 
 
 # ########################################################################
@@ -138,15 +135,15 @@
 # Program Source and Header Files:
 #
 include Makefile.srclist
-CC  = cc
-CPP = c++
+CC  ?= gcc
+CXX ?= g++
 BIN = yiff
 OBJ_C = $(SRC_C:.c=.o)
 OBJ_CPP = $(SRC_CPP:.cpp=.o)
 .c.o:
 	$(CC) -c $*.c $(INC) $(CFLAGS)
 .cpp.o:
-	$(CPP) -c $*.cpp $(INC) $(CFLAGS) $(CPPFLAGS)
+	$(CXX) -c $*.cpp $(INC) $(CFLAGS) $(CPPFLAGS)
 
 RM      = rm
 RMFLAGS = -f
@@ -158,7 +155,7 @@
 # Build Rules:
 #
 $(BIN): $(OBJ_C) $(OBJ_CPP)
-	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
+	$(CXX) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
 
 all: $(BIN)
 
diff -ur yiff-2.14.5.orig/yiff/yiffrc yiff-2.14.5/yiff/yiffrc
--- yiff-2.14.5.orig/yiff/yiffrc	2005-09-26 11:41:59.000000000 +0300
+++ yiff-2.14.5/yiff/yiffrc	2008-12-21 13:39:24.000000000 +0200
@@ -291,7 +291,11 @@
 #
 
 BeginYSoundPath
-    Path = /usr/share/sounds
+    Path = /usr/share/yiff/sounds
+EndYSoundPath
+
+BeginYSoundPath
+    Path = /usr/share/yiff
 EndYSoundPath
 
 BeginYSoundPath
diff -ur yiff-2.14.5.orig/yiffutils/Makefile yiff-2.14.5/yiffutils/Makefile
--- yiff-2.14.5.orig/yiffutils/Makefile	2005-09-26 11:41:57.000000000 +0300
+++ yiff-2.14.5/yiffutils/Makefile	2008-12-21 13:27:46.000000000 +0200
@@ -48,7 +48,7 @@
 #                               to debug the program.
 #
 
-CFLAGS = -Wall -O2 -g
+CFLAGS += -Wall
 #CFLAGS = -Wall -O2 \
 #         -fomit-frame-pointer -funroll-loops -finline-functions \
 #         -ffast-math -march=i586
@@ -92,8 +92,8 @@
 #
 PROGS  = helloworld yaudiocd yclientmessage yhost ymixer yplay \
          yrecinfo yset yshutdown
-CC     = cc
-CPP    = c++
+CC     ?= gcc
+CXX    ?= g++
 
 
 # ########################################################################
@@ -164,16 +164,16 @@
 MKDIR        = mkdir
 MKDIRFLAGS   = -p
 
-INSTBINFLAGS = -m 0755 -s
+INSTBINFLAGS = -m 0755
 INSTUIDFLAGS = -m 4755
-INSTLIBFLAGS = -m 0755 -s
+INSTLIBFLAGS = -m 0755
 INSTINCFLAGS = -m 0644
 INSTMANFLAGS = -m 0644
 INSTCFGFLAGS = -m 0644
 INSTDATFLAGS = -m 0644
 
 BIN_DIR = $(PREFIX)/bin
-MAN_DIR = $(PREFIX)/man/man1
+MAN_DIR = $(PREFIX)/share/man/man1
 
 install:
 	$(MKDIR) $(MKDIRFLAGS) $(BIN_DIR)
diff -ur yiff-2.14.5.orig/yiffutils/Makefile.Linux yiff-2.14.5/yiffutils/Makefile.Linux
--- yiff-2.14.5.orig/yiffutils/Makefile.Linux	2005-09-26 11:41:57.000000000 +0300
+++ yiff-2.14.5/yiffutils/Makefile.Linux	2008-12-21 13:27:54.000000000 +0200
@@ -48,7 +48,7 @@
 #                               to debug the program.
 #
 
-CFLAGS = -Wall -O2 -g
+CFLAGS += -Wall
 #CFLAGS = -Wall -O2 \
 #         -fomit-frame-pointer -funroll-loops -finline-functions \
 #         -ffast-math -march=i586
@@ -92,8 +92,8 @@
 #
 PROGS  = helloworld yaudiocd yclientmessage yhost ymixer yplay \
          yrecinfo yset yshutdown
-CC     = cc
-CPP    = c++
+CC     ?= gcc
+CXX    ?= g++
 
 
 # ########################################################################
@@ -164,16 +164,16 @@
 MKDIR        = mkdir
 MKDIRFLAGS   = -p
 
-INSTBINFLAGS = -m 0755 -s
+INSTBINFLAGS = -m 0755
 INSTUIDFLAGS = -m 4755
-INSTLIBFLAGS = -m 0755 -s
+INSTLIBFLAGS = -m 0755
 INSTINCFLAGS = -m 0644
 INSTMANFLAGS = -m 0644
 INSTCFGFLAGS = -m 0644
 INSTDATFLAGS = -m 0644
 
 BIN_DIR = $(PREFIX)/bin
-MAN_DIR = $(PREFIX)/man/man1
+MAN_DIR = $(PREFIX)/share/man/man1
 
 install:
 	$(MKDIR) $(MKDIRFLAGS) $(BIN_DIR)






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-libs/yiff/files: yiff-2.14.5-build-2.patch
@ 2008-12-21 11:51 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2008-12-21 11:51 UTC (permalink / raw
  To: gentoo-commits

ssuominen    08/12/21 11:51:18

  Modified:             yiff-2.14.5-build-2.patch
  Log:
  s/CPPFLAGS/CXXFLAGS/ and stop adding CFLAGS to g++.
  (Portage version: 2.1.6.1/cvs/Linux 2.6.27.7 i686)

Revision  Changes    Path
1.2                  media-libs/yiff/files/yiff-2.14.5-build-2.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/yiff/files/yiff-2.14.5-build-2.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/yiff/files/yiff-2.14.5-build-2.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/yiff/files/yiff-2.14.5-build-2.patch?r1=1.1&r2=1.2

Index: yiff-2.14.5-build-2.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/yiff/files/yiff-2.14.5-build-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yiff-2.14.5-build-2.patch	21 Dec 2008 11:44:41 -0000	1.1
+++ yiff-2.14.5-build-2.patch	21 Dec 2008 11:51:18 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur yiff-2.14.5.orig/libY2/Makefile yiff-2.14.5/libY2/Makefile
 --- yiff-2.14.5.orig/libY2/Makefile	2005-09-26 11:41:57.000000000 +0300
-+++ yiff-2.14.5/libY2/Makefile	2008-12-21 13:17:41.000000000 +0200
++++ yiff-2.14.5/libY2/Makefile	2008-12-21 13:50:45.000000000 +0200
 @@ -57,11 +57,11 @@
  #	-shared			Compile this program as a shared library.
  #
@@ -11,7 +11,7 @@
  #         -finline-functions -ffast-math -march=i586
  
 -CPPFLAGS = -D__cplusplus -Dc_plusplus
-+CXXFLAGS += -D__cplusplus -Dc_plusplus
++CXXFLAGS += -Wall -D__cplusplus -Dc_plusplus
  
  
  # ########################################################################
@@ -44,7 +44,7 @@
 +	+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) -fPIC
  .cpp.o:
 -	+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
-+	+$(CXX) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) -fPIC
++	+$(CXX) -c $*.cpp $(INC_DIRS) $(CXXFLAGS) -fPIC
  
  $(LIB): $(OBJ_C) $(OBJ_CPP)
 -	$(CC) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
@@ -84,7 +84,7 @@
  	@echo " "
 diff -ur yiff-2.14.5.orig/libY2/Makefile.Linux yiff-2.14.5/libY2/Makefile.Linux
 --- yiff-2.14.5.orig/libY2/Makefile.Linux	2005-09-26 11:41:57.000000000 +0300
-+++ yiff-2.14.5/libY2/Makefile.Linux	2008-12-21 13:18:06.000000000 +0200
++++ yiff-2.14.5/libY2/Makefile.Linux	2008-12-21 13:50:22.000000000 +0200
 @@ -57,11 +57,11 @@
  #	-shared			Compile this program as a shared library.
  #
@@ -95,7 +95,7 @@
  #         -finline-functions -ffast-math -march=i586
  
 -CPPFLAGS = -D__cplusplus -Dc_plusplus
-+CXXFLAGS += -D__cplusplus -Dc_plusplus
++CXXFLAGS += -Wall -D__cplusplus -Dc_plusplus
  
  
  # ########################################################################
@@ -128,7 +128,7 @@
 +	+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) -fPIC
  .cpp.o:
 -	+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
-+	+$(CXX) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) -fPIC
++	+$(CXX) -c $*.cpp $(INC_DIRS) $(CXXFLAGS) -fPIC
  
  $(LIB): $(OBJ_C) $(OBJ_CPP)
 -	$(CC) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-12-21 11:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-21 11:51 [gentoo-commits] gentoo-x86 commit in media-libs/yiff/files: yiff-2.14.5-build-2.patch Samuli Suominen (ssuominen)
  -- strict thread matches above, loose matches on Subject: below --
2008-12-21 11:44 Samuli Suominen (ssuominen)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox