Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 56717 | Differences between
and this patch

Collapse All | Expand All

(-)cinelerra-1.2.0.orig/cinelerra/main.C (-1 / +7 lines)
Lines 12-23 Link Here
12
#include "pluginserver.h"
12
#include "pluginserver.h"
13
#include "preferences.h"
13
#include "preferences.h"
14
#include "renderfarmclient.h"
14
#include "renderfarmclient.h"
15
16
#include <locale.h>
17
#include <gettext.h>
15
#include <stdlib.h>
18
#include <stdlib.h>
16
#include <string.h>
19
#include <string.h>
17
20
18
#define PACKAGE "cinelerra"
21
#define PACKAGE "cinelerra"
19
#define LOCALEDIR "/usr/share/locale"
20
22
23
/* Gentoo patched waiting for a complete fix */
24
#ifndef LOCALEDIR
25
#define LOCALEDIR "/usr/share/locale"
26
#endif
21
27
22
enum
28
enum
23
{
29
{
(-)cinelerra-1.2.0.orig/cinelerra/Makefile (-2 / +7 lines)
Lines 351-357 Link Here
351
	-I$(SNDFILE_DIR)/src \
351
	-I$(SNDFILE_DIR)/src \
352
	$(ESOUNDCFLAGS) \
352
	$(ESOUNDCFLAGS) \
353
	$(ALSA_CFLAGS) \
353
	$(ALSA_CFLAGS) \
354
	-I$(FFMPEG_DIR)/libavcodec
354
	-I$(FFMPEG_DIR)/libavcodec \
355
	-I/usr/share/gettext \
356
	-DENABLE_NLS=1
357
# The above patch is ugly since it uses an absolute path, but without
358
# autotools correcting these things is a pain
359
355
360
356
361
357
# Speed up linking with this linking sequence
362
# Speed up linking with this linking sequence
Lines 376-382 Link Here
376
	`expr /usr/lib/compaq/cxx-*/alpha-linux/`bin/crtn.o --no-demangle \
381
	`expr /usr/lib/compaq/cxx-*/alpha-linux/`bin/crtn.o --no-demangle \
377
	--warn-once
382
	--warn-once
378
LINKER = ld -o $(OUTPUT)
383
LINKER = ld -o $(OUTPUT)
379
CFLAGS += -DUSE_ALPHA
384
CFLAGS += -DUSE_ALPHA 

Return to bug 56717