/hg/release/icedtea6-1.7: Corrected PulseAudio library build

[Andrew John Hughes]

On 24 February 2010 17:13, Pavel Tisnovsky <ptisnovs at redhat.com> wrote:
> Andrew John Hughes wrote:
>>
>> On 24 February 2010 17:04, Pavel Tisnovsky <ptisnovs at redhat.com> wrote:
>>>
>>> Andrew John Hughes wrote:
>>>>
>>>> On 24 February 2010 15:35,  <ptisnovs at icedtea.classpath.org> wrote:
>>>>>
>>>>> changeset f4d6e5d2be10 in /hg/release/icedtea6-1.7
>>>>> details:
>>>>>
>>>>> http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f4d6e5d2be10
>>>>> author: ptisnovs
>>>>> date: Wed Feb 24 16:34:02 2010 +0100
>>>>>
>>>>>      Corrected PulseAudio library build
>>>>>
>>>>>
>>>>> diffstat:
>>>>>
>>>>> 2 files changed, 5 insertions(+)
>>>>> ChangeLog   |    4 ++++
>>>>> Makefile.am |    1 +
>>>>>
>>>>> diffs (22 lines):
>>>>>
>>>>> diff -r 1338c270a9c1 -r f4d6e5d2be10 ChangeLog
>>>>> --- a/ChangeLog Wed Jan 27 18:38:33 2010 +0000
>>>>> +++ b/ChangeLog Wed Feb 24 16:34:02 2010 +0100
>>>>> @@ -1,3 +1,7 @@ 2010-01-27 Andrew John Hughes  <ahughes@
>>>>> +2010-02-24 Pavel Tisnovsky  <ptisnovs at redhat.com>
>>>>> +       * Makefile.am: Corrected Pulse Audio
>>>>> +       library build
>>>>> +
>>>>>  2010-01-27 Andrew John Hughes  <ahughes at redhat.com>
>>>>>
>>>>>      * Makefile.am: Reference plugin
>>>>> diff -r 1338c270a9c1 -r f4d6e5d2be10 Makefile.am
>>>>> --- a/Makefile.am       Wed Jan 27 18:38:33 2010 +0000
>>>>> +++ b/Makefile.am       Wed Feb 24 16:34:02 2010 +0100
>>>>> @@ -1615,6 +1615,7 @@ if ENABLE_PULSE_JAVA
>>>>>      $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>>>>
>>>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c -o
>>>>>
>>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Operation.o
>>>>>      $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c
>>>>> -o
>>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Stream.o
>>>>>      $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>>>>
>>>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c
>>>>> -o
>>>>>
>>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.o
>>>>> +       $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>>>>
>>>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c
>>>>> -o
>>>>>
>>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.o
>>>>>      $(CC) $(LDFLAGS) -shared
>>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_*pulseaudio*.o
>>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/jni-common.o $(LIBPULSE_LIBS) -o
>>>>> libpulse-java.so
>>>>>  endif
>>>>>      mkdir -p stamps
>>>>>
>>>> Can you explain this fix?  Also, it needs to be pushed to HEAD as well.
>>>
>>> Functions from org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c
>>> are
>>> called from Java through JNI.
>>>
>>> Yes I'll push similar change to head too, just after meeting :-)
>>>
>>
>> Ah ok.  On second thoughts, I'll fixed IcedTea6 HEAD.  It would be
>> better to rewrite this with a general rule rather than one per c file
>> so we don't hit this kind of issue.
>
> Great it's better solution. I pushed changes to 6-1.7 first because we need
> to release this version for F11 and F12, you know.
>
>

Yeah, understood.  I should backport the Rhino fix to 1.7 too.
Deepak, how close is NPPlugin to being ready for final release?
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8